Annotation of /trunk/cups/patches/cups-2.2.8-systemd-socket.patch
Parent Directory | Revision Log
Revision 3124 -
(hide annotations)
(download)
Tue Jun 12 11:56:01 2018 UTC (6 years ago) by niro
File size: 1699 byte(s)
Tue Jun 12 11:56:01 2018 UTC (6 years ago) by niro
File size: 1699 byte(s)
-re-diffed systemd-socket patch
1 | niro | 3124 | diff -Naur cups-2.2.8/scheduler/main.c cups-2.2.8-systemd/scheduler/main.c |
2 | --- cups-2.2.8/scheduler/main.c 2018-06-05 18:06:54.000000000 +0200 | ||
3 | +++ cups-2.2.8-systemd/scheduler/main.c 2018-06-12 13:53:59.647934558 +0200 | ||
4 | @@ -681,8 +681,16 @@ | ||
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 | + | ||
19 | #endif /* HAVE_ONDEMAND */ | ||
20 | if (fg) | ||
21 | cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started in foreground."); | ||
22 | diff -Naur cups-2.2.8/scheduler/org.cups.cupsd.path.in cups-2.2.8-systemd/scheduler/org.cups.cupsd.path.in | ||
23 | --- cups-2.2.8/scheduler/org.cups.cupsd.path.in 2018-06-05 18:06:54.000000000 +0200 | ||
24 | +++ cups-2.2.8-systemd/scheduler/org.cups.cupsd.path.in 2018-06-12 13:54:35.365467327 +0200 | ||
25 | @@ -3,7 +3,7 @@ | ||
26 | PartOf=org.cups.cupsd.service | ||
27 | |||
28 | [Path] | ||
29 | -PathExists=@CUPS_CACHEDIR@/org.cups.cupsd | ||
30 | +PathExistsGlob=@CUPS_REQUESTS@/d* | ||
31 | |||
32 | [Install] | ||
33 | WantedBy=multi-user.target | ||
34 | diff -Naur cups-2.2.8/scheduler/org.cups.cupsd.service.in cups-2.2.8-systemd/scheduler/org.cups.cupsd.service.in | ||
35 | --- cups-2.2.8/scheduler/org.cups.cupsd.service.in 2018-06-05 18:06:54.000000000 +0200 | ||
36 | +++ cups-2.2.8-systemd/scheduler/org.cups.cupsd.service.in 2018-06-12 13:54:57.209181566 +0200 | ||
37 | @@ -1,10 +1,11 @@ | ||
38 | [Unit] | ||
39 | Description=CUPS Scheduler | ||
40 | Documentation=man:cupsd(8) | ||
41 | +After=network.target | ||
42 | |||
43 | [Service] | ||
44 | ExecStart=@sbindir@/cupsd -l | ||
45 | -Type=simple | ||
46 | +Type=notify | ||
47 | Restart=on-failure | ||
48 | |||
49 | [Install] |