Contents of /trunk/cups/patches/cups-2.3.0-systemd-socket.patch
Parent Directory | Revision Log
Revision 3461 -
(show annotations)
(download)
Thu Oct 17 16:08:04 2019 UTC (4 years, 8 months ago) by niro
File size: 1295 byte(s)
Thu Oct 17 16:08:04 2019 UTC (4 years, 8 months ago) by niro
File size: 1295 byte(s)
-rediffed patch
1 | diff -Naur cups-2.3.0/scheduler/main.c cups-2.3.0-system-socket/scheduler/main.c |
2 | --- cups-2.3.0/scheduler/main.c 2019-08-23 17:19:38.000000000 +0200 |
3 | +++ cups-2.3.0-system-socket/scheduler/main.c 2019-10-17 18:06:01.684507966 +0200 |
4 | @@ -681,8 +681,15 @@ |
5 | |
6 | #ifdef HAVE_ONDEMAND |
7 | if (OnDemand) |
8 | + { |
9 | cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started on demand."); |
10 | - else |
11 | +# ifdef HAVE_SYSTEMD |
12 | + sd_notifyf(0, "READY=1\n" |
13 | + "STATUS=Scheduler is running...\n" |
14 | + "MAINPID=%lu", |
15 | + (unsigned long) getpid()); |
16 | +# endif /* HAVE_SYSTEMD */ |
17 | + } else |
18 | #endif /* HAVE_ONDEMAND */ |
19 | if (fg) |
20 | cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started in foreground."); |
21 | diff -Naur cups-2.3.0/scheduler/org.cups.cupsd.service.in cups-2.3.0-system-socket/scheduler/org.cups.cupsd.service.in |
22 | --- cups-2.3.0/scheduler/org.cups.cupsd.service.in 2019-08-23 17:19:38.000000000 +0200 |
23 | +++ cups-2.3.0-system-socket/scheduler/org.cups.cupsd.service.in 2019-10-17 18:06:32.037030685 +0200 |
24 | @@ -1,11 +1,11 @@ |
25 | [Unit] |
26 | Description=CUPS Scheduler |
27 | Documentation=man:cupsd(8) |
28 | -After=sssd.service |
29 | +After=sssd.service network.target |
30 | |
31 | [Service] |
32 | ExecStart=@sbindir@/cupsd -l |
33 | -Type=simple |
34 | +Type=notify |
35 | Restart=on-failure |
36 | |
37 | [Install] |