cups/cups-systemd-socket.patch

49 lines
1.8 KiB
Diff
Raw Normal View History

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