|
 |
6dd0746 |
diff -up cups-2.0rc1/cups/usersys.c.systemd-socket cups-2.0rc1/cups/usersys.c
|
|
|
6dd0746 |
--- cups-2.0rc1/cups/usersys.c.systemd-socket 2014-08-28 17:37:22.000000000 +0200
|
|
|
6dd0746 |
+++ cups-2.0rc1/cups/usersys.c 2014-09-12 14:35:37.462374923 +0200
|
|
|
6dd0746 |
@@ -1028,7 +1028,7 @@ cups_read_client_conf(
|
|
 |
3bce791 |
struct stat sockinfo; /* Domain socket information */
|
|
|
3bce791 |
|
|
|
3bce791 |
if (!stat(CUPS_DEFAULT_DOMAINSOCKET, &sockinfo) &&
|
|
|
3bce791 |
- (sockinfo.st_mode & S_IRWXO) == S_IRWXO)
|
|
|
3bce791 |
+ (sockinfo.st_mode & (S_IROTH | S_IWOTH)) == (S_IROTH | S_IWOTH))
|
|
|
3bce791 |
cups_server = CUPS_DEFAULT_DOMAINSOCKET;
|
|
|
3bce791 |
else
|
|
|
3bce791 |
#endif /* CUPS_DEFAULT_DOMAINSOCKET */
|
|
|
6dd0746 |
diff -up cups-2.0rc1/scheduler/main.c.systemd-socket cups-2.0rc1/scheduler/main.c
|
|
|
6dd0746 |
--- cups-2.0rc1/scheduler/main.c.systemd-socket 2014-09-12 14:59:08.000000000 +0200
|
|
|
6dd0746 |
+++ cups-2.0rc1/scheduler/main.c 2014-09-12 14:59:23.229299751 +0200
|
|
|
6dd0746 |
@@ -653,6 +653,12 @@ main(int argc, /* I - Number of comm
|
|
|
6dd0746 |
cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started on demand.");
|
|
|
52c42a0 |
else
|
|
|
6dd0746 |
#endif /* HAVE_LAUNCHD || HAVE_SYSTEMD */
|
|
|
52c42a0 |
+#ifdef HAVE_SYSTEMD
|
|
|
52c42a0 |
+ sd_notifyf(0, "READY=1\n"
|
|
|
52c42a0 |
+ "STATUS=Scheduler is running...\n"
|
|
|
52c42a0 |
+ "MAINPID=%lu",
|
|
|
52c42a0 |
+ (unsigned long) getpid());
|
|
|
52c42a0 |
+#endif /* HAVE_SYSTEMD */
|
|
|
52c42a0 |
if (fg)
|
|
|
6dd0746 |
cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started in foreground.");
|
|
|
6dd0746 |
else
|
|
|
6dd0746 |
diff -up cups-2.0rc1/scheduler/org.cups.cupsd.path.in.systemd-socket cups-2.0rc1/scheduler/org.cups.cupsd.path.in
|
|
|
6dd0746 |
--- cups-2.0rc1/scheduler/org.cups.cupsd.path.in.systemd-socket 2014-09-12 14:42:57.942162725 +0200
|
|
|
6dd0746 |
+++ cups-2.0rc1/scheduler/org.cups.cupsd.path.in 2014-09-12 14:42:54.254214614 +0200
|
|
|
6dd0746 |
@@ -2,7 +2,7 @@
|
|
|
6dd0746 |
Description=CUPS Scheduler
|
|
|
6dd0746 |
|
|
|
6dd0746 |
[Path]
|
|
|
6dd0746 |
-PathExists=@CUPS_CACHEDIR@/org.cups.cupsd
|
|
|
6dd0746 |
+PathExistsGlob=@CUPS_REQUESTS@/d*
|
|
|
9829b01 |
|
|
|
6dd0746 |
[Install]
|
|
|
6dd0746 |
WantedBy=multi-user.target
|
|
|
6dd0746 |
diff -up cups-2.0rc1/scheduler/org.cups.cupsd.service.in.systemd-socket cups-2.0rc1/scheduler/org.cups.cupsd.service.in
|
|
|
6dd0746 |
--- cups-2.0rc1/scheduler/org.cups.cupsd.service.in.systemd-socket 2014-09-12 14:40:13.000000000 +0200
|
|
|
6dd0746 |
+++ cups-2.0rc1/scheduler/org.cups.cupsd.service.in 2014-09-12 14:43:17.534887056 +0200
|
|
|
6dd0746 |
@@ -2,8 +2,8 @@
|
|
|
6dd0746 |
Description=CUPS Scheduler
|
|
|
6dd0746 |
|
|
|
6dd0746 |
[Service]
|
|
|
6dd0746 |
-ExecStart=@sbindir@/cupsd -l
|
|
|
6dd0746 |
-Type=simple
|
|
|
6dd0746 |
+ExecStart=@sbindir@/cupsd -f
|
|
|
6dd0746 |
+Type=notify
|
|
|
9829b01 |
|
|
|
6dd0746 |
[Install]
|
|
|
6dd0746 |
Also=org.cups.cupsd.socket org.cups.cupsd.path
|
|
|
6dd0746 |
diff -up cups-2.0rc1/scheduler/org.cups.cupsd.socket.in.systemd-socket cups-2.0rc1/scheduler/org.cups.cupsd.socket.in
|
|
|
6dd0746 |
--- cups-2.0rc1/scheduler/org.cups.cupsd.socket.in.systemd-socket 2014-03-21 17:42:53.000000000 +0100
|
|
|
6dd0746 |
+++ cups-2.0rc1/scheduler/org.cups.cupsd.socket.in 2014-09-12 14:43:37.510605998 +0200
|
|
|
6dd0746 |
@@ -3,10 +3,6 @@ Description=CUPS Scheduler
|
|
|
6dd0746 |
|
|
|
6dd0746 |
[Socket]
|
|
|
6dd0746 |
ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@
|
|
|
6dd0746 |
-ListenStream=[::1]:631
|
|
|
6dd0746 |
-ListenStream=127.0.0.1:631
|
|
|
6dd0746 |
-BindIPv6Only=ipv6-only
|
|
|
6dd0746 |
-ReusePort=true
|
|
|
6dd0746 |
|
|
|
6dd0746 |
[Install]
|
|
|
6dd0746 |
WantedBy=sockets.target
|