From: Michael R Sweet <michael.r.sweet@gmail.com>
Date: Thu, 5 Sep 2019 16:43:58 +0000 (-0400)
Subject: Add workaround for systemd's lack of true launch-on-demand support (Issue #5640)
X-Git-Tag: v2.3.1~56
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f8688d733bc1ecf86e5b7af7c40b758c0c9c4f28;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 3d7271f67d..b9c8d81a29 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -5,6 +5,7 @@ CHANGES - 2.3.1 - 2019-09-05
 Changes in CUPS v2.3.1
 ----------------------
 
+- 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 `ippeveprinter`.
 
diff --git a/scheduler/main.c b/scheduler/main.c
index 842b00a42d..d5fdf971a8 100644
--- a/scheduler/main.c
+++ b/scheduler/main.c
@@ -757,7 +757,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 */