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

diff --git a/CHANGES.md b/CHANGES.md
index 3d7271f67d94762c27ba6ef5bdbc116ef2fb4b2a..b9c8d81a2913eb26008939d17a8690e743f1b010 100644 (file)
--- 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 842b00a42d2e890ca737ec85cd668a80499103f8..d5fdf971a8acee0ac51bf9e5f353828c4ae3f2bc 100644 (file)
--- 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 */