Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/cups/patches/cups-2.2.7-systemd-socket.patch

    Contents of /trunk/cups/patches/cups-2.2.7-systemd-socket.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 3103 - (show annotations) (download)
    Wed Apr 25 13:43:32 2018 UTC (6 years, 1 month ago) by niro
    File size: 1799 byte(s) 
    -rediffed patch
    1 diff -up cups-2.2.7/scheduler/main.c.systemd-socket cups-2.2.7/scheduler/main.c
    2 --- cups-2.2.7/scheduler/main.c.systemd-socket 2018-04-03 14:23:12.128786025 +0200
    3 +++ cups-2.2.7/scheduler/main.c 2018-04-03 14:23:12.148785913 +0200
    4 @@ -691,8 +691,16 @@ main(int argc, /* I - Number of comm
    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 -up cups-2.2.7/scheduler/org.cups.cupsd.path.in.systemd-socket cups-2.2.7/scheduler/org.cups.cupsd.path.in
    23 --- cups-2.2.7/scheduler/org.cups.cupsd.path.in.systemd-socket 2018-03-23 04:48:36.000000000 +0100
    24 +++ cups-2.2.7/scheduler/org.cups.cupsd.path.in 2018-04-03 14:23:12.148785913 +0200
    25 @@ -3,7 +3,7 @@ Description=CUPS Scheduler
    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 -up cups-2.2.7/scheduler/org.cups.cupsd.service.in.systemd-socket cups-2.2.7/scheduler/org.cups.cupsd.service.in
    35 --- cups-2.2.7/scheduler/org.cups.cupsd.service.in.systemd-socket 2018-04-03 14:23:12.148785913 +0200
    36 +++ cups-2.2.7/scheduler/org.cups.cupsd.service.in 2018-04-03 14:25:16.312088802 +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=always
    48
    49 [Install]