7def2ac872
CUPS version upgrade to 2.1.0 OBS-URL: https://build.opensuse.org/request/show/328313 OBS-URL: https://build.opensuse.org/package/show/Printing/cups?expand=0&rev=309
44 lines
1.3 KiB
Diff
44 lines
1.3 KiB
Diff
--- scheduler/main.c.orig 2015-06-08 20:32:35.000000000 +0200
|
|
+++ scheduler/main.c 2015-09-01 11:19:36.000000000 +0200
|
|
@@ -656,7 +656,15 @@ main(int argc, /* I - Number of comm
|
|
|
|
#if defined(HAVE_LAUNCHD) || defined(HAVE_SYSTEMD)
|
|
if (OnDemand)
|
|
+ {
|
|
cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started on demand.");
|
|
+# 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_LAUNCHD || HAVE_SYSTEMD */
|
|
if (fg)
|
|
--- scheduler/org.cups.cupsd.path.in.orig 2014-03-21 15:50:24.000000000 +0100
|
|
+++ scheduler/org.cups.cupsd.path.in 2015-09-01 11:20:37.000000000 +0200
|
|
@@ -3,6 +3,7 @@ Description=CUPS Scheduler
|
|
|
|
[Path]
|
|
PathExists=@CUPS_CACHEDIR@/org.cups.cupsd
|
|
+PathExistsGlob=@CUPS_REQUESTS@/d*
|
|
|
|
[Install]
|
|
WantedBy=multi-user.target
|
|
--- scheduler/org.cups.cupsd.service.in.orig 2014-10-21 13:54:05.000000000 +0200
|
|
+++ scheduler/org.cups.cupsd.service.in 2015-09-01 11:22:09.000000000 +0200
|
|
@@ -1,10 +1,11 @@
|
|
[Unit]
|
|
Description=CUPS Scheduler
|
|
Documentation=man:cupsd(8)
|
|
+After=network.target
|
|
|
|
[Service]
|
|
ExecStart=@sbindir@/cupsd -l
|
|
-Type=simple
|
|
+Type=notify
|
|
|
|
[Install]
|
|
Also=org.cups.cupsd.socket org.cups.cupsd.path
|