a5a6be
diff -up cups-2.2.2/scheduler/main.c.systemd-socket cups-2.2.2/scheduler/main.c
a5a6be
--- cups-2.2.2/scheduler/main.c.systemd-socket	2017-01-19 11:12:42.004520240 +0100
a5a6be
+++ cups-2.2.2/scheduler/main.c	2017-01-19 11:12:42.029520021 +0100
5d1499
@@ -690,8 +690,15 @@ main(int  argc,				/* I - Number of comm
e946d3
 
5d1499
 #if defined(HAVE_ONDEMAND)
e946d3
   if (OnDemand)
e946d3
+  {
6dd074
     cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started on demand.");
e946d3
-  else
e946d3
+# ifdef HAVE_SYSTEMD
e946d3
+    sd_notifyf(0, "READY=1\n"
e946d3
+               "STATUS=Scheduler is running...\n"
e946d3
+               "MAINPID=%lu",
e946d3
+               (unsigned long) getpid());
e946d3
+# endif /* HAVE_SYSTEMD */
e946d3
+  } else
5d1499
 #endif /* HAVE_ONDEMAND */
52c42a
   if (fg)
6dd074
     cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started in foreground.");
a5a6be
diff -up cups-2.2.2/scheduler/org.cups.cupsd.path.in.systemd-socket cups-2.2.2/scheduler/org.cups.cupsd.path.in
a5a6be
--- cups-2.2.2/scheduler/org.cups.cupsd.path.in.systemd-socket	2017-01-19 11:12:42.029520021 +0100
a5a6be
+++ cups-2.2.2/scheduler/org.cups.cupsd.path.in	2017-01-19 11:19:34.468933097 +0100
a5a6be
@@ -3,7 +3,7 @@ Description=CUPS Scheduler
a5a6be
 PartOf=org.cups.cupsd.service
6dd074
 
6dd074
 [Path]
6dd074
-PathExists=@CUPS_CACHEDIR@/org.cups.cupsd
6dd074
+PathExistsGlob=@CUPS_REQUESTS@/d*
9829b0
 
6dd074
 [Install]
6dd074
 WantedBy=multi-user.target
a5a6be
diff -up cups-2.2.2/scheduler/org.cups.cupsd.service.in.systemd-socket cups-2.2.2/scheduler/org.cups.cupsd.service.in
a5a6be
--- cups-2.2.2/scheduler/org.cups.cupsd.service.in.systemd-socket	2017-01-17 20:27:22.000000000 +0100
a5a6be
+++ cups-2.2.2/scheduler/org.cups.cupsd.service.in	2017-01-19 11:12:42.029520021 +0100
fce8f5
@@ -1,10 +1,11 @@
fce8f5
 [Unit]
6dd074
 Description=CUPS Scheduler
fce8f5
 Documentation=man:cupsd(8)
6865fd
+After=network.target
6dd074
 
6dd074
 [Service]
e946d3
 ExecStart=@sbindir@/cupsd -l
6dd074
-Type=simple
6dd074
+Type=notify
9829b0
 
6dd074
 [Install]
6dd074
 Also=org.cups.cupsd.socket org.cups.cupsd.path