Magellan Linux

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

    Annotation of /trunk/cups/patches/cups-2.2.3-systemd-socket.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 2922 - (hide annotations) (download)
    Mon May 22 08:43:36 2017 UTC (7 years ago) by niro
    File size: 1725 byte(s) 
    -re-diffed
    1 niro 2922 diff -Naur cups-2.2.3/scheduler/main.c cups-2.2.3-socket/scheduler/main.c
    2     --- cups-2.2.3/scheduler/main.c 2017-03-28 20:26:53.000000000 +0200
    3     +++ cups-2.2.3-socket/scheduler/main.c 2017-05-22 10:41:34.799330859 +0200
    4     @@ -680,8 +680,15 @@
    5    
    6     #if defined(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     #endif /* HAVE_ONDEMAND */
    19     if (fg)
    20     cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started in foreground.");
    21     diff -Naur cups-2.2.3/scheduler/org.cups.cupsd.path.in cups-2.2.3-socket/scheduler/org.cups.cupsd.path.in
    22     --- cups-2.2.3/scheduler/org.cups.cupsd.path.in 2017-03-28 20:26:53.000000000 +0200
    23     +++ cups-2.2.3-socket/scheduler/org.cups.cupsd.path.in 2017-05-22 10:42:06.231989427 +0200
    24     @@ -3,7 +3,7 @@
    25     PartOf=org.cups.cupsd.service
    26    
    27     [Path]
    28     -PathExists=@CUPS_CACHEDIR@/org.cups.cupsd
    29     +PathExistsGlob=@CUPS_REQUESTS@/d*
    30    
    31     [Install]
    32     WantedBy=multi-user.target
    33     diff -Naur cups-2.2.3/scheduler/org.cups.cupsd.service.in cups-2.2.3-socket/scheduler/org.cups.cupsd.service.in
    34     --- cups-2.2.3/scheduler/org.cups.cupsd.service.in 2017-03-28 20:26:53.000000000 +0200
    35     +++ cups-2.2.3-socket/scheduler/org.cups.cupsd.service.in 2017-05-22 10:42:41.294608833 +0200
    36     @@ -1,10 +1,11 @@
    37     [Unit]
    38     Description=CUPS Scheduler
    39     Documentation=man:cupsd(8)
    40     +After=network.target
    41    
    42     [Service]
    43     ExecStart=@sbindir@/cupsd -l
    44     -Type=simple
    45     +Type=notify
    46    
    47     [Install]
    48     Also=org.cups.cupsd.socket org.cups.cupsd.path