cups/cups-systemd-socket.patch

50 lines
1.8 KiB
Diff
Raw Normal View History

diff -up cups-2.2.7/scheduler/main.c.systemd-socket cups-2.2.7/scheduler/main.c
--- cups-2.2.7/scheduler/main.c.systemd-socket 2018-04-03 14:23:12.128786025 +0200
+++ cups-2.2.7/scheduler/main.c 2018-04-03 14:23:12.148785913 +0200
2017-10-17 17:21:25 +00:00
@@ -691,8 +691,16 @@ main(int argc, /* I - Number of comm
2017-10-17 17:21:25 +00:00
#ifdef 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
2017-10-17 17:21:25 +00:00
+
#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.2.7/scheduler/org.cups.cupsd.path.in.systemd-socket cups-2.2.7/scheduler/org.cups.cupsd.path.in
--- cups-2.2.7/scheduler/org.cups.cupsd.path.in.systemd-socket 2018-03-23 04:48:36.000000000 +0100
+++ cups-2.2.7/scheduler/org.cups.cupsd.path.in 2018-04-03 14:23:12.148785913 +0200
2017-01-19 11:02:44 +00:00
@@ -3,7 +3,7 @@ Description=CUPS Scheduler
PartOf=org.cups.cupsd.service
2014-09-12 16:19:24 +00:00
[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.2.7/scheduler/org.cups.cupsd.service.in.systemd-socket cups-2.2.7/scheduler/org.cups.cupsd.service.in
--- cups-2.2.7/scheduler/org.cups.cupsd.service.in.systemd-socket 2018-04-03 14:23:12.148785913 +0200
+++ cups-2.2.7/scheduler/org.cups.cupsd.service.in 2018-04-03 14:25:16.312088802 +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
Restart=always
2011-08-05 14:11:04 +00:00
2014-09-12 16:19:24 +00:00
[Install]