From: Michael R Sweet <michael.r.sweet@gmail.com>
Date: Thu, 5 Sep 2019 16:44:44 +0000 (-0400)
Subject: Add workaround for systemd's lack of true launch-on-demand support (Issue #5640)
X-Git-Tag: v2.2.13~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=40a54a37ae0854d8ca69b50be2c3ec8f96a549ea;p=thirdparty%2Fcups.git

Add workaround for systemd's lack of true launch-on-demand support (Issue #5640)
---

diff --git a/CHANGES.md b/CHANGES.md
index e6d4c2a5d8..aab54c6764 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -5,6 +5,7 @@ CHANGES - 2.2.13 - 2019-09-05
 Changes in CUPS v2.2.13
 -----------------------
 
+- Added a workaround for the scheduler's systemd support (Issue #5640)
 - Fixed spelling of "fold-accordion".
 - Fixed the default common name for TLS certificates used by `ippserver`.
 
diff --git a/scheduler/main.c b/scheduler/main.c
index de36815669..e65060e1ff 100644
--- a/scheduler/main.c
+++ b/scheduler/main.c
@@ -750,7 +750,9 @@ main(int  argc,				/* I - Number of command-line args */
 #ifdef HAVE_ONDEMAND
 	if (OnDemand)
 	{
+#  ifndef HAVE_SYSTEMD /* Issue #5640: systemd doesn't actually support launch-on-demand services, need to fake it */
 	  stop_scheduler = 1;
+#  endif /* HAVE_SYSTEMD */
 	  break;
 	}
 #endif /* HAVE_ONDEMAND */