projects / packages / cups.git / blame
| Commit | Line | Data |
|---|---|---|
| 8196abcc AM |
1 | diff -up cups-2.0.1/cups/usersys.c.systemd-socket cups-2.0.1/cups/usersys.c |
| 2 | --- cups-2.0.1/cups/usersys.c.systemd-socket 2014-10-20 20:24:56.000000000 +0200 | |
| 3 | +++ cups-2.0.1/cups/usersys.c 2014-11-15 15:19:11.108125832 +0100 | |
| 4 | @@ -1078,7 +1078,7 @@ cups_read_client_conf( | |
| 304fa3b3 JR |
5 | struct stat sockinfo; /* Domain socket information */ |
| 6 | ||
| 7 | if (!stat(CUPS_DEFAULT_DOMAINSOCKET, &sockinfo) && | |
| 8 | - (sockinfo.st_mode & S_IRWXO) == S_IRWXO) | |
| 9 | + (sockinfo.st_mode & (S_IROTH | S_IWOTH)) == (S_IROTH | S_IWOTH)) | |
| 10 | cups_server = CUPS_DEFAULT_DOMAINSOCKET; | |
| 11 | else | |
| 12 | #endif /* CUPS_DEFAULT_DOMAINSOCKET */ | |
| 8196abcc AM |
13 | diff -up cups-2.0.1/scheduler/main.c.systemd-socket cups-2.0.1/scheduler/main.c |
| 14 | --- cups-2.0.1/scheduler/main.c.systemd-socket 2014-11-15 15:19:11.057126510 +0100 | |
| 15 | +++ cups-2.0.1/scheduler/main.c 2014-11-15 15:19:11.108125832 +0100 | |
| 16 | @@ -661,6 +661,12 @@ main(int argc, /* I - Number of comm | |
| 862c04f1 | 17 | cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started on demand."); |
| f2552845 | 18 | else |
| 862c04f1 | 19 | #endif /* HAVE_LAUNCHD || HAVE_SYSTEMD */ |
| f2552845 AM |
20 | +#ifdef HAVE_SYSTEMD |
| 21 | + sd_notifyf(0, "READY=1\n" | |
| 22 | + "STATUS=Scheduler is running...\n" | |
| 23 | + "MAINPID=%lu", | |
| 24 | + (unsigned long) getpid()); | |
| 25 | +#endif /* HAVE_SYSTEMD */ | |
| 26 | if (fg) | |
| 862c04f1 AM |
27 | cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started in foreground."); |
| 28 | else | |
| 8196abcc AM |
29 | diff -up cups-2.0.1/scheduler/org.cups.cupsd.path.in.systemd-socket cups-2.0.1/scheduler/org.cups.cupsd.path.in |
| 30 | --- cups-2.0.1/scheduler/org.cups.cupsd.path.in.systemd-socket 2014-03-21 15:50:24.000000000 +0100 | |
| 31 | +++ cups-2.0.1/scheduler/org.cups.cupsd.path.in 2014-11-15 15:19:11.108125832 +0100 | |
| 862c04f1 AM |
32 | @@ -2,7 +2,7 @@ |
| 33 | Description=CUPS Scheduler | |
| 34 | ||
| 35 | [Path] | |
| 36 | -PathExists=@CUPS_CACHEDIR@/org.cups.cupsd | |
| 37 | +PathExistsGlob=@CUPS_REQUESTS@/d* | |
| 304fa3b3 | 38 | |
| 862c04f1 AM |
39 | [Install] |
| 40 | WantedBy=multi-user.target | |
| 8196abcc AM |
41 | diff -up cups-2.0.1/scheduler/org.cups.cupsd.service.in.systemd-socket cups-2.0.1/scheduler/org.cups.cupsd.service.in |
| 42 | --- cups-2.0.1/scheduler/org.cups.cupsd.service.in.systemd-socket 2014-11-15 15:19:11.109125818 +0100 | |
| 43 | +++ cups-2.0.1/scheduler/org.cups.cupsd.service.in 2014-11-15 15:19:56.480528155 +0100 | |
| 44 | @@ -1,10 +1,11 @@ | |
| 45 | [Unit] | |
| 862c04f1 | 46 | Description=CUPS Scheduler |
| 8196abcc | 47 | Documentation=man:cupsd(8) |
| 862c04f1 AM |
48 | +After=network.target |
| 49 | ||
| 50 | [Service] | |
| 51 | -ExecStart=@sbindir@/cupsd -l | |
| 52 | -Type=simple | |
| 53 | +ExecStart=@sbindir@/cupsd -f | |
| 54 | +Type=notify | |
| 304fa3b3 | 55 | |
| 862c04f1 AM |
56 | [Install] |
| 57 | Also=org.cups.cupsd.socket org.cups.cupsd.path |