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

diff --git a/CHANGES.md b/CHANGES.md
index e6d4c2a5d86296a026cbd0c13472e2c3685a9d4c..aab54c676460f4b6ef9ef82709a112b378f067d1 100644 (file)
--- 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 de368156696e396f0d967dce2f661b0525d751ab..e65060e1ff8a67ecdad0b1562e334fe5cecfcc9a 100644 (file)
--- 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 */