|
 |
3635cf |
diff -up cups-2.2.5/scheduler/main.c.systemd-socket cups-2.2.5/scheduler/main.c
|
|
|
3635cf |
--- cups-2.2.5/scheduler/main.c.systemd-socket 2017-10-17 18:59:53.732431498 +0200
|
|
|
3635cf |
+++ cups-2.2.5/scheduler/main.c 2017-10-17 19:02:13.132275861 +0200
|
|
|
3635cf |
@@ -691,8 +691,16 @@ main(int argc, /* I - Number of comm
|
|
|
3635cf |
|
|
|
3635cf |
#ifdef HAVE_ONDEMAND
|
|
|
3635cf |
if (OnDemand)
|
|
|
3635cf |
+ {
|
|
|
3635cf |
cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started on demand.");
|
|
|
3635cf |
- else
|
|
|
3635cf |
+# ifdef HAVE_SYSTEMD
|
|
|
3635cf |
+ sd_notifyf(0, "READY=1\n"
|
|
|
3635cf |
+ "STATUS=Scheduler is running...\n"
|
|
|
3635cf |
+ "MAINPID=%lu",
|
|
|
3635cf |
+ (unsigned long) getpid());
|
|
|
3635cf |
+# endif /* HAVE_SYSTEMD */
|
|
|
3635cf |
+ } else
|
|
|
3635cf |
+
|
|
|
3635cf |
#endif /* HAVE_ONDEMAND */
|
|
|
3635cf |
if (fg)
|
|
|
3635cf |
cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started in foreground.");
|
|
|
3635cf |
diff -up cups-2.2.5/scheduler/org.cups.cupsd.path.in.systemd-socket cups-2.2.5/scheduler/org.cups.cupsd.path.in
|
|
|
3635cf |
--- cups-2.2.5/scheduler/org.cups.cupsd.path.in.systemd-socket 2017-10-13 20:22:26.000000000 +0200
|
|
|
3635cf |
+++ cups-2.2.5/scheduler/org.cups.cupsd.path.in 2017-10-17 18:59:53.732431498 +0200
|
|
|
3635cf |
@@ -1,6 +1,6 @@
|
|
|
3635cf |
[Unit]
|
|
|
3635cf |
Description=CUPS Scheduler
|
|
|
3635cf |
-PartOf=org.cups.cupsd.service
|
|
|
3635cf |
+PartOf=cups.service
|
|
|
3635cf |
|
|
|
3635cf |
[Path]
|
|
|
3635cf |
PathExists=@CUPS_CACHEDIR@/org.cups.cupsd
|
|
|
3635cf |
diff -up cups-2.2.5/scheduler/org.cups.cupsd.service.in.systemd-socket cups-2.2.5/scheduler/org.cups.cupsd.service.in
|
|
|
3635cf |
--- cups-2.2.5/scheduler/org.cups.cupsd.service.in.systemd-socket 2017-10-13 20:22:26.000000000 +0200
|
|
|
3635cf |
+++ cups-2.2.5/scheduler/org.cups.cupsd.service.in 2017-10-17 18:59:53.732431498 +0200
|
|
|
3635cf |
@@ -1,11 +1,13 @@
|
|
|
3635cf |
[Unit]
|
|
|
3635cf |
Description=CUPS Scheduler
|
|
|
3635cf |
Documentation=man:cupsd(8)
|
|
|
3635cf |
+After=network.target
|
|
|
3635cf |
|
|
|
3635cf |
[Service]
|
|
|
3635cf |
ExecStart=@sbindir@/cupsd -l
|
|
|
3635cf |
-Type=simple
|
|
|
3635cf |
+Type=notify
|
|
|
3635cf |
+Restart=on-failure
|
|
|
3635cf |
|
|
|
3635cf |
[Install]
|
|
|
3635cf |
-Also=org.cups.cupsd.socket org.cups.cupsd.path
|
|
|
3635cf |
+Also=cups.socket cups.path
|
|
|
3635cf |
WantedBy=printer.target
|
|
|
3635cf |
diff -up cups-2.2.6/scheduler/org.cups.cupsd.socket.in.systemd-socket cups-2.2.6/scheduler/org.cups.cupsd.socket.in
|
|
|
3635cf |
--- cups-2.2.6/scheduler/org.cups.cupsd.socket.in.systemd-socket 2017-11-01 15:57:53.000000000 +0100
|
|
|
3635cf |
+++ cups-2.2.6/scheduler/org.cups.cupsd.socket.in 2018-09-19 12:38:00.630843246 +0200
|
|
|
3635cf |
@@ -1,6 +1,6 @@
|
|
|
3635cf |
[Unit]
|
|
|
3635cf |
Description=CUPS Scheduler
|
|
|
3635cf |
-PartOf=org.cups.cupsd.service
|
|
|
3635cf |
+PartOf=cups.service
|
|
|
3635cf |
|
|
|
3635cf |
[Socket]
|
|
|
3635cf |
ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@
|
|
|
3635cf |
diff -up cups-2.2.6/scheduler/org.cups.cups-lpd.socket.systemd-socket cups-2.2.6/scheduler/org.cups.cups-lpd.socket
|
|
|
3635cf |
--- cups-2.2.6/scheduler/org.cups.cups-lpd.socket.systemd-socket 2017-11-01 15:57:53.000000000 +0100
|
|
|
3635cf |
+++ cups-2.2.6/scheduler/org.cups.cups-lpd.socket 2018-09-19 12:38:00.630843246 +0200
|
|
|
3635cf |
@@ -1,6 +1,6 @@
|
|
|
3635cf |
[Unit]
|
|
|
3635cf |
Description=CUPS LPD Server Socket
|
|
|
3635cf |
-PartOf=org.cups.cups-lpd.service
|
|
|
3635cf |
+PartOf=cups-lpd.service
|
|
|
3635cf |
|
|
|
3635cf |
[Socket]
|
|
|
3635cf |
ListenStream=515
|