|
 |
5d14999 |
diff -up cups-2.2b2/scheduler/main.c.systemd-socket cups-2.2b2/scheduler/main.c
|
|
|
5d14999 |
--- cups-2.2b2/scheduler/main.c.systemd-socket 2016-06-27 15:12:24.930881404 +0200
|
|
|
5d14999 |
+++ cups-2.2b2/scheduler/main.c 2016-06-27 15:19:38.118234985 +0200
|
|
|
5d14999 |
@@ -690,8 +690,15 @@ main(int argc, /* I - Number of comm
|
|
 |
e946d3c |
|
|
|
5d14999 |
#if defined(HAVE_ONDEMAND)
|
|
|
e946d3c |
if (OnDemand)
|
|
|
e946d3c |
+ {
|
|
 |
6dd0746 |
cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started on demand.");
|
|
|
e946d3c |
- else
|
|
|
e946d3c |
+# ifdef HAVE_SYSTEMD
|
|
|
e946d3c |
+ sd_notifyf(0, "READY=1\n"
|
|
|
e946d3c |
+ "STATUS=Scheduler is running...\n"
|
|
|
e946d3c |
+ "MAINPID=%lu",
|
|
|
e946d3c |
+ (unsigned long) getpid());
|
|
|
e946d3c |
+# endif /* HAVE_SYSTEMD */
|
|
|
e946d3c |
+ } else
|
|
|
5d14999 |
#endif /* HAVE_ONDEMAND */
|
|
|
52c42a0 |
if (fg)
|
|
|
6dd0746 |
cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started in foreground.");
|
|
|
5d14999 |
diff -up cups-2.2b2/scheduler/org.cups.cupsd.path.in.systemd-socket cups-2.2b2/scheduler/org.cups.cupsd.path.in
|
|
|
5d14999 |
--- cups-2.2b2/scheduler/org.cups.cupsd.path.in.systemd-socket 2016-06-24 17:43:35.000000000 +0200
|
|
|
5d14999 |
+++ cups-2.2b2/scheduler/org.cups.cupsd.path.in 2016-06-27 15:12:24.930881404 +0200
|
|
|
6dd0746 |
@@ -2,7 +2,7 @@
|
|
|
6dd0746 |
Description=CUPS Scheduler
|
|
|
6dd0746 |
|
|
|
6dd0746 |
[Path]
|
|
|
6dd0746 |
-PathExists=@CUPS_CACHEDIR@/org.cups.cupsd
|
|
|
6dd0746 |
+PathExistsGlob=@CUPS_REQUESTS@/d*
|
|
|
9829b01 |
|
|
|
6dd0746 |
[Install]
|
|
|
6dd0746 |
WantedBy=multi-user.target
|
|
|
5d14999 |
diff -up cups-2.2b2/scheduler/org.cups.cupsd.service.in.systemd-socket cups-2.2b2/scheduler/org.cups.cupsd.service.in
|
|
|
5d14999 |
--- cups-2.2b2/scheduler/org.cups.cupsd.service.in.systemd-socket 2016-06-24 17:43:35.000000000 +0200
|
|
|
5d14999 |
+++ cups-2.2b2/scheduler/org.cups.cupsd.service.in 2016-06-27 15:12:24.930881404 +0200
|
|
|
fce8f58 |
@@ -1,10 +1,11 @@
|
|
|
fce8f58 |
[Unit]
|
|
|
6dd0746 |
Description=CUPS Scheduler
|
|
|
fce8f58 |
Documentation=man:cupsd(8)
|
|
|
6865fda |
+After=network.target
|
|
|
6dd0746 |
|
|
|
6dd0746 |
[Service]
|
|
|
e946d3c |
ExecStart=@sbindir@/cupsd -l
|
|
|
6dd0746 |
-Type=simple
|
|
|
6dd0746 |
+Type=notify
|
|
|
9829b01 |
|
|
|
6dd0746 |
[Install]
|
|
|
6dd0746 |
Also=org.cups.cupsd.socket org.cups.cupsd.path
|