|
Zdenek Dohnal |
0a2acd |
diff -up cups-2.2.6/scheduler/main.c.systemd-socket cups-2.2.6/scheduler/main.c
|
|
Zdenek Dohnal |
9d9b4f |
--- cups-2.2.6/scheduler/main.c.systemd-socket 2018-09-19 12:38:00.602843492 +0200
|
|
Zdenek Dohnal |
9d9b4f |
+++ cups-2.2.6/scheduler/main.c 2018-09-19 12:38:00.629843255 +0200
|
|
Zdenek Dohnal |
9d9b4f |
@@ -691,8 +691,16 @@ main(int argc, /* I - Number of comm
|
|
Tim Waugh |
e946d3 |
|
|
Zdenek Dohnal |
cd3910 |
#ifdef HAVE_ONDEMAND
|
|
Tim Waugh |
e946d3 |
if (OnDemand)
|
|
Tim Waugh |
e946d3 |
+ {
|
|
|
6dd074 |
cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started on demand.");
|
|
Tim Waugh |
e946d3 |
- else
|
|
Tim Waugh |
e946d3 |
+# ifdef HAVE_SYSTEMD
|
|
Tim Waugh |
e946d3 |
+ sd_notifyf(0, "READY=1\n"
|
|
Tim Waugh |
e946d3 |
+ "STATUS=Scheduler is running...\n"
|
|
Tim Waugh |
e946d3 |
+ "MAINPID=%lu",
|
|
Tim Waugh |
e946d3 |
+ (unsigned long) getpid());
|
|
Tim Waugh |
e946d3 |
+# endif /* HAVE_SYSTEMD */
|
|
Tim Waugh |
e946d3 |
+ } else
|
|
Zdenek Dohnal |
cd3910 |
+
|
|
Zdenek Dohnal |
5d1499 |
#endif /* HAVE_ONDEMAND */
|
|
|
52c42a |
if (fg)
|
|
|
6dd074 |
cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started in foreground.");
|
|
Zdenek Dohnal |
0a2acd |
diff -up cups-2.2.6/scheduler/org.cups.cupsd.path.in.systemd-socket cups-2.2.6/scheduler/org.cups.cupsd.path.in
|
|
Zdenek Dohnal |
0a2acd |
--- cups-2.2.6/scheduler/org.cups.cupsd.path.in.systemd-socket 2017-11-01 15:57:53.000000000 +0100
|
|
Zdenek Dohnal |
9d9b4f |
+++ cups-2.2.6/scheduler/org.cups.cupsd.path.in 2018-09-19 12:38:00.630843246 +0200
|
|
Zdenek Dohnal |
9d9b4f |
@@ -1,6 +1,6 @@
|
|
Zdenek Dohnal |
9d9b4f |
[Unit]
|
|
Zdenek Dohnal |
9d9b4f |
Description=CUPS Scheduler
|
|
Zdenek Dohnal |
9d9b4f |
-PartOf=org.cups.cupsd.service
|
|
Zdenek Dohnal |
9d9b4f |
+PartOf=cups.service
|
|
|
6dd074 |
|
|
|
6dd074 |
[Path]
|
|
Zdenek Dohnal |
9d9b4f |
PathExists=@CUPS_CACHEDIR@/org.cups.cupsd
|
|
Zdenek Dohnal |
0a2acd |
diff -up cups-2.2.6/scheduler/org.cups.cupsd.service.in.systemd-socket cups-2.2.6/scheduler/org.cups.cupsd.service.in
|
|
Zdenek Dohnal |
9d9b4f |
--- cups-2.2.6/scheduler/org.cups.cupsd.service.in.systemd-socket 2018-09-19 12:38:00.630843246 +0200
|
|
Zdenek Dohnal |
9d9b4f |
+++ cups-2.2.6/scheduler/org.cups.cupsd.service.in 2018-09-19 12:39:39.550975966 +0200
|
|
Zdenek Dohnal |
9d9b4f |
@@ -1,11 +1,13 @@
|
|
|
fce8f5 |
[Unit]
|
|
|
6dd074 |
Description=CUPS Scheduler
|
|
|
fce8f5 |
Documentation=man:cupsd(8)
|
|
Tim Waugh |
6865fd |
+After=network.target
|
|
|
6dd074 |
|
|
|
6dd074 |
[Service]
|
|
Tim Waugh |
e946d3 |
ExecStart=@sbindir@/cupsd -l
|
|
|
6dd074 |
-Type=simple
|
|
|
6dd074 |
+Type=notify
|
|
Zdenek Dohnal |
0a2acd |
+Restart=on-failure
|
|
Tim Waugh |
9829b0 |
|
|
|
6dd074 |
[Install]
|
|
Zdenek Dohnal |
9d9b4f |
-Also=org.cups.cupsd.socket org.cups.cupsd.path
|
|
Zdenek Dohnal |
9d9b4f |
+Also=cups.socket cups.path
|
|
Zdenek Dohnal |
9d9b4f |
WantedBy=printer.target
|
|
Zdenek Dohnal |
9d9b4f |
diff -up cups-2.2.6/scheduler/org.cups.cupsd.socket.in.systemd-socket cups-2.2.6/scheduler/org.cups.cupsd.socket.in
|
|
Zdenek Dohnal |
9d9b4f |
--- cups-2.2.6/scheduler/org.cups.cupsd.socket.in.systemd-socket 2017-11-01 15:57:53.000000000 +0100
|
|
Zdenek Dohnal |
9d9b4f |
+++ cups-2.2.6/scheduler/org.cups.cupsd.socket.in 2018-09-19 12:38:00.630843246 +0200
|
|
Zdenek Dohnal |
9d9b4f |
@@ -1,6 +1,6 @@
|
|
Zdenek Dohnal |
9d9b4f |
[Unit]
|
|
Zdenek Dohnal |
9d9b4f |
Description=CUPS Scheduler
|
|
Zdenek Dohnal |
9d9b4f |
-PartOf=org.cups.cupsd.service
|
|
Zdenek Dohnal |
9d9b4f |
+PartOf=cups.service
|
|
Zdenek Dohnal |
9d9b4f |
|
|
Zdenek Dohnal |
9d9b4f |
[Socket]
|
|
Zdenek Dohnal |
9d9b4f |
ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@
|
|
Zdenek Dohnal |
9d9b4f |
diff -up cups-2.2.6/scheduler/org.cups.cups-lpd.socket.systemd-socket cups-2.2.6/scheduler/org.cups.cups-lpd.socket
|
|
Zdenek Dohnal |
9d9b4f |
--- cups-2.2.6/scheduler/org.cups.cups-lpd.socket.systemd-socket 2017-11-01 15:57:53.000000000 +0100
|
|
Zdenek Dohnal |
9d9b4f |
+++ cups-2.2.6/scheduler/org.cups.cups-lpd.socket 2018-09-19 12:38:00.630843246 +0200
|
|
Zdenek Dohnal |
9d9b4f |
@@ -1,6 +1,6 @@
|
|
Zdenek Dohnal |
9d9b4f |
[Unit]
|
|
Zdenek Dohnal |
9d9b4f |
Description=CUPS LPD Server Socket
|
|
Zdenek Dohnal |
9d9b4f |
-PartOf=org.cups.cups-lpd.service
|
|
Zdenek Dohnal |
9d9b4f |
+PartOf=cups-lpd.service
|
|
Zdenek Dohnal |
9d9b4f |
|
|
Zdenek Dohnal |
9d9b4f |
[Socket]
|
|
Zdenek Dohnal |
9d9b4f |
ListenStream=515
|