|
 |
9cdd138 |
diff -up cups-2.2.12/scheduler/main.c.systemd-socket cups-2.2.12/scheduler/main.c
|
|
|
9cdd138 |
--- cups-2.2.12/scheduler/main.c.systemd-socket 2019-08-16 00:35:30.000000000 +0200
|
|
|
9cdd138 |
+++ cups-2.2.12/scheduler/main.c 2019-08-19 09:31:09.703370325 +0200
|
|
|
9cdd138 |
@@ -674,8 +674,16 @@ main(int argc, /* I - Number of comm
|
|
 |
e946d3c |
|
|
|
cd39102 |
#ifdef 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
|
|
|
cd39102 |
+
|
|
|
5d14999 |
#endif /* HAVE_ONDEMAND */
|
|
|
52c42a0 |
if (fg)
|
|
|
6dd0746 |
cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started in foreground.");
|
|
|
9cdd138 |
diff -up cups-2.2.12/scheduler/org.cups.cupsd.path.in.systemd-socket cups-2.2.12/scheduler/org.cups.cupsd.path.in
|
|
|
9cdd138 |
--- cups-2.2.12/scheduler/org.cups.cupsd.path.in.systemd-socket 2019-08-16 00:35:30.000000000 +0200
|
|
|
9cdd138 |
+++ cups-2.2.12/scheduler/org.cups.cupsd.path.in 2019-08-19 09:31:09.703370325 +0200
|
|
|
24d583f |
@@ -1,6 +1,6 @@
|
|
|
24d583f |
[Unit]
|
|
|
24d583f |
Description=CUPS Scheduler
|
|
|
24d583f |
-PartOf=org.cups.cupsd.service
|
|
|
24d583f |
+PartOf=cups.service
|
|
|
6dd0746 |
|
|
|
6dd0746 |
[Path]
|
|
|
24d583f |
PathExists=@CUPS_CACHEDIR@/org.cups.cupsd
|
|
|
9cdd138 |
diff -up cups-2.2.12/scheduler/org.cups.cupsd.service.in.systemd-socket cups-2.2.12/scheduler/org.cups.cupsd.service.in
|
|
|
9cdd138 |
--- cups-2.2.12/scheduler/org.cups.cupsd.service.in.systemd-socket 2019-08-19 09:31:09.703370325 +0200
|
|
|
9cdd138 |
+++ cups-2.2.12/scheduler/org.cups.cupsd.service.in 2019-08-19 09:54:58.890036404 +0200
|
|
|
9cdd138 |
@@ -1,13 +1,13 @@
|
|
|
fce8f58 |
[Unit]
|
|
|
6dd0746 |
Description=CUPS Scheduler
|
|
|
fce8f58 |
Documentation=man:cupsd(8)
|
|
|
9cdd138 |
-After=sssd.service
|
|
|
9cdd138 |
+After=sssd.service network.target
|
|
|
6dd0746 |
|
|
|
6dd0746 |
[Service]
|
|
|
e946d3c |
ExecStart=@sbindir@/cupsd -l
|
|
|
6dd0746 |
-Type=simple
|
|
|
6dd0746 |
+Type=notify
|
|
|
ce18aa9 |
Restart=on-failure
|
|
|
9829b01 |
|
|
|
6dd0746 |
[Install]
|
|
|
24d583f |
-Also=org.cups.cupsd.socket org.cups.cupsd.path
|
|
|
24d583f |
+Also=cups.socket cups.path
|
|
|
24d583f |
WantedBy=printer.target
|
|
|
9cdd138 |
diff -up cups-2.2.12/scheduler/org.cups.cupsd.socket.in.systemd-socket cups-2.2.12/scheduler/org.cups.cupsd.socket.in
|
|
|
9cdd138 |
--- cups-2.2.12/scheduler/org.cups.cupsd.socket.in.systemd-socket 2019-08-16 00:35:30.000000000 +0200
|
|
|
9cdd138 |
+++ cups-2.2.12/scheduler/org.cups.cupsd.socket.in 2019-08-19 09:31:09.703370325 +0200
|
|
|
24d583f |
@@ -1,6 +1,6 @@
|
|
|
24d583f |
[Unit]
|
|
|
24d583f |
Description=CUPS Scheduler
|
|
|
24d583f |
-PartOf=org.cups.cupsd.service
|
|
|
24d583f |
+PartOf=cups.service
|
|
|
24d583f |
|
|
|
24d583f |
[Socket]
|
|
|
24d583f |
ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@
|
|
|
9cdd138 |
diff -up cups-2.2.12/scheduler/org.cups.cups-lpd.socket.systemd-socket cups-2.2.12/scheduler/org.cups.cups-lpd.socket
|
|
|
9cdd138 |
--- cups-2.2.12/scheduler/org.cups.cups-lpd.socket.systemd-socket 2019-08-16 00:35:30.000000000 +0200
|
|
|
9cdd138 |
+++ cups-2.2.12/scheduler/org.cups.cups-lpd.socket 2019-08-19 09:31:09.703370325 +0200
|
|
|
24d583f |
@@ -1,6 +1,6 @@
|
|
|
24d583f |
[Unit]
|
|
|
24d583f |
Description=CUPS LPD Server Socket
|
|
|
24d583f |
-PartOf=org.cups.cups-lpd.service
|
|
|
24d583f |
+PartOf=cups-lpd.service
|
|
|
24d583f |
|
|
|
24d583f |
[Socket]
|
|
|
24d583f |
ListenStream=515
|