Blame cups-systemd-socket.patch
|
 |
66f882d |
diff --git a/scheduler/cups.service.in b/scheduler/cups.service.in
|
|
|
66f882d |
index cd23343..928d77f 100644
|
|
|
66f882d |
--- a/scheduler/cups.service.in
|
|
|
66f882d |
+++ b/scheduler/cups.service.in
|
|
|
66f882d |
@@ -1,11 +1,11 @@
|
|
|
66f882d |
[Unit]
|
|
|
66f882d |
Description=CUPS Scheduler
|
|
|
66f882d |
Documentation=man:cupsd(8)
|
|
|
66f882d |
-After=sssd.service
|
|
|
66f882d |
+After=network.target sssd.service
|
|
|
66f882d |
|
|
|
66f882d |
[Service]
|
|
|
66f882d |
ExecStart=@sbindir@/cupsd -l
|
|
|
66f882d |
-Type=simple
|
|
|
66f882d |
+Type=notify
|
|
|
66f882d |
Restart=on-failure
|
|
|
66f882d |
|
|
|
66f882d |
[Install]
|
|
|
66f882d |
diff --git a/scheduler/main.c b/scheduler/main.c
|
|
|
66f882d |
index 4fee24f..206db30 100644
|
|
|
66f882d |
--- a/scheduler/main.c
|
|
|
66f882d |
+++ b/scheduler/main.c
|
|
|
66f882d |
@@ -706,8 +706,16 @@ main(int argc, /* I - Number of command-line args */
|
|
 |
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.");
|