Update ChangeLog

The unsupervised status is to be used when a supervisor of a supervised
service dies but leaves the service daemon itself running.

ChangeLog

@@ -1,3 +1,499 @@
+commit eecf868e3c4a763b08cd4b3803f4839e8e710413
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    supervise-daemon: clarify a log message
+
+commit a5cd486a7fbb5acf8e8f3085500fd86c23dd8641
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    Update ChangeLog
+
+commit 6e6b4ac5fa935eb8052d293f2b8378e0395572e1
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    supervise-daemon: log the command line we run to spawn the child process
+
+commit 558ff4d5fb90b751ebc2852ea907873af2c236fa
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    supervise-daemon: log with the service name instead of "supervise-daemon"
+
+commit 490f855aef581a720c6c0be0d8407fe6d279f9f5
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    implement "unsupervised" status
+    
+    The unsupervised status is to be used when a supervisor of a supervised
+    service dies but leaves the service daemon itself running.
+
+commit d1491e201d3ad364e25a55b29ff8035775a6acac
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    supervise-daemon: remove child_pid from saved options during shutdown
+    
+    This allows us to detect when the supervisor dies unexpectedly because
+    in that case child_pid will still exist.
+
+commit 3231af937590b1c00af1a459009472a371aeb04a
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    rc_service_value_set: remove the option if NULL is the value
+    
+    This allows the equivalent of "unsetting" a value for a service.
+
+commit a5758e7aeffbeb9766ba3055a3fc347f0ccd3d35
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    supervise-daemon.sh: fix status function with no namespaces
+
+commit 61a9393ce12fda412bdca4002ac71e7df82384df
+Author: Patrick McLean <chutzpah@gentoo.org>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    cgroups_cleanup: clean up shutdown signaling
+    
+    - do not sleep for the full 90 seconds if processes are dead
+    - re-arrange the order of signals we attempt to send to the processes
+
+commit 161d22cb074ecef7003e19682d72a8ee61c14490
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    version 0.34.3
+
+commit 3a96ca1c966c3cc44a2e0e51b383ab47d078bcc1
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    Update ChangeLog
+
+commit 934530914bd507476b428d3f6572bbb1c5bbfd16
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    add "unsupervised" status and return code 64 to supervise-daemon status function
+    
+    This is to be used if the service is being supervised and the
+    supervisor is somehow killed.
+    
+    Currently, this is very linux specific, but I will expand to other
+    platforms, patches are welcome.
+
+commit b717625cd27950c3f00b5345bc1cee9700e79498
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    version 0.34.2
+
+commit b47539613431521e5e99bc388e6a9d8eb0e48801
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    Update ChangeLog
+
+commit e7b1d898ca7896d6443ba1e5167eb6bcf3f92929
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    supervise-daemon: fix build issue for >=glibc-2.26
+    
+    X-Gentoo-Bug: 635334
+    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=635334
+
+commit 5cd09a6f44aa7d16ab7de1453e37d01448426031
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    version 0.34.1
+
+commit f3c70bf5b5aa18e8dc94d4949f05568e0741c5cb
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    Update ChangeLog
+
+commit f5acc66db7d1a0bfad6a40eefc0240b80f52df94
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    rc_find_pids: ignore pids that are not in our pid namespace
+    
+    X-Gentoo-Bug: 634634
+    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=634634
+
+commit fdce4769f2e0f4175163ffa181c7b3b2192f7b22
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    supervise-daemon: multiple fixes
+    
+    - Harden against dying by handling all signals that would terminate the
+    program and adding --reexec support
+    - factor the supervisor into its own function
+    - fix test for whether we are already running
+
+commit 35b1996704f6635bb29ea3604410e133209e6432
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    supervise-daemon: elevate some log messages to warnings
+    
+    Prior to this change, we were logging unexpected terminations of daemons
+    we were supervising at the info level. This change moves the logs to
+    warnings.
+
+commit 3c8e7ed255edb8df0d548d6ce514544d5422cbf0
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    version 0.34
+
+commit acaed1f910a2a00fdd5b6aeab752c552075a7292
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    Update ChangeLog
+
+commit 91109e31d81ecd48f5690ad6f63103fca545dec7
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    update news
+
+commit 2b6eeea01d1c64d58929788f4bfa0758393885bf
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    man: remove service(8) man page
+
+commit a15de23e5713d840d871c526b46050983dc6ea1e
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    typo fix
+
+commit efa9ba485d9328f780f3e60dc18339c75974c6c6
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    init.d/sysfs.in: fix reference to RC_LIBEXECDIR
+    
+    The sysfs init script referred to @LIBEXECDIR@ before this change, but
+    it is better to refer to RC_LIBEXECDIR so that we get rid of a sed
+    substitution.
+
+commit d4ddd72701ff5533a1ba07b1da60806859c63d88
+Author: Chris Cromer <chris@cromer.cl>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    add option to make agetty startup quiet
+    
+    This fixes #150
+
+commit 1e9af2cd421423404ffe1491bd35af76c2885f1f
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    fix compiler warning
+
+commit 3c05db74f6e733890e9035c183a774db3d512512
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    remove service binary
+    
+    The service binary was just a synonym for rc-service, so use rc-service
+    instead of service. If you want a "service" binary, it should be
+    something that can determine which service manager you are running and
+    run the appropriate service manager commands.
+
+commit edc54b03770d5f58d1a4969d06c28660003dfb04
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    version 0.33
+
+commit 8e53a3fa8a33fb714064ddbe38bff2213fcf6837
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    Update ChangeLog
+
+commit 7f3b41311119e3a96a15b0fb473b44f422e903e9
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    use printf consistently in cgroups handling
+    
+    This makes the cgroups handling consistent between cgroups v1 and v2.
+    Also, it fixes #167.
+
+commit 1ccba056584ee1a8e09fb1d5eebd988b47912c06
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    sh/rc-functions.sh: add need_if_exists convenience function
+
+commit c46adf14343df3a74aef7e4ae5be175ae5fa7a01
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    man/openrc-run.8: Clarify the explanation of the need dependency
+
+commit 1cac8b080c16f9aab19c7a3ae1ca155c20dfa14d
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    ignore sigchld when shutting down the supervised process
+    
+    We need to do this to skip the zombie state for the child process since
+    we are not easily able to wait() for it.
+
+commit b58194ef63ec8c0a7e0ea3c291da9c19aa83cb1a
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    typo fix
+
+commit b28c0d6f66e42b1e6d2a39c286a18c8d92881790
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    typo fix
+
+commit 3cf19b0f30a90157d23d09ded304439f1eb42d4a
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    supervise-daemon: code cleanup
+    
+    Clean up the process for killing an active supervisor when stopping.
+
+commit 0eb47b9af340dd07209a3920944ed085fe7bd359
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    initialize the stop schedule
+
+commit 4ab60ff10935122277bbaed437f82a765279cd19
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    rc-schedules.c: pass the correct pid to rc_find_pids
+    
+    This is for #163.
+
+commit db4a578273dbfa15b8b96686391bcc9ecc04b646
+Author: Jason Zaman <jason@perfinion.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    selinux: fix const qualifier warning
+    
+    rc-selinux.c: In function ‘selinux_setup’:
+    rc-selinux.c:361:9: warning: assignment discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]
+      curr_t = context_type_get(curr_con);
+             ^
+
+commit b1c3422f453921e838d419640fe39144dbf8d13d
+Author: Jason Zaman <jason@perfinion.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    selinux: use openrc contexts path to get contexts
+    
+    The minimum requirement for libselinux is now >=2.6
+    The refpolicy and the gentoo policy contain the
+    contexts since version 2.20170204-r4
+
+commit 3fafd7a76e6adf15ec72a7ba5f44583eff8fab7a
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    sysfs: fix cgroup hybrid mode
+    
+    In hybrid mode, we should not try to mount cgroup2 if it is not
+    available in the kernel.
+    
+    This fixes #164.
+
+commit cd5722aca50f0eaddde7ce04ee00da53c313ba7d
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    cgroup2_find_path: use legacy mode if cgroup2 is not in the kernel
+    
+    This is related to #164.
+
+commit dcb4a4d2613a1fdf85651b32e5b7a87528f487bc
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    version 0.32
+
+commit e312e569970c74cf52e255da67034391b68dafac
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    Update ChangeLog
+
+commit 2f60a959b442866b0e879d83f2732c4fa3ed3f7d
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    update news file
+
+commit 25b45a5a239318fb57c405c3fe64e53b0738ad68
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    cgroup_cleanup: try to remove the cgroup version 2 cgroup
+    
+    If we were able to kill all the processes in the cgroup, it should be
+    removed.
+
+commit 4651b8c7e9e2ef9c1ea1fb8d174d1ca4693627af
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    rc-cgroup.sh: cgroup_cleanup fix error handling
+    
+    cgroup_cleanup should warn if it is unable to clean up all processes in
+    the control group, but it will always return success.
+
+commit 50608b54ed98acb54fec5fe3323909ea684d3af9
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    rc-cgroup.sh: fix signal names
+    
+    The "SIG" prefix on signal names passed to kill -s isn't portable.
+
+commit b0a077a35f85e266fdb82a245dcbda18664a8567
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    add quiet switch to do_stop in src-schedules.c
+    
+    This allows supervise-daemon to run this code without attempting to
+    print some status messages used by start-stop-daemon.
+
+commit 6a5ca2ab368d0a85f51bb559672dba2e3ffcc6be
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    make the procedure for killing child processes of services configurable
+
+commit 2b0345165e5af57ca61a4000c3671bbe6d677cf9
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    Make cgroup_cleanup send only one sigterm and sigkill
+    
+    Instead of looping and sending multiple signals to child processes in
+    cgroup_cleanup, we send sigterm followed by sleeping one second then
+    sigkill.
+    
+    This brings us more in line with systemd's "control group" killmode
+    setting.
+    
+    Also, this commit includes several shellcheck cleanups.
+
+commit 8885580986ab8adc951fe32b9323c8b16130fb4f
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    rc-cgroup.sh: move cgroup_cleanup to the end of the file
+
+commit 6d7713a758b7e78f05e6a3cc101f862d28d778ab
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    guide.md: clarify cgroups documentation
+    
+    Update the documentation to reflect cgroups version 2 support.
+    Also, add a section on dealing with orphaned service processes.
+    
+    This fixes #94.
+
+commit 457f928e793cb1f6ef254935ad07f58b8762c72f
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    add support for control groups version 2
+    
+    This is for #94.
+
+commit a71a461e452a98554346c47411e9c9012023c201
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    version 0.31
+
+commit a09b8af3f98c0700a9b838b7f3683ee58eecc912
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    Update ChangeLog
+
+commit 382efdbfcb99703d03211efacd800c9575e64230
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    add quiet parameter to run_stop_schedule
+
+commit 17b5cc78d35dc5fe4904e5951715c3e0d07d6343
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    add retry option to supervise-daemon
+    
+    The --retry option for supervise-daemon defines how the supervisor will
+    attempt to stop the child process it is monitoring. It is defined when
+    the supervisor is started since stopping the supervisor just sends a
+    signal to the active supervisor.
+    
+    This fixes #160.
+
+commit 36a0ab9054512ade413226fb8e8b28060045e9a4
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    make run_stop_schedule accept a pid instead of a pid file
+
+commit 27c2bd997d5173aa30844a16bc22dc8caab09f8c
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    version 0.30
+
+commit d7938f54f29193251e083ad35a7d464949829096
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    start-stop-daemon: move --retry processing code to a shared module
+    
+    This was part of start-stop-daemon; however, it needs to be shared in
+    order to be used by supervise-daemon.
+
+commit cfbe9c2ede24dac530ef58e5c35bd57f22a788a3
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    move get_pid function to a shared file
+
+commit df28002b728b033c00c2da64dedf2bcd4ab5e11b
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    Update ChangeLog
+
 commit 66ed8082d0c865a0b4f4cc436cf9e13351e3d6fe
 Author: William Hubbs <w.d.hubbs@gmail.com>
 Commit: William Hubbs <w.d.hubbs@gmail.com>
@@ -1074,441 +1570,3 @@ Author: William Hubbs <w.d.hubbs@gmail.com>
 Commit: William Hubbs <w.d.hubbs@gmail.com>
 
     src/rc/rc: do not try to start services if fork fails
-
-commit 003657c973ea338a19f2b7294190af9d76cf5cea
-Author: Robin H. Johnson <robbat2@gentoo.org>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    init.d/loopback: drop scope on loopback
-    
-    Busybox does not support the 'scope' argument on 'ip address add' or 'ip
-    route add', this is documented in BUSYBOX.md, but is no longer actually
-    needed, as the kernel does get it right without manual specification,
-    and the ifconfig variant already relies on the kernel to get it right.
-    This is part of #103.
-    
-    X-Gentoo-Bug: 487208
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=487208
-
-commit 4fd144c0a6526963c70f18cb34a65354c2f0a48c
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    src/rc/rc-misc.c: report error if call to flock() fails
-    
-    X-Gentoo-Bug: 597390
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=597390
-
-commit c44c904a61418189c989e978b0237e5b161263ef
-Author: Joe Maloney <jpm820@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    init.d.misc/wpa_supplicant: find wireless interface for FreeBSD
-    
-    This fixes #101.
-
-commit 78146b0e14cb57dda8a3aed3d4f8d6b1db7a3c7e
-Author: Sven Wegener <swegener@gentoo.org>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    do_service: Initialize idx to 0
-    
-    If index is not explicitly specified for service_started_daemon, it will
-    look for daemons by random index.
-    
-    This fixes #100.
-
-commit deaae7ab5c499191426cec81f6e803c972f0cca3
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    init.d/sysfs: load efivarfs module when booting in efi mode:1
-    
-    The presence of /sys/firmware/efi is used to indicate that the system
-    was booted in efi mode.
-
-commit 3d2c2f0b871944492036d04b0c220ccba1fa2dd5
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    init.d/sysfs: fix efivarfs module test
-
-commit 6a0c033a64ce18056625cd37a94b9810dc5784e3
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    init.d/sysfs: fix efivarfs handling
-    
-    Separate loading the module, if it isn't built in or loaded, from
-    mounting the file system.
-    
-    This also makes sure the warning about configuring the module in
-    /etc/conf.d/modules or building it in is displayed only if it is loaded
-    successfully.
-    
-    X-Gentoo-Bug: 595836
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=595836
-
-commit 6710316a18c33601e780282e72c60f09b5175280
-Author: Doug Freed <dwfreed@mtu.edu>
-Commit: Doug Freed <dwfreed@mtu.edu>
-
-    openrc-run: fix double free
-
-commit 61882821e0d6110a2ca2f67fad7c362983a85cf0
-Author: Doug Freed <dwfreed@mtu.edu>
-Commit: Doug Freed <dwfreed@mtu.edu>
-
-    init.d: Clean up some bad ewarn output
-
-commit 969546bcf0203379db286be21c7f709d27cc73b0
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    typo fix
-    
-    X-Gentoo-Bug: 595306
-    X-Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=595306
-
-commit d0ae7ffc2534fa65c2e8927931f5107ce4505ca6
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    version 0.23
-
-commit b71bcc242202752bc74fce3a5c629f172b04fca5
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    update ChangeLog
-
-commit 24010dcb483cf7284cd8a5db111ae63f0d4e1038
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    dist: convert to tar.gz
-    
-    This allows the "make dist" target to be used as well as the github
-    archive generation.
-
-commit 0a76627345a173fc00be9864f3f3f5c3b15319cd
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    init.d/swap: remove the case for linux
-    
-    I am removing the separate case for Linux, because we are droppping the
-    "-e" switch.
-
-commit bbf98befb86337a36ef5af7f273e503a6de4b9bd
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    sh/init.sh.Linux.in: update test for live /proc to use md5sum
-    
-    This allows us to avoid the warnings from bash-4.4 about null bytes in
-    command substitutions.
-    
-    If you have separate /usr, are not using an initramfs, and have a file
-    called /proc/self/environ on your root file system, this will break.
-    X-Gentoo-Bug: 594534
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=594534
-
-commit 316903fbf0da6edc067a98327c8c6cb2b3cdcf93
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    man/openrc-run.8: typo fix
-
-commit 66a9788435e51e658e4ae9d3ce0d0e54ea53e4f9
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    man/openrc-run.8: Add note about eval usage
-    
-    This fixes #77.
-
-commit bf73363f220ff086d2559e7c2015801f80862749
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    Add --use-blacklist to modprobe calls in modules and modules-load
-    
-    This means that we will honor the modprobe black lists.
-    
-    X-Gentoo-Bug: 594012
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=594012
-
-commit d6c30ab12a3b335ac57cd1f0ac00231bb34fc0c4
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    Revert "Remove eval calls from supervisor start functions"
-    
-    This reverts commit 0d1f1010c299a95332f224c3be9e8dfdd85eec54.
-    We need the eval in case someone uses something like:
-    command_args="this \"is a\" test"
-    
-    This is related to #77.
-
-commit 0d1f1010c299a95332f224c3be9e8dfdd85eec54
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    Remove eval calls from supervisor start functions
-    
-    This fixes #77.
-
-commit 83bb827edf5b9be04a326d1970d6f55db239281f
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    Revert "Disable parallel startup in interactive mode"
-    
-    This reverts commit 8b4fc05ff2645b2ecb0f153492f72dd8b39ba431.
-    The original commit did not explain why this feature was disabled, and I
-    now have a request to enable it.
-    
-    This fixes #24.
-
-commit c146b966913ae80652e3be925d3aba60ed82f14d
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    Add command_progress variable
-    
-    If this is set to yes, 1, true, or on, start-stop-daemon will display a
-    progress meter while waiting for a daemon to stop.
-
-commit 6cabaf274defa11773094a2c85b3d0a9f0bd9b08
-Author: Doug Freed <dwfreed@mtu.edu>
-Commit: Doug Freed <dwfreed@mtu.edu>
-
-    rc-misc: allow EINFO_VERBOSE through too
-
-commit 1edb5f6fd9c4827e5d4ed5c854bc322ba8a7df73
-Author: Doug Freed <dwfreed@mtu.edu>
-Commit: Doug Freed <dwfreed@mtu.edu>
-
-    rc-misc: Allow EINFO_COLOR through env_filter()
-    
-    This allows rc-service -C <service> <action> to properly not print color
-    messages.
-    
-    Fixes #93
-
-commit c4d7e02abd7008b8e8ad16f62c2abbb60fab252b
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    Fix permission checks for cgroups
-    
-    This is needed because containers may give read access to cgroups but
-    not allow the settings to be changed.
-
-commit a4e0d675e13f07bf880da10a4d602983a556264d
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    man/openrc-run.8: update variable documentation
-    
-    - document command_args_background and command_user.r
-    - clarify documentation for command_background
-    
-    This fixes #78.
-
-commit 8a8032478a755f6e2ceaebc5425e61c6817df936
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    Make use of name vs RC_SVCNAME consistent in supervisor scripts
-    
-    This fixes #79.
-
-commit ac53c9a658589456c678b6bfe674a66a3845e564
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    sh/init.sh: fix the test for cache restoration
-    
-    This fixes the test for cache restoration since we are no longer caching
-    the dependency tree.
-
-commit b02ff466fa75cc4b5bcfaff3f2989cc65c823f43
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    savecache: stop saving the dependency tree
-    
-    This fixes #85.
-
-commit 6bd0f2d096f149906061a4ac7b66b7e85516784a
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    init.d/procfs: typo fix
-
-commit 63f8ae466f046dcdbb0ba13ef96e63eeec86e6e6
-Author: frickler01 <frickler01@users.noreply.github.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    Format code blocks and variable/path notations
-    
-    Add markdown backticks for commands, variable names and path as well
-    as code blocks for better readability.
-    
-    This fixes #97.
-
-commit 841b883825ddf9982a673b3964757f6df25acd46
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    hwclock: fix module load warning
-
-commit ba10793b0b85b11fae04e6526716c6f7976afde1
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    init.d/procfs: fix binfmt_misc module load warning
-    
-    This reworks the logic so that the warning about configuring the
-    binfmt_misc module is only displayed if the module actually has to be
-    loaded.
-
-commit d4d559323819c8a5279bf197d8d3ff80f1e28cdc
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    sh/openrc-run.sh: read global configuration settings first
-    
-    X-Gentoo-Bug: 503134
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=503134
-
-commit d5db5489be135ae9295e378e789b4b7b13367fdd
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    init.d/swap: do not unmount all tmpfs file systems
-    
-    X-Gentoo-Bug: 568162
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=568162
-
-commit d06db93d5954460668d09cf6ef2fc401ee9d981c
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    remove swapfiles service
-    
-    The swapfiles service was basically a copy of the swap service, so this
-    commit consolidates the functionality into the swap service.
-    
-    X-Funtoo-Bug-URL: https://bugs.funtoo.org/browse/FL-2523
-    X-Gentoo-Bug: 568162
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=568162
-
-commit 8c14d0c476e06fff7598c526e26b6a13d53a4600
-Author: Martin Väth <martin@mvath.de>
-Commit: Martin Väth <martin@mvath.de>
-
-    Fix typo in RC_UNAME check of modules-load
-    
-    The $RC_UNAME "Linux" had been misspelled as "linux".
-    As a consequence, entries in e.g. /etc/modules-load.d failed to
-    load any module succesfully under Linux(!)
-
-commit 04debf6f25b3748a101b61cb85f78617dbe5be6e
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    another news typo fix
-
-commit c289774b00d0d7dc38fdc1f0f623569bd184a4b1
-Author: Doug Freed <dwfreed@mtu.edu>
-Commit: Doug Freed <dwfreed@mtu.edu>
-
-    modules-load: handle comments better
-    
-    This handles comments without a trailing space after the comment
-    character.
-    
-    Reported-By: josef64
-
-commit 9dd8ee330d8a4449c937bc95fc8393a55913c8d1
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    typo fix
-
-commit 5d5856c193768d24f11d5f0533e48c39526aef5c
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    Update news file
-    
-    Add information on modules-load service and more explanation about
-    dealing with the rc -> openrc and runscript -> openrc-run transitions.
-
-commit 686e172207ac9e23560da18a6f877be777ded935
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    init.d: add modules-load to ignore patterns
-
-commit fef6268f8d03e3ab3e2564cbf3634d0db2bcd99e
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    modules-load.d: cleanups
-    
-    Move list of directories to a local variable and create the fn variable
-    to use for an individual file name rather than using path.
-
-commit 556dbff99d53cdcc00e6b1ec67e1679f72b6f284
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    Add modules-load.d support
-
-commit 69ac78d76a31d843c004717eb6aa6a77bb4c9a8e
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    openrc-run: make runscript warning respect quiet option
-    
-    X-Gentoo-Bug: 591414
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=591414
-
-commit 4018dfc8de4818101c336ff8bcf0f4762b318c6a
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    init.d/hostname: do not use localhost as a default hostname
-    
-    This allows the operating system default hostname to be used if no
-    hostname is configured.
-
-commit 353bb9bc9a0ab3c6650d72d2ceb14c990762a2a0
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    init.d/hostname: add support for /etc/hostname
-
-commit 73cdf10f1f513be7b5dec4f1cc91e0c68cda689b
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    Deprecate automatic loading of modules
-    
-    In the hwclock, procfs and sysfs service scripts, we automatically
-    attempt to load the kernel modules we need before we take any action. We
-    shouldn't do this, because there are systems which do not use kernel
-    modules and do not have the kmod package installed.
-    
-    With this change, we continue to load the modules ourselves, but we warn
-    the admin that they need to be added to /etc/conf.d/modules or built
-    into the kernel.
-    
-    In the future, this automatic loading will be dropped.
-    
-    X-Gentoo-Bug: 342313
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=342313

Makefile.inc

@@ -1,3 +1,3 @@
 NAME=		openrc
-VERSION=	0.29
+VERSION=	0.34.3
 PKG=		${NAME}-${VERSION}

NEWS.md

@@ -3,6 +3,21 @@
 This file will contain a list of notable changes for each release. Note
 the information in this file is in reverse order.
 
+## OpenRC 0.33
+
+This version removes the "service" binary which was just a copy of
+"rc-service" provided for compatibility.
+
+If you still need the "service" binary, as opposed to "rc-service", it is
+recommended that you use something like Debian's init-system-helpers.
+Otherwise, just use "rc-service" in place of "service".
+
+## OpenRC 0.31
+
+This version adds support for Control Groups version 2, which is
+considered stable as of Linux-4.13. Please see /etc/rc.conf for
+documentation on how to configure control groups.
+
 ## OpenRC-0.28
 
 This version mounts efivars read only due to concerns about changes in

conf.d/agetty

@@ -1,3 +1,6 @@
+# make agetty quiet
+#quiet="yes"
+
 # Set the baud rate of the terminal line
 #baud=""
 

etc/rc.conf

@@ -191,13 +191,43 @@ rc_tty_number=12
 ##############################################################################
 # LINUX CGROUPS RESOURCE MANAGEMENT
 
-# If you have cgroups turned on in your kernel, this switch controls
+# This sets the mode used to mount cgroups.
-# whether or not a group for each controller is mounted under
+# "hybrid" mounts cgroups version 2 on /sys/fs/cgroup/unified and
-# /sys/fs/cgroup.
+# cgroups version 1 on /sys/fs/cgroup.
-# None of the other options in this section work if this is set to "NO".
+# "legacy" mounts cgroups version 1 on /sys/fs/cgroup
+# "unified" mounts cgroups version 2 on /sys/fs/cgroup
+#rc_cgroup_mode="hybrid"
+
+# This is a list of controllers which should be enabled for cgroups version 2.
+# If hybrid mode is being used, controllers listed here will not be
+# available for cgroups version 1.
+# This is a global setting.
+#rc_cgroup_controllers=""
+
+# This variable contains the cgroups version 2 settings for your services.
+# If this is set in this file, the settings will apply to all services.
+# If you want different settings for each service, place the settings in
+# /etc/conf.d/foo for service foo.
+# The format is to specify the setting and value followed by a newline.
+# Multiple settings and values can be specified.
+# For example, you would use this to set the maximum memory and maximum
+# number of pids for a service.
+#rc_cgroup_settings="
+#memory.max 10485760
+#pids.max max
+#"
+#
+# For more information about the adjustments that can be made with
+# cgroups version 2, see Documentation/cgroups-v2.txt in the linux kernel
+# source tree.
+#rc_cgroup_settings=""
+
+# This switch controls whether or not cgroups version 1 controllers are
+# individually mounted under
+# /sys/fs/cgroup in hybrid or legacy mode.
 #rc_controller_cgroups="YES"
 
-# The following settings allow you to set up values for the cgroup
+# The following settings allow you to set up values for the cgroups version 1
 # controllers for your services.
 # They can be set in this file;, however, if you do this, the settings
 # will apply to all of your services.
@@ -211,8 +241,9 @@ rc_tty_number=12
 # cpu.shares 512
 # "
 #
-#For more information about the adjustments that can be made with
+# For more information about the adjustments that can be made with
-#cgroups, see Documentation/cgroups/* in the linux kernel source tree.
+# cgroups version 1, see Documentation/cgroups-v1/* in the linux kernel
+# source tree.
 
 # Set the blkio controller settings for this service.
 #rc_cgroup_blkio=""
@@ -246,10 +277,33 @@ rc_tty_number=12
 
 # Set this to YES if you want all of the processes in a service's cgroup
 # killed when the service is stopped or restarted.
-# This should not be set globally because it kills all of the service's
+# Be aware that setting this to yes means all of a service's
-# child processes, and most of the time this is undesirable. Please set
+# child processes will be killed. Keep this in mind if you set this to
-# it in /etc/conf.d/<service>.
+# yes here instead of for the individual services in
+# /etc/conf.d/<service>.
 # To perform this cleanup manually for a stopped service, you can
 # execute cgroup_cleanup with /etc/init.d/<service> cgroup_cleanup or
 # rc-service <service> cgroup_cleanup.
+# The process followed in this cleanup is the following:
+# 1. send stopsig (sigterm if it isn't set) to all processes left in the
+# cgroup immediately followed by sigcont.
+# 2. Send sighup to all processes in the cgroup if rc_send_sighup is
+# yes.
+# 3. delay for rc_timeout_stopsec seconds.
+# 4. send sigkill to all processes in the cgroup unless disabled by
+# setting rc_send_sigkill to no.
 # rc_cgroup_cleanup="NO"
+
+# If this is yes, we will send sighup to the processes in the cgroup
+# immediately after stopsig and sigcont.
+#rc_send_sighup="NO"
+
+# This is the amount of time in seconds that we delay after sending sigcont
+# and optionally sighup, before we optionally send sigkill to all
+# processes in the # cgroup.
+# The default is 90 seconds.
+#rc_timeout_stopsec="90"
+
+# If this is set to no, we do not send sigkill to all processes in the
+# cgroup.
+#rc_send_sigkill="YES"

guide.md

@@ -53,9 +53,6 @@ Calling `openrc` without any arguments will try to reset all services so
 that the current runlevel is satisfied; if you manually started apache it will be 
 stopped, and if squid died but is in the current runlevel it'll be restarted.
 
-There is a `service` helper that emulates the syntax seen on e.g. older Redhat
-and Ubuntu (`service nginx start` etc.)
-
 # Runlevels
 
 OpenRC has a concept of runlevels, similar to what sysvinit historically 
@@ -241,17 +238,36 @@ messages to a file), and a few others.
 
 # ulimit and CGroups
 
-Setting `ulimit` and `nice` values per service can be done through the `rc_ulimit`
+Setting `ulimit` and `nice` values per service can be done through the
-variable.
+`rc_ulimit` variable.
 
-Under Linux, OpenRC can optionally use CGroups for process management.
+Under Linux, OpenRC can use cgroups for process management as well. Once
-By default each service script's processes are migrated to their own CGroup.
+the kernel is configured appropriately, the `rc_cgroup_mode` setting in
+/etc/rc.conf should be used to control whether cgroups version one,,
+two, or both are used. The default is to use both if they are available.
+
+By changing certain settings in the service's `conf.d` file limits can be
+enforced per service. These settings are documented in detail in the
+default /etc/rc.conf under `LINUX CGROUPS RESOURCE MANAGEMENT`.
+
+# Dealing with Orphaned Processes
+
+It is possible to get into a state where there are orphaned processes
+running which were part of a service. For example, if you are monitoring
+a service with supervise-daemon and supervise-daemon dies for an unknown
+reason. The way to deal with this will be different for each system.
+
+On Linux systems with cgroups enabled, the cgroup_cleanup command is
+added to all services. You can run it manually, when the service is
+stopped, by using:
+
+```
+# rc-service someservice cgroup_cleanup
+```
+
+The `rc_cgroup_cleanup` setting can be changed to yes to make this
+happen automatically when the service is stopped.
 
-By changing certain values in the `conf.d` file limits can be enforced per 
-service. It is easy to find orphan processes of a service that persist after 
-`stop()`, but by default these will NOT be terminated.
-To change this add `rc_cgroup_cleanup="yes"` in the `conf.d` files for services 
-where you desire this functionality.
 
 # Caching
 

init.d/agetty.in

@@ -16,6 +16,7 @@ term_type="${term_type:-linux}"
 command=/sbin/agetty
 command_args_foreground="${agetty_options} ${port} ${baud} ${term_type}"
 pidfile="/run/${RC_SVCNAME}.pid"
+export EINFO_QUIET="${quiet:-yes}"
 
 depend() {
 	after local

init.d/staticroute.in

@@ -1,4 +1,4 @@
-S#!@BINDIR@/openrc-run
+#!@SBINDIR@/openrc-run
 # Copyright (c) 2009-2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
 # https://github.com/OpenRC/openrc/blob/master/AUTHORS

init.d/sysfs.in

@@ -107,39 +107,114 @@ mount_misc()
 	fi
 }
 
-mount_cgroups()
+cgroup1_base()
 {
-	# set up kernel support for cgroups
+	grep -qw cgroup /proc/filesystems || return 0
-	if [ -d /sys/fs/cgroup ] && ! mountinfo -q /sys/fs/cgroup; then
+	if ! mountinfo -q /sys/fs/cgroup; then
-		if grep -qs cgroup /proc/filesystems; then
+		ebegin "Mounting cgroup filesystem"
-			ebegin "Mounting cgroup filesystem"
+		local opts="${sysfs_opts},mode=755,size=${rc_cgroupsize:-10m}"
-			local opts="${sysfs_opts},mode=755,size=${rc_cgroupsize:-10m}"
+		mount -n -t tmpfs -o "${opts}" cgroup_root /sys/fs/cgroup
-			mount -n -t tmpfs -o ${opts} cgroup_root /sys/fs/cgroup
+		eend $?
-			eend $?
-		fi
 	fi
 
-	mountinfo -q /sys/fs/cgroup || return 0
-
 	if ! mountinfo -q /sys/fs/cgroup/openrc; then
-		local agent="@LIBEXECDIR@/sh/cgroup-release-agent.sh"
+		local agent="${RC_LIBEXECDIR}/sh/cgroup-release-agent.sh"
 		mkdir /sys/fs/cgroup/openrc
 		mount -n -t cgroup \
 			-o none,${sysfs_opts},name=openrc,release_agent="$agent" \
 			openrc /sys/fs/cgroup/openrc
 		printf 1 > /sys/fs/cgroup/openrc/notify_on_release
 	fi
+	return 0
+}
 
-	yesno ${rc_controller_cgroups:-YES} && [ -e /proc/cgroups ] || return 0
+cgroup1_controllers()
-	while read name hier groups enabled rest; do
+{
+	yesno "${rc_controller_cgroups:-YES}" && [ -e /proc/cgroups ] || return 0
+	while read -r name _ _ enabled rest; do
 		case "${enabled}" in
-			1)	mountinfo -q /sys/fs/cgroup/${name} && continue
+			1)	mountinfo -q "/sys/fs/cgroup/${name}" && continue
-				mkdir /sys/fs/cgroup/${name}
+				local x
-				mount -n -t cgroup -o ${sysfs_opts},${name} \
+				for x in $rc_cgroup_controllers; do
-					${name} /sys/fs/cgroup/${name}
+				[ "${name}" = "blkio" ] && [ "${x}" = "io" ] &&
+					continue 2
+				[ "${name}" = "${x}" ] &&
+				continue 2
+				done
+				mkdir "/sys/fs/cgroup/${name}"
+				mount -n -t cgroup -o "${sysfs_opts},${name}" \
+					"${name}" "/sys/fs/cgroup/${name}"
 				;;
 		esac
 	done < /proc/cgroups
+	return 0
+}
+
+cgroup2_base()
+{
+	local base
+	base="$(cgroup2_find_path)"
+	mkdir -p "${base}"
+	mount -t cgroup2 none -o "${sysfs_opts},nsdelegate" "${base}" 2> /dev/null ||
+		mount -t cgroup2 none -o "${sysfs_opts}" "${base}"
+	return 0
+}
+
+cgroup2_controllers()
+{
+	local active cgroup_path x y
+	cgroup_path="$(cgroup2_find_path)"
+	[ -z "${cgroup_path}" ] && return 0
+	[ -e "${cgroup_path}/cgroup.controllers" ] &&
+	read -r active < "${cgroup_path}/cgroup.controllers"
+	for x in ${rc_cgroup_controllers}; do
+		for y in ${active}; do
+		[ "$x" = "$y" ] &&
+			[ -e "${cgroup_path}/cgroup.subtree_control" ]&&
+			echo "+${x}"  > "${cgroup_path}/cgroup.subtree_control"
+		done
+	done
+	return 0
+}
+
+cgroups_hybrid()
+{
+	grep -qw cgroup /proc/filesystems || return 0
+	cgroup1_base
+	if grep -qw cgroup2 /proc/filesystems; then
+		cgroup2_base
+		cgroup2_controllers
+	fi
+	cgroup1_controllers
+	return 0
+}
+
+cgroups_legacy()
+{
+	grep -qw cgroup /proc/filesystems || return 0
+	cgroup1_base
+	cgroup1_controllers
+	return 0
+}
+
+cgroups_unified()
+{
+	cgroup2_base
+	cgroup2_controllers
+	return 0
+}
+
+mount_cgroups()
+{
+	# set up kernel support for cgroups
+	if [ -d /sys/fs/cgroup ]; then
+		case "${rc_cgroup_mode:-hybrid}" in
+		hybrid) cgroups_hybrid ;;
+		legacy) cgroups_legacy ;;
+		unified) cgroups_unified ;;
+		esac
+	fi
+	return 0
 }
 
 restorecon_sys()

man/Makefile

@@ -6,7 +6,7 @@ MAN3=		einfo.3 \
 		rc_config.3 rc_deptree.3 rc_find_pids.3 rc_plugin_hook.3 \
 		rc_runlevel.3 rc_service.3 rc_stringlist.3
 MAN8=		rc-service.8 rc-status.8 rc-update.8 openrc.8 openrc-run.8 \
-		service.8 start-stop-daemon.8 supervise-daemon.8
+		start-stop-daemon.8 supervise-daemon.8
 
 ifeq (${OS},Linux)
 MAN8 += rc-sstat.8 openrc-init.8 openrc-shutdown.8

man/openrc-run.8

@@ -217,8 +217,10 @@ that dependency type to the function, or prefix the names with ! to
 remove them from the dependencies.
 .Bl -tag -width "RC_DEFAULTLEVEL"
 .It Ic need
-The service will refuse to start until needed services have started and it
+The service will attempt to start any services it needs regardless of
-will refuse to stop until any services that need it have stopped.
+whether they have been added to the runlevel. It will refuse to start
+until all services it needs have started, and it will refuse to stop until all
+services that need it have stopped.
 .It Ic use
 The service will attempt to start any services it uses that have been added
 to the runlevel.

man/service.8

@@ -1 +0,0 @@
-.so rc-service.8

man/supervise-daemon.8

@@ -36,6 +36,8 @@
 .Ar pidfile
 .Fl P , -respawn-period
 .Ar seconds
+.Fl R , -retry
+.Ar arg
 .Fl r , -chroot
 .Ar chrootpath
 .Fl u , -user
@@ -115,6 +117,9 @@ Modifies the scheduling priority of the daemon.
 .It Fl P , -respawn-period Ar seconds
 Sets the length of a respawn period. The default is 10 seconds. See the
 description of --respawn-max for more information.
+.It Fl R , -retry Ar timeout | Ar signal Ns / Ns Ar timeout
+The retry specification can be either a timeout in seconds or multiple
+signal/timeout pairs (like SIGTERM/5).
 .It Fl r , -chroot Ar path
 chroot to this directory before starting the daemon. All other paths, such
 as the path to the daemon, chdir and pidfile, should be relative to the chroot.

sh/openrc-run.sh.in

@@ -258,8 +258,7 @@ for _cmd; do
 		[ -n "${rc_ulimit:-$RC_ULIMIT}" ] && \
 			ulimit ${rc_ulimit:-$RC_ULIMIT}
 		# Apply cgroups settings if defined
-		if [ "$(command -v cgroup_add_service)" = \
+		if [ "$(command -v cgroup_add_service)" = "cgroup_add_service" ]
-		    "cgroup_add_service" ]
 		then
 			if [ -d /sys/fs/cgroup -a ! -w /sys/fs/cgroup ]; then
 				eerror "No permission to apply cgroup settings"
@@ -268,9 +267,11 @@ for _cmd; do
 			cgroup_add_service /sys/fs/cgroup/openrc
 			cgroup_add_service /sys/fs/cgroup/systemd/system
 		fi
-		[ "$(command -v cgroup_set_limits)" = \
+		[ "$(command -v cgroup_set_limits)" = "cgroup_set_limits" ] &&
-		    "cgroup_set_limits" ] && \
+			cgroup_set_limits
-		    cgroup_set_limits
+		[ "$(command -v cgroup2_set_limits)" = "cgroup2_set_limits" ] &&
+			[ "$_cmd" = start ] &&
+			cgroup2_set_limits
 		break
 	fi
 done
@@ -364,10 +365,14 @@ while [ -n "$1" ]; do
 				then
 					"$1"_post || exit $?
 				fi
-				[ "$(command -v cgroup_cleanup)" = "cgroup_cleanup" -a \
+				[ "$(command -v cgroup_cleanup)" = "cgroup_cleanup" ] &&
-				"$1" = "stop" ] && \
+					[ "$1" = "stop" ] &&
-				yesno "${rc_cgroup_cleanup}" && \
+					yesno "${rc_cgroup_cleanup}" && \
 					cgroup_cleanup
+				if [ "$(command -v cgroup2_remove)" = "cgroup2_remove" ]; then
+					[ "$1" = stop ] || [ -z "${command}" ] &&
+					cgroup2_remove
+				fi
 				shift
 				continue 2
 			else

sh/rc-cgroup.sh.in

@@ -14,46 +14,56 @@ description_cgroup_cleanup="Kill all processes in the cgroup"
 
 cgroup_find_path()
 {
-	local OIFS n name dir result
+	local OIFS name dir result
 	[ -n "$1" ] || return 0
 	OIFS="$IFS"
 	IFS=":"
-	while read n name dir; do
+	while read -r _ name dir; do
 		[ "$name" = "$1" ] && result="$dir"
 	done < /proc/1/cgroup
 	IFS="$OIFS"
-	echo $result
+	printf "%s" "${result}"
 }
 
 cgroup_get_pids()
 {
-	local p
+	local cgroup_procs p pids
-	pids=
+	cgroup_procs="$(cgroup2_find_path)"
-	while read p; do
+	[ -n "${cgroup_procs}" ] &&
-		[ $p -eq $$ ] || pids="${pids} ${p}"
+		cgroup_procs="${cgroup_procs}/${RC_SVCNAME}/cgroup.procs" ||
-	done < /sys/fs/cgroup/openrc/${RC_SVCNAME}/tasks
+		cgroup_procs="/sys/fs/cgroup/openrc/${RC_SVCNAME}/tasks"
-	[ -n "$pids" ]
+	[ -f "${cgroup_procs}" ] || return 0
+	while read -r p; do
+		[ "$p" -eq $$ ] || pids="${pids} ${p}"
+	done < "${cgroup_procs}"
+	printf "%s" "${pids}"
+	return 0
 }
 
 cgroup_running()
 {
-	[ -d "/sys/fs/cgroup/openrc/${RC_SVCNAME}" ]
+	[ -d "/sys/fs/cgroup/unified/${RC_SVCNAME}" ] ||
+			[ -d "/sys/fs/cgroup/${RC_SVCNAME}" ] ||
+			[ -d "/sys/fs/cgroup/openrc/${RC_SVCNAME}" ]
 }
 
 cgroup_set_values()
 {
-	[ -n "$1" -a -n "$2" -a -d "/sys/fs/cgroup/$1" ] || return 0
+	[ -n "$1" ] && [ -n "$2" ] && [ -d "/sys/fs/cgroup/$1" ] || return 0
 
-	local controller="$1" h=$(cgroup_find_path "$1")
+	local controller h
+	controller="$1"
+	h=$(cgroup_find_path "$1")
 	cgroup="/sys/fs/cgroup/${1}${h}openrc_${RC_SVCNAME}"
 	[ -d "$cgroup" ] || mkdir -p "$cgroup"
 
 	set -- $2
 	local name val
-	while [ -n "$1" -a "$controller" != "cpuacct" ]; do
+	while [ -n "$1" ] && [ "$controller" != "cpuacct" ]; do
 		case "$1" in
 			$controller.*)
-				if [ -n "$name" -a -w "$cgroup/$name" -a -n "$val" ]; then
+				if [ -n "${name}" ] && [ -w "${cgroup}/${name}" ] && 
+					[ -n "${val}" ]; then
 					veinfo "$RC_SVCNAME: Setting $cgroup/$name to $val"
 					printf "%s" "$val" > "$cgroup/$name"
 				fi
@@ -68,7 +78,7 @@ cgroup_set_values()
 		esac
 		shift
 	done
-	if [ -n "$name" -a -w "$cgroup/$name" -a -n "$val" ]; then
+	if [ -n "${name}" ] && [ -w "${cgroup}/${name}" ] && [ -n "${val}" ]; then
 		veinfo "$RC_SVCNAME: Setting $cgroup/$name to $val"
 		printf "%s" "$val" > "$cgroup/$name"
 	fi
@@ -134,21 +144,84 @@ cgroup_set_limits()
 	return 0
 }
 
+cgroup2_find_path()
+{
+	if grep -qw cgroup2 /proc/filesystems; then
+		case "${rc_cgroup_mode:-hybrid}" in
+			hybrid) printf "/sys/fs/cgroup/unified" ;;
+			unified) printf "/sys/fs/cgroup" ;;
+		esac
+	fi
+		return 0
+}
+
+cgroup2_remove()
+{
+	local cgroup_path rc_cgroup_path
+	cgroup_path="$(cgroup2_find_path)"
+	[ -z "${cgroup_path}" ] && return 0
+	rc_cgroup_path="${cgroup_path}/${RC_SVCNAME}"
+	[ ! -d "${rc_cgroup_path}" ] ||
+		[ ! -e "${rc_cgroup_path}"/cgroup.events ] &&
+		return 0
+	grep -qx "$$" "${rc_cgroup_path}/cgroup.procs" &&
+		printf "%d" 0 > "${cgroup_path}/cgroup.procs"
+	local key populated vvalue
+	while read -r key value; do
+		case "${key}" in
+			populated) populated=${value} ;;
+			*) ;;
+		esac
+	done < "${rc_cgroup_path}/cgroup.events"
+	[ "${populated}" = 1 ] && return 0
+	rmdir "${rc_cgroup_path}"
+	return 0
+}
+
+cgroup2_set_limits()
+{
+	local cgroup_path
+	cgroup_path="$(cgroup2_find_path)"
+	[ -d "${cgroup_path}" ] || return 0
+	rc_cgroup_path="${cgroup_path}/${RC_SVCNAME}"
+	local OIFS="$IFS"
+	IFS="
+"
+	[ ! -d "${rc_cgroup_path}" ] && mkdir "${rc_cgroup_path}"
+	printf "%d" 0 > "${rc_cgroup_path}/cgroup.procs"
+	echo "${rc_cgroup_settings}" | while IFS="$OIFS" read -r key value; do
+		[ -z "${key}" ] || [ -z "${value}" ] && continue
+		[ ! -e "${rc_cgroup_path}/${key}" ] && continue
+		veinfo "${RC_SVCNAME}: cgroups: ${key} ${value}"
+		printf "%s" "${value}" > "${rc_cgroup_path}/${key}"
+	done
+	IFS="$OIFS"
+	return 0
+}
+
 cgroup_cleanup()
 {
 	cgroup_running || return 0
 	ebegin "starting cgroups cleanup"
-	for sig in TERM QUIT INT; do
+	local pids loops=0
-		cgroup_get_pids || { eend 0 "finished" ; return 0 ; }
+	pids="$(cgroup_get_pids)"
-		for i in 0 1; do
+	if [ -n "${pids}" ]; then
-			kill -s $sig $pids
+		kill -s CONT ${pids} 2> /dev/null
-			for j in 0 1 2; do
+		kill -s "${stopsig:-TERM}" ${pids} 2> /dev/null
-				cgroup_get_pids || { eend 0 "finished" ; return 0 ; }
+		yesno "${rc_send_sighup:-no}" &&
-				sleep 1
+			kill -s HUP ${pids} 2> /dev/null
-			done
+		kill -s "${stopsig:-TERM}" ${pids} 2> /dev/null
-		done 2>/dev/null
+		while [ -n "$(cgroup_get_pids)" ] &&
-	done
+			[ "${loops}" -lt "${rc_timeout_stopsec:-90}" ]; do
-	cgroup_get_pids || { eend 0 "finished" ; return 0; }
+			loops=$((loops+1))
-	kill -9 $pids
+			sleep 1
-	eend $(cgroup_running && echo 1 || echo 0) "fail to stop all processes"
+		done
+		pids="$(cgroup_get_pids)"
+		[ -n "${pids}" ] && yesno "${rc_send_sigkill:-yes}" &&
+			kill -s KILL ${pids} 2> /dev/null
+	fi
+	cgroup2_remove
+	[ -z "$(cgroup_get_pids)" ]
+	eend $? "Unable to stop all processes"
+	return 0
 }

sh/rc-functions.sh.in

@@ -119,6 +119,13 @@ get_bootparam_value()
 	echo $result
 }
 
+need_if_exists()
+{
+	for x; do
+		rc-service --exists "${x}" && need "${x}"
+	done
+}
+
 # Called from openrc-run.sh or gendepends.sh
 _get_containers() {
 	local c

sh/supervise-daemon.sh

@@ -23,6 +23,7 @@ supervise_start()
 	# command_args="this \"is a\" test"
 	# to work properly.
 	eval supervise-daemon --start \
+		${retry:+--retry} $retry \
 		${chroot:+--chroot} $chroot \
 		${pidfile:+--pidfile} $pidfile \
 		${respawn_delay:+--respawn-delay} $respawn_delay \
@@ -55,7 +56,41 @@ supervise_stop()
 	eend $? "Failed to stop ${name:-$RC_SVCNAME}"
 }
 
+_check_supervised()
+{
+	local child_pid start_time
+	child_pid="$(service_get_value "child_pid")"
+	start_time="$(service_get_value "start_time")"
+	if [ -n "${child_pid}" ] && [ -n "${start_time}" ]; then
+		return 1
+	fi
+	return 0
+}
+
 supervise_status()
 {
-	_status
+	if service_stopping; then
+		ewarn "status: stopping"
+		return 4
+	elif service_starting; then
+		ewarn "status: starting"
+		return 8
+	elif service_inactive; then
+		ewarn "status: inactive"
+		return 16
+	elif service_started; then
+		if service_crashed; then
+			if ! _check_supervised; then
+				eerror "status: unsupervised"
+				return 64
+			fi
+			eerror "status: crashed"
+			return 32
+		fi
+		einfo "status: started"
+		return 0
+	else
+		einfo "status: stopped"
+		return 3
+	fi
 }

src/includes/rc-misc.h

@@ -47,6 +47,7 @@ bool rc_conf_yesno(const char *var);
 void env_filter(void);
 void env_config(void);
 int signal_setup(int sig, void (*handler)(int));
+int signal_setup_restart(int sig, void (*handler)(int));
 int svc_lock(const char *);
 int svc_unlock(const char *, int);
 pid_t exec_service(const char *, const char *);
@@ -71,5 +72,6 @@ bool _rc_can_find_pids(void);
 RC_SERVICE lookup_service_state(const char *service);
 void from_time_t(char *time_string, time_t tv);
 time_t to_time_t(char *timestring);
+pid_t get_pid(const char *applet, const char *pidfile);
 
 #endif

src/librc/librc-daemon.c

@@ -80,9 +80,12 @@ rc_find_pids(const char *exec, const char *const *argv, uid_t uid, pid_t pid)
 	DIR *procdir;
 	struct dirent *entry;
 	FILE *fp;
+	int rc;
 	bool container_pid = false;
 	bool openvz_host = false;
 	char *line = NULL;
+	char my_ns[30];
+	char proc_ns[30];
 	size_t len = 0;
 	pid_t p;
 	char buffer[PATH_MAX];
@@ -131,6 +134,14 @@ rc_find_pids(const char *exec, const char *const *argv, uid_t uid, pid_t pid)
 		}
 	}
 
+	memset(my_ns, 0, sizeof(my_ns));
+	memset(proc_ns, 0, sizeof(proc_ns));
+	if (exists("/proc/self/ns/pid")) {
+		rc = readlink("/proc/self/ns/pid", my_ns, sizeof(my_ns));
+		if (rc <= 0)
+			my_ns[0] = '\0';
+	}
+
 	while ((entry = readdir(procdir)) != NULL) {
 		if (sscanf(entry->d_name, "%d", &p) != 1)
 			continue;
@@ -138,6 +149,14 @@ rc_find_pids(const char *exec, const char *const *argv, uid_t uid, pid_t pid)
 			continue;
 		if (pid != 0 && pid != p)
 			continue;
+		snprintf(buffer, sizeof(buffer), "/proc/%d/ns/pid", p);
+		if (exists(buffer)) {
+			rc = readlink(buffer, proc_ns, sizeof(proc_ns));
+			if (rc <= 0)
+				proc_ns[0] = '\0';
+		}
+		if (strcmp(my_ns, proc_ns))
+			continue;
 		if (uid) {
 			snprintf(buffer, sizeof(buffer), "/proc/%d", p);
 			if (stat(buffer, &sb) != 0 || sb.st_uid != uid)

src/librc/librc.c

@@ -894,12 +894,15 @@ rc_service_value_set(const char *service, const char *option,
 		return false;
 
 	snprintf(p, sizeof(file) - (p - file), "/%s", option);
-	if (!(fp = fopen(file, "w")))
+	if (value) {
-		return false;
+		if (!(fp = fopen(file, "w")))
-	if (value)
+			return false;
 		fprintf(fp, "%s", value);
-	fclose(fp);
+		fclose(fp);
-	return true;
+	} else {
+		unlink(file);
+	}
+		return true;
 }
 librc_hidden_def(rc_service_value_set)
 

src/rc/Makefile

@@ -24,7 +24,7 @@ SBINDIR=	${PREFIX}/sbin
 LINKDIR=	${LIBEXECDIR}
 
 BINPROGS=	rc-status
-SBINPROGS = openrc openrc-run rc rc-service rc-update runscript service \
+SBINPROGS = openrc openrc-run rc rc-service rc-update runscript \
 			start-stop-daemon supervise-daemon
 RC_BINPROGS=	einfon einfo ewarnn ewarn eerrorn eerror ebegin eend ewend \
 				eindent eoutdent esyslog eval_ecolors ewaitfile \
@@ -150,16 +150,16 @@ rc-depend: rc-depend.o _usage.o rc-misc.o
 rc-status: rc-status.o _usage.o rc-misc.o
 	${CC} ${LOCAL_CFLAGS} ${LOCAL_LDFLAGS} ${CFLAGS} ${LDFLAGS} -o $@ $^ ${LDADD}
 
-rc-service service: rc-service.o _usage.o rc-misc.o
+rc-service: rc-service.o _usage.o rc-misc.o
 	${CC} ${LOCAL_CFLAGS} ${LOCAL_LDFLAGS} ${CFLAGS} ${LDFLAGS} -o $@ $^ ${LDADD}
 
 rc-update: rc-update.o _usage.o rc-misc.o
 	${CC} ${LOCAL_CFLAGS} ${LOCAL_LDFLAGS} ${CFLAGS} ${LDFLAGS} -o $@ $^ ${LDADD}
 
-start-stop-daemon: start-stop-daemon.o _usage.o rc-misc.o
+start-stop-daemon: start-stop-daemon.o _usage.o rc-misc.o rc-schedules.o
 	${CC} ${LOCAL_CFLAGS} ${LOCAL_LDFLAGS} ${CFLAGS} ${LDFLAGS} -o $@ $^ ${LDADD}
 
-supervise-daemon: supervise-daemon.o _usage.o rc-misc.o
+supervise-daemon: supervise-daemon.o _usage.o rc-misc.o rc-schedules.o
 	${CC} ${LOCAL_CFLAGS} ${LOCAL_LDFLAGS} ${CFLAGS} ${LDFLAGS} -o $@ $^ ${LDADD}
 
 service_get_value service_set_value get_options save_options: do_value.o rc-misc.o

src/rc/rc-misc.c

@@ -217,6 +217,18 @@ signal_setup(int sig, void (*handler)(int))
 	return sigaction(sig, &sa, NULL);
 }
 
+int
+signal_setup_restart(int sig, void (*handler)(int))
+{
+	struct sigaction sa;
+
+	memset(&sa, 0, sizeof (sa));
+	sigemptyset(&sa.sa_mask);
+	sa.sa_handler = handler;
+	sa.sa_flags = SA_RESTART;
+	return sigaction(sig, &sa, NULL);
+}
+
 int
 svc_lock(const char *applet)
 {
@@ -474,3 +486,27 @@ time_t to_time_t(char *timestring)
 	}
 	return result;
 }
+
+pid_t get_pid(const char *applet,const char *pidfile)
+{
+	FILE *fp;
+	pid_t pid;
+
+	if (! pidfile)
+		return -1;
+
+	if ((fp = fopen(pidfile, "r")) == NULL) {
+		ewarnv("%s: fopen `%s': %s", applet, pidfile, strerror(errno));
+		return -1;
+	}
+
+	if (fscanf(fp, "%d", &pid) != 1) {
+		ewarnv("%s: no pid found in `%s'", applet, pidfile);
+		fclose(fp);
+		return -1;
+	}
+
+	fclose(fp);
+
+	return pid;
+}

src/rc/rc-schedules.c

@@ -0,0 +1,419 @@
+/*
+ * The functions in this file control the stopping of daemons by
+ * start-stop-daemon and supervise-daemon.
+ */
+
+/*
+ * Copyright (c) 2015 The OpenRC Authors.
+ * See the Authors file at the top-level directory of this distribution and
+ * https://github.com/OpenRC/openrc/blob/master/AUTHORS
+ *
+ * This file is part of OpenRC. It is subject to the license terms in
+ * the LICENSE file found in the top-level directory of this
+ * distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+ * This file may not be copied, modified, propagated, or distributed
+ *    except according to the terms contained in the LICENSE file.
+ */
+
+/* nano seconds */
+#define POLL_INTERVAL   20000000
+#define WAIT_PIDFILE   500000000
+#define ONE_SECOND    1000000000
+#define ONE_MS           1000000
+
+#include <ctype.h>
+#include <errno.h>
+#include <signal.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+
+#include "einfo.h"
+#include "queue.h"
+#include "rc.h"
+#include "rc-misc.h"
+#include "rc-schedules.h"
+#include "helpers.h"
+
+typedef struct scheduleitem {
+	enum {
+		SC_TIMEOUT,
+		SC_SIGNAL,
+		SC_GOTO,
+		SC_FOREVER,
+	} type;
+	int value;
+	struct scheduleitem *gotoitem;
+	TAILQ_ENTRY(scheduleitem) entries;
+} SCHEDULEITEM;
+
+static TAILQ_HEAD(, scheduleitem) schedule;
+
+void free_schedulelist(void)
+{
+	SCHEDULEITEM *s1 = TAILQ_FIRST(&schedule);
+	SCHEDULEITEM *s2;
+
+	while (s1) {
+		s2 = TAILQ_NEXT(s1, entries);
+		free(s1);
+		s1 = s2;
+	}
+	TAILQ_INIT(&schedule);
+}
+
+int parse_signal(const char *applet, const char *sig)
+{
+	typedef struct signalpair
+	{
+		const char *name;
+		int signal;
+	} SIGNALPAIR;
+
+#define signalpair_item(name) { #name, SIG##name },
+
+	static const SIGNALPAIR signallist[] = {
+		signalpair_item(HUP)
+		signalpair_item(INT)
+		signalpair_item(QUIT)
+		signalpair_item(ILL)
+		signalpair_item(TRAP)
+		signalpair_item(ABRT)
+		signalpair_item(BUS)
+		signalpair_item(FPE)
+		signalpair_item(KILL)
+		signalpair_item(USR1)
+		signalpair_item(SEGV)
+		signalpair_item(USR2)
+		signalpair_item(PIPE)
+		signalpair_item(ALRM)
+		signalpair_item(TERM)
+		signalpair_item(CHLD)
+		signalpair_item(CONT)
+		signalpair_item(STOP)
+		signalpair_item(TSTP)
+		signalpair_item(TTIN)
+		signalpair_item(TTOU)
+		signalpair_item(URG)
+		signalpair_item(XCPU)
+		signalpair_item(XFSZ)
+		signalpair_item(VTALRM)
+		signalpair_item(PROF)
+#ifdef SIGWINCH
+		signalpair_item(WINCH)
+#endif
+#ifdef SIGIO
+		signalpair_item(IO)
+#endif
+#ifdef SIGPWR
+		signalpair_item(PWR)
+#endif
+		signalpair_item(SYS)
+		{ "NULL",	0 },
+	};
+
+	unsigned int i = 0;
+	const char *s;
+
+	if (!sig || *sig == '\0')
+		return -1;
+
+	if (sscanf(sig, "%u", &i) == 1) {
+		if (i < NSIG)
+			return i;
+		eerrorx("%s: `%s' is not a valid signal", applet, sig);
+	}
+
+	if (strncmp(sig, "SIG", 3) == 0)
+		s = sig + 3;
+	else
+		s = NULL;
+
+	for (i = 0; i < ARRAY_SIZE(signallist); ++i)
+		if (strcmp(sig, signallist[i].name) == 0 ||
+		    (s && strcmp(s, signallist[i].name) == 0))
+			return signallist[i].signal;
+
+	eerrorx("%s: `%s' is not a valid signal", applet, sig);
+	/* NOTREACHED */
+}
+
+static SCHEDULEITEM *parse_schedule_item(const char *applet, const char *string)
+{
+	const char *after_hyph;
+	int sig;
+	SCHEDULEITEM *item = xmalloc(sizeof(*item));
+
+	item->value = 0;
+	item->gotoitem = NULL;
+	if (strcmp(string,"forever") == 0)
+		item->type = SC_FOREVER;
+	else if (isdigit((unsigned char)string[0])) {
+		item->type = SC_TIMEOUT;
+		errno = 0;
+		if (sscanf(string, "%d", &item->value) != 1)
+			eerrorx("%s: invalid timeout value in schedule `%s'",
+			    applet, string);
+	} else if ((after_hyph = string + (string[0] == '-')) &&
+	    ((sig = parse_signal(applet, after_hyph)) != -1))
+	{
+		item->type = SC_SIGNAL;
+		item->value = (int)sig;
+	} else
+		eerrorx("%s: invalid schedule item `%s'", applet, string);
+
+	return item;
+}
+
+void parse_schedule(const char *applet, const char *string, int timeout)
+{
+	char buffer[20];
+	const char *slash;
+	int count = 0;
+	SCHEDULEITEM *repeatat = NULL;
+	size_t len;
+	SCHEDULEITEM *item;
+
+	TAILQ_INIT(&schedule);
+	if (string)
+		for (slash = string; *slash; slash++)
+			if (*slash == '/')
+				count++;
+
+	free_schedulelist();
+
+	if (count == 0) {
+		item = xmalloc(sizeof(*item));
+		item->type = SC_SIGNAL;
+		item->value = timeout;
+		item->gotoitem = NULL;
+		TAILQ_INSERT_TAIL(&schedule, item, entries);
+
+		item = xmalloc(sizeof(*item));
+		item->type = SC_TIMEOUT;
+		item->gotoitem = NULL;
+		TAILQ_INSERT_TAIL(&schedule, item, entries);
+		if (string) {
+			if (sscanf(string, "%d", &item->value) != 1)
+				eerrorx("%s: invalid timeout in schedule",
+				    applet);
+		} else
+			item->value = 5;
+
+		return;
+	}
+
+	while (string != NULL) {
+		if ((slash = strchr(string, '/')))
+			len = slash - string;
+		else
+			len = strlen(string);
+
+		if (len >= (ptrdiff_t)sizeof(buffer))
+			eerrorx("%s: invalid schedule item, far too long",
+			    applet);
+
+		memcpy(buffer, string, len);
+		buffer[len] = 0;
+		string = slash ? slash + 1 : NULL;
+
+		item = parse_schedule_item(applet, buffer);
+		TAILQ_INSERT_TAIL(&schedule, item, entries);
+		if (item->type == SC_FOREVER) {
+			if (repeatat)
+				eerrorx("%s: invalid schedule, `forever' "
+				    "appears more than once", applet);
+
+			repeatat = item;
+			continue;
+		}
+	}
+
+	if (repeatat) {
+		item = xmalloc(sizeof(*item));
+		item->type = SC_GOTO;
+		item->value = 0;
+		item->gotoitem = repeatat;
+		TAILQ_INSERT_TAIL(&schedule, item, entries);
+	}
+
+	return;
+}
+
+/* return number of processes killed, -1 on error */
+int do_stop(const char *applet, const char *exec, const char *const *argv,
+    pid_t pid, uid_t uid,int sig, bool test, bool quiet)
+{
+	RC_PIDLIST *pids;
+	RC_PID *pi;
+	RC_PID *np;
+	bool killed;
+	int nkilled = 0;
+
+	if (pid > 0)
+		pids = rc_find_pids(NULL, NULL, 0, pid);
+	else
+		pids = rc_find_pids(exec, argv, uid, 0);
+
+	if (!pids)
+		return 0;
+
+	LIST_FOREACH_SAFE(pi, pids, entries, np) {
+		if (test) {
+			einfo("Would send signal %d to PID %d", sig, pi->pid);
+			nkilled++;
+		} else {
+			if (!quiet)
+				ebeginv("Sending signal %d to PID %d", sig, pi->pid);
+			errno = 0;
+			killed = (kill(pi->pid, sig) == 0 ||
+			    errno == ESRCH ? true : false);
+			if (! quiet)
+				eendv(killed ? 0 : 1,
+				"%s: failed to send signal %d to PID %d: %s",
+				applet, sig, pi->pid, strerror(errno));
+			if (!killed) {
+				nkilled = -1;
+			} else {
+				if (nkilled != -1)
+					nkilled++;
+			}
+		}
+		free(pi);
+	}
+
+	free(pids);
+	return nkilled;
+}
+
+int run_stop_schedule(const char *applet,
+		const char *exec, const char *const *argv,
+		pid_t pid, uid_t uid,
+    bool test, bool progress, bool quiet)
+{
+	SCHEDULEITEM *item = TAILQ_FIRST(&schedule);
+	int nkilled = 0;
+	int tkilled = 0;
+	int nrunning = 0;
+	long nloops, nsecs;
+	struct timespec ts;
+	const char *const *p;
+	bool progressed = false;
+
+	if (exec)
+		einfov("Will stop %s", exec);
+	if (pid > 0)
+		einfov("Will stop PID %d", pid);
+	if (uid)
+		einfov("Will stop processes owned by UID %d", uid);
+	if (argv && *argv) {
+		einfovn("Will stop processes of `");
+		if (rc_yesno(getenv("EINFO_VERBOSE"))) {
+			for (p = argv; p && *p; p++) {
+				if (p != argv)
+					printf(" ");
+				printf("%s", *p);
+			}
+			printf("'\n");
+		}
+	}
+
+	while (item) {
+		switch (item->type) {
+		case SC_GOTO:
+			item = item->gotoitem;
+			continue;
+
+		case SC_SIGNAL:
+			nrunning = 0;
+			nkilled = do_stop(applet, exec, argv, pid, uid, item->value, test,
+					quiet);
+			if (nkilled == 0) {
+				if (tkilled == 0) {
+					if (progressed)
+						printf("\n");
+					eerror("%s: no matching processes found", applet);
+				}
+				return tkilled;
+			}
+			else if (nkilled == -1)
+				return 0;
+
+			tkilled += nkilled;
+			break;
+		case SC_TIMEOUT:
+			if (item->value < 1) {
+				item = NULL;
+				break;
+			}
+
+			ts.tv_sec = 0;
+			ts.tv_nsec = POLL_INTERVAL;
+
+			for (nsecs = 0; nsecs < item->value; nsecs++) {
+				for (nloops = 0;
+				     nloops < ONE_SECOND / POLL_INTERVAL;
+				     nloops++)
+				{
+					if ((nrunning = do_stop(applet, exec, argv,
+						    pid, uid, 0, test, quiet)) == 0)
+						return 0;
+
+
+					if (nanosleep(&ts, NULL) == -1) {
+						if (progressed) {
+							printf("\n");
+							progressed = false;
+						}
+						if (errno == EINTR)
+							eerror("%s: caught an"
+							    " interrupt", applet);
+						else {
+							eerror("%s: nanosleep: %s",
+							    applet, strerror(errno));
+							return 0;
+						}
+					}
+				}
+				if (progress) {
+					printf(".");
+					fflush(stdout);
+					progressed = true;
+				}
+			}
+			break;
+		default:
+			if (progressed) {
+				printf("\n");
+				progressed = false;
+			}
+			eerror("%s: invalid schedule item `%d'",
+			    applet, item->type);
+			return 0;
+		}
+
+		if (item)
+			item = TAILQ_NEXT(item, entries);
+	}
+
+	if (test || (tkilled > 0 && nrunning == 0))
+		return nkilled;
+
+	if (progressed)
+		printf("\n");
+	if (! quiet) {
+		if (nrunning == 1)
+			eerror("%s: %d process refused to stop", applet, nrunning);
+		else
+			eerror("%s: %d process(es) refused to stop", applet, nrunning);
+	}
+
+	return -nrunning;
+}

src/rc/rc-schedules.h

@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2017 The OpenRC Authors.
+ * See the Authors file at the top-level directory of this distribution and
+ * https://github.com/OpenRC/openrc/blob/master/AUTHORS
+ *
+ * This file is part of OpenRC. It is subject to the license terms in
+ * the LICENSE file found in the top-level directory of this
+ * distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+ * This file may not be copied, modified, propagated, or distributed
+ *    except according to the terms contained in the LICENSE file.
+ */
+
+#ifndef __RC_SCHEDULES_H
+#define __RC_SCHEDULES_H
+
+void free_schedulelist(void);
+int parse_signal(const char *applet, const char *sig);
+void parse_schedule(const char *applet, const char *string, int timeout);
+int do_stop(const char *applet, const char *exec, const char *const *argv,
+		pid_t pid, uid_t uid,int sig, bool test, bool quiet);
+int run_stop_schedule(const char *applet,
+		const char *exec, const char *const *argv,
+		pid_t pid, uid_t uid,
+		bool test, bool progress, bool quiet);
+
+#endif

src/rc/rc-selinux.c

@@ -39,7 +39,6 @@
 #include "rc-selinux.h"
 
 /* the context files for selinux */
-#define RUN_INIT_FILE "run_init_type"
 #define INITRC_FILE "initrc_context"
 
 #ifdef HAVE_AUDIT
@@ -299,6 +298,26 @@ static int read_context_file(const char *filename, char **context)
 	return ret;
 }
 
+static int read_run_init_context(char **context)
+{
+	int ret = -1;
+	RC_STRINGLIST *list;
+	char *value = NULL;
+
+	list = rc_config_list(selinux_openrc_contexts_path());
+	if (list == NULL)
+		return ret;
+
+	value = rc_config_value(list, "run_init");
+	if (value != NULL && strlen(value) > 0) {
+		*context = xstrdup(value);
+		ret = 0;
+	}
+
+	rc_stringlist_free(list);
+	return ret;
+}
+
 void selinux_setup(char **argv)
 {
 	char *new_context = NULL;
@@ -312,7 +331,7 @@ void selinux_setup(char **argv)
 		return;
 	}
 
-	if (read_context_file(RUN_INIT_FILE, &run_init_t) != 0) {
+	if (read_run_init_context(&run_init_t) != 0) {
 		/* assume a reasonable default, rather than bailing out */
 		run_init_t = xstrdup("run_init_t");
 		ewarn("Assuming SELinux run_init type is %s", run_init_t);
@@ -339,14 +358,13 @@ void selinux_setup(char **argv)
 		goto out;
 	}
 
-	curr_t = context_type_get(curr_con);
+	curr_t = xstrdup(context_type_get(curr_con));
 	if (!curr_t) {
 		context_free(curr_con);
 		free(curr_context);
 		goto out;
 	}
 
-	curr_t = xstrdup(curr_t);
 	/* dont need them anymore so free() now */
 	context_free(curr_con);
 	free(curr_context);

src/rc/rc-status.c

@@ -128,6 +128,8 @@ print_service(const char *service)
 {
 	char status[60];
 	char uptime [40];
+	char *child_pid = NULL;
+	char *start_time = NULL;
 	int cols =  printf(" %s", service);
 	const char *c = ecolor(ECOLOR_GOOD);
 	RC_SERVICE state = rc_service_state(service);
@@ -147,7 +149,14 @@ print_service(const char *service)
 		    rc_service_daemons_crashed(service) &&
 		    errno != EACCES)
 		{
-			snprintf(status, sizeof(status), " crashed ");
+			child_pid = rc_service_value_get(service, "child_pid");
+			start_time = rc_service_value_get(service, "start_time");
+			if (start_time && child_pid)
+				snprintf(status, sizeof(status), " unsupervised ");
+			else
+				snprintf(status, sizeof(status), " crashed ");
+			free(child_pid);
+			free(start_time);
 		} else {
 			get_uptime(service, uptime, 40);
 			snprintf(status, sizeof(status), " started %s", uptime);

src/rc/start-stop-daemon.c

@@ -19,10 +19,6 @@
  *    except according to the terms contained in the LICENSE file.
  */
 
-/* nano seconds */
-#define POLL_INTERVAL   20000000
-#define WAIT_PIDFILE   500000000
-#define ONE_SECOND    1000000000
 #define ONE_MS           1000000
 
 #include <sys/types.h>
@@ -63,6 +59,7 @@ static struct pam_conv conv = { NULL, NULL};
 #include "queue.h"
 #include "rc.h"
 #include "rc-misc.h"
+#include "rc-schedules.h"
 #include "_usage.h"
 #include "helpers.h"
 
@@ -130,20 +127,6 @@ const char * const longopts_help[] = {
 };
 const char *usagestring = NULL;
 
-typedef struct scheduleitem
-{
-	enum
-		{
-			SC_TIMEOUT,
-			SC_SIGNAL,
-			SC_GOTO,
-			SC_FOREVER
-		} type;
-	int value;
-	struct scheduleitem *gotoitem;
-	TAILQ_ENTRY(scheduleitem) entries;
-} SCHEDULEITEM;
-TAILQ_HEAD(, scheduleitem) schedule;
 static char **nav;
 
 static char *changeuser, *ch_root, *ch_dir;
@@ -166,20 +149,6 @@ static inline int ioprio_set(int which _unused,
 }
 #endif
 
-static void
-free_schedulelist(void)
-{
-	SCHEDULEITEM *s1 = TAILQ_FIRST(&schedule);
-	SCHEDULEITEM *s2;
-
-	while (s1) {
-		s2 = TAILQ_NEXT(s1, entries);
-		free(s1);
-		s1 = s2;
-	}
-	TAILQ_INIT(&schedule);
-}
-
 static void
 cleanup(void)
 {
@@ -188,385 +157,6 @@ cleanup(void)
 	free_schedulelist();
 }
 
-static int
-parse_signal(const char *sig)
-{
-	typedef struct signalpair
-	{
-		const char *name;
-		int signal;
-	} SIGNALPAIR;
-
-#define signalpair_item(name) { #name, SIG##name },
-
-	static const SIGNALPAIR signallist[] = {
-		signalpair_item(HUP)
-		signalpair_item(INT)
-		signalpair_item(QUIT)
-		signalpair_item(ILL)
-		signalpair_item(TRAP)
-		signalpair_item(ABRT)
-		signalpair_item(BUS)
-		signalpair_item(FPE)
-		signalpair_item(KILL)
-		signalpair_item(USR1)
-		signalpair_item(SEGV)
-		signalpair_item(USR2)
-		signalpair_item(PIPE)
-		signalpair_item(ALRM)
-		signalpair_item(TERM)
-		signalpair_item(CHLD)
-		signalpair_item(CONT)
-		signalpair_item(STOP)
-		signalpair_item(TSTP)
-		signalpair_item(TTIN)
-		signalpair_item(TTOU)
-		signalpair_item(URG)
-		signalpair_item(XCPU)
-		signalpair_item(XFSZ)
-		signalpair_item(VTALRM)
-		signalpair_item(PROF)
-#ifdef SIGWINCH
-		signalpair_item(WINCH)
-#endif
-#ifdef SIGIO
-		signalpair_item(IO)
-#endif
-#ifdef SIGPWR
-		signalpair_item(PWR)
-#endif
-		signalpair_item(SYS)
-		{ "NULL",	0 },
-	};
-
-	unsigned int i = 0;
-	const char *s;
-
-	if (!sig || *sig == '\0')
-		return -1;
-
-	if (sscanf(sig, "%u", &i) == 1) {
-		if (i < NSIG)
-			return i;
-		eerrorx("%s: `%s' is not a valid signal", applet, sig);
-	}
-
-	if (strncmp(sig, "SIG", 3) == 0)
-		s = sig + 3;
-	else
-		s = NULL;
-
-	for (i = 0; i < ARRAY_SIZE(signallist); ++i)
-		if (strcmp(sig, signallist[i].name) == 0 ||
-		    (s && strcmp(s, signallist[i].name) == 0))
-			return signallist[i].signal;
-
-	eerrorx("%s: `%s' is not a valid signal", applet, sig);
-	/* NOTREACHED */
-}
-
-static SCHEDULEITEM *
-parse_schedule_item(const char *string)
-{
-	const char *after_hyph;
-	int sig;
-	SCHEDULEITEM *item = xmalloc(sizeof(*item));
-
-	item->value = 0;
-	item->gotoitem = NULL;
-	if (strcmp(string,"forever") == 0)
-		item->type = SC_FOREVER;
-	else if (isdigit((unsigned char)string[0])) {
-		item->type = SC_TIMEOUT;
-		errno = 0;
-		if (sscanf(string, "%d", &item->value) != 1)
-			eerrorx("%s: invalid timeout value in schedule `%s'",
-			    applet, string);
-	} else if ((after_hyph = string + (string[0] == '-')) &&
-	    ((sig = parse_signal(after_hyph)) != -1))
-	{
-		item->type = SC_SIGNAL;
-		item->value = (int)sig;
-	} else
-		eerrorx("%s: invalid schedule item `%s'", applet, string);
-
-	return item;
-}
-
-static void
-parse_schedule(const char *string, int timeout)
-{
-	char buffer[20];
-	const char *slash;
-	int count = 0;
-	SCHEDULEITEM *repeatat = NULL;
-	size_t len;
-	SCHEDULEITEM *item;
-
-	if (string)
-		for (slash = string; *slash; slash++)
-			if (*slash == '/')
-				count++;
-
-	free_schedulelist();
-
-	if (count == 0) {
-		item = xmalloc(sizeof(*item));
-		item->type = SC_SIGNAL;
-		item->value = timeout;
-		item->gotoitem = NULL;
-		TAILQ_INSERT_TAIL(&schedule, item, entries);
-
-		item = xmalloc(sizeof(*item));
-		item->type = SC_TIMEOUT;
-		item->gotoitem = NULL;
-		TAILQ_INSERT_TAIL(&schedule, item, entries);
-		if (string) {
-			if (sscanf(string, "%d", &item->value) != 1)
-				eerrorx("%s: invalid timeout in schedule",
-				    applet);
-		} else
-			item->value = 5;
-
-		return;
-	}
-
-	while (string != NULL) {
-		if ((slash = strchr(string, '/')))
-			len = slash - string;
-		else
-			len = strlen(string);
-
-		if (len >= (ptrdiff_t)sizeof(buffer))
-			eerrorx("%s: invalid schedule item, far too long",
-			    applet);
-
-		memcpy(buffer, string, len);
-		buffer[len] = 0;
-		string = slash ? slash + 1 : NULL;
-
-		item = parse_schedule_item(buffer);
-		TAILQ_INSERT_TAIL(&schedule, item, entries);
-		if (item->type == SC_FOREVER) {
-			if (repeatat)
-				eerrorx("%s: invalid schedule, `forever' "
-				    "appears more than once", applet);
-
-			repeatat = item;
-			continue;
-		}
-	}
-
-	if (repeatat) {
-		item = xmalloc(sizeof(*item));
-		item->type = SC_GOTO;
-		item->value = 0;
-		item->gotoitem = repeatat;
-		TAILQ_INSERT_TAIL(&schedule, item, entries);
-	}
-
-	return;
-}
-
-static pid_t
-get_pid(const char *pidfile)
-{
-	FILE *fp;
-	pid_t pid;
-
-	if (! pidfile)
-		return -1;
-
-	if ((fp = fopen(pidfile, "r")) == NULL) {
-		ewarnv("%s: fopen `%s': %s", applet, pidfile, strerror(errno));
-		return -1;
-	}
-
-	if (fscanf(fp, "%d", &pid) != 1) {
-		ewarnv("%s: no pid found in `%s'", applet, pidfile);
-		fclose(fp);
-		return -1;
-	}
-
-	fclose(fp);
-
-	return pid;
-}
-
-/* return number of processed killed, -1 on error */
-static int
-do_stop(const char *exec, const char *const *argv,
-    pid_t pid, uid_t uid,int sig, bool test)
-{
-	RC_PIDLIST *pids;
-	RC_PID *pi;
-	RC_PID *np;
-	bool killed;
-	int nkilled = 0;
-
-	if (pid)
-		pids = rc_find_pids(NULL, NULL, 0, pid);
-	else
-		pids = rc_find_pids(exec, argv, uid, pid);
-
-	if (!pids)
-		return 0;
-
-	LIST_FOREACH_SAFE(pi, pids, entries, np) {
-		if (test) {
-			einfo("Would send signal %d to PID %d", sig, pi->pid);
-			nkilled++;
-		} else {
-			ebeginv("Sending signal %d to PID %d", sig, pi->pid);
-			errno = 0;
-			killed = (kill(pi->pid, sig) == 0 ||
-			    errno == ESRCH ? true : false);
-			eendv(killed ? 0 : 1,
-				"%s: failed to send signal %d to PID %d: %s",
-				applet, sig, pi->pid, strerror(errno));
-			if (!killed) {
-				nkilled = -1;
-			} else {
-				if (nkilled != -1)
-					nkilled++;
-			}
-		}
-		free(pi);
-	}
-
-	free(pids);
-	return nkilled;
-}
-
-static int
-run_stop_schedule(const char *exec, const char *const *argv,
-    const char *pidfile, uid_t uid,
-    bool test, bool progress)
-{
-	SCHEDULEITEM *item = TAILQ_FIRST(&schedule);
-	int nkilled = 0;
-	int tkilled = 0;
-	int nrunning = 0;
-	long nloops, nsecs;
-	struct timespec ts;
-	pid_t pid = 0;
-	const char *const *p;
-	bool progressed = false;
-
-	if (exec)
-		einfov("Will stop %s", exec);
-	if (pidfile)
-		einfov("Will stop PID in pidfile `%s'", pidfile);
-	if (uid)
-		einfov("Will stop processes owned by UID %d", uid);
-	if (argv && *argv) {
-		einfovn("Will stop processes of `");
-		if (rc_yesno(getenv("EINFO_VERBOSE"))) {
-			for (p = argv; p && *p; p++) {
-				if (p != argv)
-					printf(" ");
-				printf("%s", *p);
-			}
-			printf("'\n");
-		}
-	}
-
-	if (pidfile) {
-		pid = get_pid(pidfile);
-		if (pid == -1)
-			return 0;
-	}
-
-	while (item) {
-		switch (item->type) {
-		case SC_GOTO:
-			item = item->gotoitem;
-			continue;
-
-		case SC_SIGNAL:
-			nrunning = 0;
-			nkilled = do_stop(exec, argv, pid, uid, item->value, test);
-			if (nkilled == 0) {
-				if (tkilled == 0) {
-					if (progressed)
-						printf("\n");
-					eerror("%s: no matching processes found", applet);
-				}
-				return tkilled;
-			}
-			else if (nkilled == -1)
-				return 0;
-
-			tkilled += nkilled;
-			break;
-		case SC_TIMEOUT:
-			if (item->value < 1) {
-				item = NULL;
-				break;
-			}
-
-			ts.tv_sec = 0;
-			ts.tv_nsec = POLL_INTERVAL;
-
-			for (nsecs = 0; nsecs < item->value; nsecs++) {
-				for (nloops = 0;
-				     nloops < ONE_SECOND / POLL_INTERVAL;
-				     nloops++)
-				{
-					if ((nrunning = do_stop(exec, argv,
-						    pid, uid, 0, test)) == 0)
-						return 0;
-
-
-					if (nanosleep(&ts, NULL) == -1) {
-						if (progressed) {
-							printf("\n");
-							progressed = false;
-						}
-						if (errno == EINTR)
-							eerror("%s: caught an"
-							    " interrupt", applet);
-						else {
-							eerror("%s: nanosleep: %s",
-							    applet, strerror(errno));
-							return 0;
-						}
-					}
-				}
-				if (progress) {
-					printf(".");
-					fflush(stdout);
-					progressed = true;
-				}
-			}
-			break;
-		default:
-			if (progressed) {
-				printf("\n");
-				progressed = false;
-			}
-			eerror("%s: invalid schedule item `%d'",
-			    applet, item->type);
-			return 0;
-		}
-
-		if (item)
-			item = TAILQ_NEXT(item, entries);
-	}
-
-	if (test || (tkilled > 0 && nrunning == 0))
-		return nkilled;
-
-	if (progressed)
-		printf("\n");
-	if (nrunning == 1)
-		eerror("%s: %d process refused to stop", applet, nrunning);
-	else
-		eerror("%s: %d process(es) refused to stop", applet, nrunning);
-
-	return -nrunning;
-}
-
 static void
 handle_signal(int sig)
 {
@@ -707,7 +297,6 @@ int main(int argc, char **argv)
 	unsigned int start_wait = 0;
 
 	applet = basename_c(argv[0]);
-	TAILQ_INIT(&schedule);
 	atexit(cleanup);
 
 	signal_setup(SIGINT, handle_signal);
@@ -876,7 +465,7 @@ int main(int argc, char **argv)
 			break;
 
 		case 's':  /* --signal <signal> */
-			sig = parse_signal(optarg);
+			sig = parse_signal(applet, optarg);
 			break;
 
 		case 't':  /* --test */
@@ -1062,13 +651,13 @@ int main(int argc, char **argv)
 		if (!stop)
 			oknodo = true;
 		if (retry)
-			parse_schedule(retry, sig);
+			parse_schedule(applet, retry, sig);
 		else if (test || oknodo)
-			parse_schedule("0", sig);
+			parse_schedule(applet, "0", sig);
 		else
-			parse_schedule(NULL, sig);
+			parse_schedule(applet, NULL, sig);
-		i = run_stop_schedule(exec, (const char *const *)margv,
+		i = run_stop_schedule(applet, exec, (const char *const *)margv,
-		    pidfile, uid, test, progress);
+		    get_pid(applet, pidfile), uid, test, progress, false);
 
 		if (i < 0)
 			/* We failed to stop something */
@@ -1090,12 +679,12 @@ int main(int argc, char **argv)
 	}
 
 	if (pidfile)
-		pid = get_pid(pidfile);
+		pid = get_pid(applet, pidfile);
 	else
 		pid = 0;
 
-	if (do_stop(exec, (const char * const *)margv, pid, uid,
+	if (do_stop(applet, exec, (const char * const *)margv, pid, uid,
-		0, test) > 0)
+		0, test, false) > 0)
 		eerrorx("%s: %s is already running", applet, exec);
 
 	if (test) {
@@ -1365,7 +954,7 @@ int main(int argc, char **argv)
 				alive = true;
 		} else {
 			if (pidfile) {
-				pid = get_pid(pidfile);
+				pid = get_pid(applet, pidfile);
 				if (pid == -1) {
 					eerrorx("%s: did not "
 					    "create a valid"
@@ -1374,8 +963,8 @@ int main(int argc, char **argv)
 				}
 			} else
 				pid = 0;
-			if (do_stop(exec, (const char *const *)margv,
+			if (do_stop(applet, exec, (const char *const *)margv,
-				pid, uid, 0, test) > 0)
+				pid, uid, 0, test, false) > 0)
 				alive = true;
 		}
 

src/rc/supervise-daemon.c

@@ -61,12 +61,13 @@ static struct pam_conv conv = { NULL, NULL};
 #include "queue.h"
 #include "rc.h"
 #include "rc-misc.h"
+#include "rc-schedules.h"
 #include "_usage.h"
 #include "helpers.h"
 
 const char *applet = NULL;
 const char *extraopts = NULL;
-const char *getoptstring = "D:d:e:g:I:Kk:m:N:p:r:Su:1:2:" \
+const char *getoptstring = "D:d:e:g:I:Kk:m:N:p:R:r:Su:1:2:3" \
 	getoptstring_COMMON;
 const struct option longopts[] = {
 	{ "respawn-delay",        1, NULL, 'D'},
@@ -80,11 +81,13 @@ const struct option longopts[] = {
 	{ "nicelevel",    1, NULL, 'N'},
 	{ "pidfile",      1, NULL, 'p'},
 	{ "respawn-period",        1, NULL, 'P'},
+	{ "retry",       1, NULL, 'R'},
 	{ "chroot",       1, NULL, 'r'},
 	{ "start",        0, NULL, 'S'},
 	{ "user",         1, NULL, 'u'},
 	{ "stdout",       1, NULL, '1'},
 	{ "stderr",       1, NULL, '2'},
+	{ "reexec",       0, NULL, '3'},
 	longopts_COMMON
 };
 const char * const longopts_help[] = {
@@ -99,11 +102,13 @@ const char * const longopts_help[] = {
 	"Set a nicelevel when starting",
 	"Match pid found in this file",
 	"Set respawn time period",
+	"Retry schedule to use when stopping",
 	"Chroot to this directory",
 	"Start daemon",
 	"Change the process user",
 	"Redirect stdout to file",
 	"Redirect stderr to file",
+	"reexec (used internally)",
 	longopts_help_COMMON
 };
 const char *usagestring = NULL;
@@ -124,6 +129,13 @@ static bool exiting = false;
 #ifdef TIOCNOTTY
 static int tty_fd = -1;
 #endif
+static pid_t child_pid;
+static int respawn_count = 0;
+static int respawn_delay = 0;
+static int respawn_max = 10;
+static int respawn_period = 5;
+static char *pidfile = NULL;
+static char *svcname = NULL;
 
 extern char **environ;
 
@@ -147,32 +159,71 @@ static void cleanup(void)
 	free(changeuser);
 }
 
-static pid_t get_pid(const char *pidfile)
+static void re_exec(void)
 {
-	FILE *fp;
+	syslog(LOG_WARNING, "Re-executing supervise-daemon");
-	pid_t pid;
+	execlp("supervise-daemon", "supervise-daemon", "--reexec", (char *) NULL);
-
+	syslog(LOG_ERR, "Unable to execute supervise-daemon: %s",
-	if (! pidfile)
+			strerror(errno));
-		return -1;
+	exit(EXIT_FAILURE);
-
-	if ((fp = fopen(pidfile, "r")) == NULL) {
-		ewarnv("%s: fopen `%s': %s", applet, pidfile, strerror(errno));
-		return -1;
-	}
-
-	if (fscanf(fp, "%d", &pid) != 1) {
-		ewarnv("%s: no pid found in `%s'", applet, pidfile);
-		fclose(fp);
-		return -1;
-	}
-
-	fclose(fp);
-
-	return pid;
 }
 
-static void child_process(char *exec, char **argv, char *svcname,
+static void handle_signal(int sig)
-		int start_count)
+{
+	int serrno = errno;
+
+	syslog(LOG_WARNING, "caught signal %d", sig);
+
+	if (sig == SIGTERM)
+		exiting = true;
+	/* Restore errno */
+	errno = serrno;
+	if (! exiting)
+		re_exec();
+}
+
+static char * expand_home(const char *home, const char *path)
+{
+	char *opath, *ppath, *p, *nh;
+	size_t len;
+	struct passwd *pw;
+
+	if (!path || *path != '~')
+		return xstrdup(path);
+
+	opath = ppath = xstrdup(path);
+	if (ppath[1] != '/' && ppath[1] != '\0') {
+		p = strchr(ppath + 1, '/');
+		if (p)
+			*p = '\0';
+		pw = getpwnam(ppath + 1);
+		if (pw) {
+			home = pw->pw_dir;
+			ppath = p;
+			if (ppath)
+				*ppath = '/';
+		} else
+			home = NULL;
+	} else
+		ppath++;
+
+	if (!home) {
+	free(opath);
+		return xstrdup(path);
+	}
+	if (!ppath) {
+		free(opath);
+		return xstrdup(home);
+	}
+
+	len = strlen(ppath) + strlen(home) + 1;
+	nh = xmalloc(len);
+	snprintf(nh, len, "%s%s", home, ppath);
+	free(opath);
+	return nh;
+}
+
+static void child_process(char *exec, char **argv)
 {
 	RC_STRINGLIST *env_list;
 	RC_STRING *env;
@@ -197,11 +248,13 @@ static void child_process(char *exec, char **argv, char *svcname,
 	setsid();
 
 	if (svcname) {
-start_time = time(NULL);
+		start_time = time(NULL);
-from_time_t(start_time_string, start_time);
+		from_time_t(start_time_string, start_time);
 		rc_service_value_set(svcname, "start_time", start_time_string);
-sprintf(start_count_string, "%i", start_count);
+		sprintf(start_count_string, "%i", respawn_count);
 		rc_service_value_set(svcname, "start_count", start_count_string);
+		sprintf(start_count_string, "%d", getpid());
+		rc_service_value_set(svcname, "child_pid", start_count_string);
 	}
 
 	if (nicelevel) {
@@ -344,7 +397,7 @@ sprintf(start_count_string, "%i", start_count);
 
 	*cmdline = '\0';
 	c = argv;
-	while (*c) {
+	while (c && *c) {
 		strcat(cmdline, *c);
 		strcat(cmdline, " ");
 		c++;
@@ -359,109 +412,156 @@ sprintf(start_count_string, "%i", start_count);
 	eerrorx("%s: failed to exec `%s': %s", applet, exec,strerror(errno));
 }
 
-static void handle_signal(int sig)
+static void supervisor(char *exec, char **argv)
 {
-	int serrno = errno;
+	FILE *fp;
-	char signame[10] = { '\0' };
+	int i;
+	int nkilled;
+	time_t respawn_now= 0;
+	time_t first_spawn= 0;
 
-	switch (sig) {
+#ifndef RC_DEBUG
-	case SIGINT:
+	signal_setup_restart(SIGHUP, handle_signal);
-		snprintf(signame, sizeof(signame), "SIGINT");
+	signal_setup_restart(SIGINT, handle_signal);
-		break;
+	signal_setup_restart(SIGQUIT, handle_signal);
-	case SIGTERM:
+	signal_setup_restart(SIGILL, handle_signal);
-		snprintf(signame, sizeof(signame), "SIGTERM");
+	signal_setup_restart(SIGABRT, handle_signal);
-		break;
+	signal_setup_restart(SIGFPE, handle_signal);
-	case SIGQUIT:
+	signal_setup_restart(SIGSEGV, handle_signal);
-		snprintf(signame, sizeof(signame), "SIGQUIT");
+	signal_setup_restart(SIGPIPE, handle_signal);
-		break;
+	signal_setup_restart(SIGALRM, handle_signal);
+	signal_setup(SIGTERM, handle_signal);
+	signal_setup_restart(SIGUSR1, handle_signal);
+	signal_setup_restart(SIGUSR2, handle_signal);
+	signal_setup_restart(SIGBUS, handle_signal);
+	signal_setup_restart(SIGPOLL, handle_signal);
+	signal_setup_restart(SIGPROF, handle_signal);
+	signal_setup_restart(SIGSYS, handle_signal);
+	signal_setup_restart(SIGTRAP, handle_signal);
+	signal_setup_restart(SIGVTALRM, handle_signal);
+	signal_setup_restart(SIGXCPU, handle_signal);
+	signal_setup_restart(SIGXFSZ, handle_signal);
+#ifdef SIGEMT
+	signal_setup_restart(SIGEMT, handle_signal);
+#endif
+	signal_setup_restart(SIGIO, handle_signal);
+	signal_setup_restart(SIGPWR, handle_signal);
+#ifdef SIGUNUSED
+	signal_setup_restart(SIGUNUSED, handle_signal);
+#endif
+#ifdef SIGRTMIN
+	for (i = SIGRTMIN; i <= SIGRTMAX; i++)
+		signal_setup_restart(i, handle_signal);
+#endif
+#endif
+
+	fp = fopen(pidfile, "w");
+	if (! fp)
+		eerrorx("%s: fopen `%s': %s", applet, pidfile, strerror(errno));
+	fprintf(fp, "%d\n", getpid());
+	fclose(fp);
+
+	if (svcname)
+		rc_service_daemon_set(svcname, exec, (const char * const *) argv,
+				pidfile, true);
+
+	/* remove the controlling tty */
+#ifdef TIOCNOTTY
+	ioctl(tty_fd, TIOCNOTTY, 0);
+	close(tty_fd);
+#endif
+
+	/*
+	 * Supervisor main loop
+	 */
+	i = 0;
+	while (!exiting) {
+		wait(&i);
+		if (exiting) {
+			signal_setup(SIGCHLD, SIG_IGN);
+			syslog(LOG_INFO, "stopping %s, pid %d", exec, child_pid);
+			nkilled = run_stop_schedule(applet, exec, NULL, child_pid, 0,
+					false, false, true);
+			if (nkilled > 0)
+				syslog(LOG_INFO, "killed %d processes", nkilled);
+		} else {
+			sleep(respawn_delay);
+			if (respawn_max > 0 && respawn_period > 0) {
+				respawn_now = time(NULL);
+				if (first_spawn == 0)
+					first_spawn = respawn_now;
+				if (respawn_now - first_spawn > respawn_period) {
+					respawn_count = 0;
+					first_spawn = 0;
+				} else
+					respawn_count++;
+				if (respawn_count >= respawn_max) {
+					syslog(LOG_WARNING,
+							"respawned \"%s\" too many times, exiting", exec);
+					exiting = true;
+					continue;
+				}
+			}
+			if (WIFEXITED(i))
+				syslog(LOG_WARNING, "%s, pid %d, exited with return code %d",
+						exec, child_pid, WEXITSTATUS(i));
+			else if (WIFSIGNALED(i))
+				syslog(LOG_WARNING, "%s, pid %d, terminated by signal %d",
+						exec, child_pid, WTERMSIG(i));
+			child_pid = fork();
+			if (child_pid == -1)
+				eerrorx("%s: fork: %s", applet, strerror(errno));
+			if (child_pid == 0)
+				child_process(exec, argv);
+		}
 	}
 
-	if (*signame != 0) {
+	if (pidfile && exists(pidfile))
-		syslog(LOG_INFO, "%s: caught signal %s, exiting", applet, signame);
+		unlink(pidfile);
-		exiting = true;
+	if (svcname) {
-	} else
+		rc_service_daemon_set(svcname, exec, (const char *const *)argv,
-		syslog(LOG_INFO, "%s: caught unknown signal %d", applet, sig);
+				pidfile, false);
-
+		rc_service_mark(svcname, RC_SERVICE_STOPPED);
-	/* Restore errno */
+		rc_service_value_set(svcname, "child_pid", NULL);
-	errno = serrno;
-}
-
-static char * expand_home(const char *home, const char *path)
-{
-	char *opath, *ppath, *p, *nh;
-	size_t len;
-	struct passwd *pw;
-
-	if (!path || *path != '~')
-		return xstrdup(path);
-
-	opath = ppath = xstrdup(path);
-	if (ppath[1] != '/' && ppath[1] != '\0') {
-		p = strchr(ppath + 1, '/');
-		if (p)
-			*p = '\0';
-		pw = getpwnam(ppath + 1);
-		if (pw) {
-			home = pw->pw_dir;
-			ppath = p;
-			if (ppath)
-				*ppath = '/';
-		} else
-			home = NULL;
-	} else
-		ppath++;
-
-	if (!home) {
-	free(opath);
-		return xstrdup(path);
 	}
-	if (!ppath) {
+	exit(EXIT_SUCCESS);
-		free(opath);
-		return xstrdup(home);
-	}
-
-	len = strlen(ppath) + strlen(home) + 1;
-	nh = xmalloc(len);
-	snprintf(nh, len, "%s%s", home, ppath);
-	free(opath);
-	return nh;
 }
 
 int main(int argc, char **argv)
 {
 	int opt;
+	char **c;
+	int x;
 	bool start = false;
 	bool stop = false;
+	bool reexec = false;
 	char *exec = NULL;
-	char *pidfile = NULL;
+	char *retry = NULL;
+	int sig = SIGTERM;
 	char *home = NULL;
 	int tid = 0;
-	pid_t child_pid, pid;
+	pid_t pid;
-	char *svcname = getenv("RC_SVCNAME");
 	char *tmp;
 	char *p;
 	char *token;
 	int i;
 	int n;
 	char exec_file[PATH_MAX];
-	int respawn_count = 0;
+	char name[PATH_MAX];
-	int respawn_delay = 0;
+	struct timespec ts;
-	int respawn_max = 10;
-	int respawn_period = 5;
-	time_t respawn_now= 0;
-	time_t first_spawn= 0;
 	struct passwd *pw;
 	struct group *gr;
 	FILE *fp;
 	mode_t numask = 022;
+	int child_argc = 0;
+	char **child_argv = NULL;
+	char *str = NULL;
+	char cmdline[PATH_MAX];
 
 	applet = basename_c(argv[0]);
 	atexit(cleanup);
-
+	svcname = getenv("RC_SVCNAME");
-	signal_setup(SIGINT, handle_signal);
+	openlog(svcname, LOG_PID, LOG_DAEMON);
-	signal_setup(SIGQUIT, handle_signal);
-	signal_setup(SIGTERM, handle_signal);
-	openlog(applet, LOG_PID, LOG_DAEMON);
 
 	if ((tmp = getenv("SSD_NICELEVEL")))
 		if (sscanf(tmp, "%d", &nicelevel) != 1)
@@ -515,8 +615,8 @@ int main(int argc, char **argv)
 
 		case 'P':  /* --respawn-period time */
 			n = sscanf(optarg, "%d", &respawn_period);
-			if (n	!= 1 || respawn_delay < 1)
+			if (n	!= 1 || respawn_period < 1)
-				eerrorx("Invalid respawn-delay value '%s'", optarg);
+				eerrorx("Invalid respawn-period value '%s'", optarg);
 			break;
 
 		case 'S':  /* --start */
@@ -558,6 +658,9 @@ int main(int argc, char **argv)
 			pidfile = optarg;
 			break;
 
+		case 'R':  /* --retry <schedule>|timeout */
+			retry = optarg;
+			break;
 		case 'r':  /* --chroot /new/root */
 			ch_root = optarg;
 			break;
@@ -609,78 +712,183 @@ int main(int argc, char **argv)
 		case '2':  /* --stderr /path/to/stderr.logfile */
 			redirect_stderr = optarg;
 			break;
+		case '3':  /* --reexec */
+			reexec = true;
+			break;
 
 		case_RC_COMMON_GETOPT
 		}
 
-	if (!pidfile)
+	if (!pidfile && !reexec)
 		eerrorx("%s: --pidfile must be specified", applet);
 
+	*cmdline = '\0';
+	c = argv;
+	while (c && *c) {
+		strcat(cmdline, *c);
+		strcat(cmdline, " ");
+		c++;
+	}
 	endpwent();
 	argc -= optind;
 	argv += optind;
 	exec = *argv;
 
-	if (start) {
-		if (!exec)
-			eerrorx("%s: nothing to start", applet);
-		if (respawn_delay * respawn_max > respawn_period) {
-			ewarn("%s: Please increase the value of --respawn-period to more "
-				"than %d to avoid infinite respawning", applet, 
-				respawn_delay * respawn_max);
-		}
-	}
-
 	/* Expand ~ */
 	if (ch_dir && *ch_dir == '~')
 		ch_dir = expand_home(home, ch_dir);
 	if (ch_root && *ch_root == '~')
 		ch_root = expand_home(home, ch_root);
-	if (exec) {
-		if (*exec == '~')
-			exec = expand_home(home, exec);
 
-		/* Validate that the binary exists if we are starting */
+	umask(numask);
-		if (*exec == '/' || *exec == '.') {
+
-			/* Full or relative path */
+	if (reexec) {
-			if (ch_root)
+		str = rc_service_value_get(svcname, "argc");
-				snprintf(exec_file, sizeof(exec_file),
+		sscanf(str, "%d", &child_argc);
-				    "%s/%s", ch_root, exec);
+		child_argv = xmalloc((child_argc + 1) * sizeof(char *));
-			else
+		memset(child_argv, 0, (child_argc + 1) * sizeof(char *));
-				snprintf(exec_file, sizeof(exec_file),
+		for (x = 0; x < child_argc; x++) {
-				    "%s", exec);
+			sprintf(name, "argv_%d", x);
-		} else {
+			str = rc_service_value_get(svcname, name);
-			/* Something in $PATH */
+			child_argv[x] = str;
-			p = tmp = xstrdup(getenv("PATH"));
+		}
-			*exec_file = '\0';
+		free(str);
-			while ((token = strsep(&p, ":"))) {
+		str = rc_service_value_get(svcname, "child_pid");
+		sscanf(str, "%d", &child_pid);
+		free(str);
+		exec = rc_service_value_get(svcname, "exec");
+		pidfile = rc_service_value_get(svcname, "pidfile");
+		retry = rc_service_value_get(svcname, "retry");
+		if (retry) {
+			parse_schedule(applet, retry, sig);
+			rc_service_value_set(svcname, "retry", retry);
+		} else
+			parse_schedule(applet, NULL, sig);
+
+		str = rc_service_value_get(svcname, "respawn_delay");
+		sscanf(str, "%d", &respawn_delay);
+		str = rc_service_value_get(svcname, "respawn_max");
+		sscanf(str, "%d", &respawn_max);
+		supervisor(exec, child_argv);
+	} else if (start) {
+		if (exec) {
+			if (*exec == '~')
+				exec = expand_home(home, exec);
+
+			/* Validate that the binary exists if we are starting */
+			if (*exec == '/' || *exec == '.') {
+				/* Full or relative path */
 				if (ch_root)
 					snprintf(exec_file, sizeof(exec_file),
-					    "%s/%s/%s",
+				    	"%s/%s", ch_root, exec);
-					    ch_root, token, exec);
 				else
 					snprintf(exec_file, sizeof(exec_file),
-					    "%s/%s", token, exec);
+				    "%s", exec);
-				if (exists(exec_file))
+			} else {
-					break;
+				/* Something in $PATH */
+				p = tmp = xstrdup(getenv("PATH"));
 				*exec_file = '\0';
+				while ((token = strsep(&p, ":"))) {
+					if (ch_root)
+						snprintf(exec_file, sizeof(exec_file),
+					    	"%s/%s/%s",
+					    	ch_root, token, exec);
+					else
+						snprintf(exec_file, sizeof(exec_file),
+					    	"%s/%s", token, exec);
+					if (exists(exec_file))
+						break;
+					*exec_file = '\0';
+				}
+				free(tmp);
 			}
-			free(tmp);
+			if ( !exists(exec_file))
-		}
+				eerrorx("%s: %s does not exist", applet,
-	}
+				    *exec_file ? exec_file : exec);
-	if (start && !exists(exec_file))
+		} else
-		eerrorx("%s: %s does not exist", applet,
+			eerrorx("%s: nothing to start", applet);
-		    *exec_file ? exec_file : exec);
 
-	if (stop) {
+		pid = get_pid(applet, pidfile);
-		pid = get_pid(pidfile);
+		if (pid != -1)
-		if (pid == -1)
+			if (do_stop(applet, exec, (const char * const *)argv, pid, uid,
-			i = pid;
+						0, false, true) > 0)
-		else
+				eerrorx("%s: %s is already running", applet, exec);
+
+		if (respawn_delay * respawn_max > respawn_period)
+			ewarn("%s: Please increase the value of --respawn-period to more "
+				"than %d to avoid infinite respawning", applet, 
+				respawn_delay * respawn_max);
+
+		if (retry) {
+			parse_schedule(applet, retry, sig);
+			rc_service_value_set(svcname, "retry", retry);
+		} else
+			parse_schedule(applet, NULL, sig);
+
+		einfov("Detaching to start `%s'", exec);
+		syslog(LOG_INFO, "Supervisor command line: %s", cmdline);
+
+		/* Remove existing pidfile */
+		if (pidfile)
+			unlink(pidfile);
+
+		/* Make sure we can write a pid file */
+		fp = fopen(pidfile, "w");
+		if (! fp)
+			eerrorx("%s: fopen `%s': %s", applet, pidfile, strerror(errno));
+		fclose(fp);
+
+		rc_service_value_set(svcname, "pidfile", pidfile);
+		sprintf(name, "%i", respawn_delay);
+		rc_service_value_set(svcname, "respawn_delay", name);
+		sprintf(name, "%i", respawn_max);
+		rc_service_value_set(svcname, "respawn_max", name);
+		sprintf(name, "%i", respawn_period);
+		rc_service_value_set(svcname, "respawn_period", name);
+		child_pid = fork();
+		if (child_pid == -1)
+			eerrorx("%s: fork: %s", applet, strerror(errno));
+		if (child_pid != 0)
+			/* first parent process, do nothing. */
+			exit(EXIT_SUCCESS);
+#ifdef TIOCNOTTY
+		tty_fd = open("/dev/tty", O_RDWR);
+#endif
+		devnull_fd = open("/dev/null", O_RDWR);
+		child_pid = fork();
+		if (child_pid == -1)
+			eerrorx("%s: fork: %s", applet, strerror(errno));
+		else if (child_pid != 0) {
+			c = argv;
+			x = 0;
+			while (c && *c) {
+				snprintf(name, sizeof(name), "argv_%-d",x);
+				rc_service_value_set(svcname, name, *c);
+				x++;
+				c++;
+			}
+			sprintf(name, "%d", x);
+				rc_service_value_set(svcname, "argc", name);
+			rc_service_value_set(svcname, "exec", exec);
+			supervisor(exec, argv);
+		} else
+			child_process(exec, argv);
+	} else if (stop) {
+		pid = get_pid(applet, pidfile);
+		if (pid != -1) {
 			i = kill(pid, SIGTERM);
-		if (i != 0)
+			if (i != 0)
-			/* We failed to stop something */
+				/* We failed to send the signal */
-			exit(EXIT_FAILURE);
+				ewarn("Unable to shut down the supervisor");
+			else {
+				/* wait for the supervisor to go down */
+				while (kill(pid, 0) == 0) {
+					ts.tv_sec = 0;
+					ts.tv_nsec = 1;
+					nanosleep(&ts, NULL);
+				}
+			}
+		}
 
 		/* Even if we have not actually killed anything, we should
 		 * remove information about it as it may have unexpectedly
@@ -696,113 +904,4 @@ int main(int argc, char **argv)
 		}
 		exit(EXIT_SUCCESS);
 	}
-
-	pid = get_pid(pidfile);
-	if (pid != -1)
-		if (kill(pid, 0) == 0)
-			eerrorx("%s: %s is already running", applet, exec);
-
-	einfov("Detaching to start `%s'", exec);
-	eindentv();
-
-	/* Remove existing pidfile */
-	if (pidfile)
-		unlink(pidfile);
-
-	/*
-	 * Make sure we can write a pid file
-	 */
-	fp = fopen(pidfile, "w");
-	if (! fp)
-		eerrorx("%s: fopen `%s': %s", applet, pidfile, strerror(errno));
-	fclose(fp);
-
-	child_pid = fork();
-	if (child_pid == -1)
-		eerrorx("%s: fork: %s", applet, strerror(errno));
-
-	/* first parent process, do nothing. */
-	if (child_pid != 0)
-		exit(EXIT_SUCCESS);
-
-#ifdef TIOCNOTTY
-	tty_fd = open("/dev/tty", O_RDWR);
-#endif
-	devnull_fd = open("/dev/null", O_RDWR);
-	child_pid = fork();
-	if (child_pid == -1)
-		eerrorx("%s: fork: %s", applet, strerror(errno));
-
-	if (child_pid != 0) {
-		/* this is the supervisor */
-		umask(numask);
-
-		fp = fopen(pidfile, "w");
-		if (! fp)
-			eerrorx("%s: fopen `%s': %s", applet, pidfile, strerror(errno));
-		fprintf(fp, "%d\n", getpid());
-		fclose(fp);
-
-		if (svcname)
-			rc_service_daemon_set(svcname, exec,
-									(const char * const *) argv, pidfile, true);
-
-	/* remove the controlling tty */
-#ifdef TIOCNOTTY
-		ioctl(tty_fd, TIOCNOTTY, 0);
-		close(tty_fd);
-#endif
-
-		/*
-		 * Supervisor main loop
-		 */
-		i = 0;
-		while (!exiting) {
-			wait(&i);
-			if (exiting) {
-				syslog(LOG_INFO, "stopping %s, pid %d", exec, child_pid);
-				kill(child_pid, SIGTERM);
-			} else {
-				sleep(respawn_delay);
-				if (respawn_max > 0 && respawn_period > 0) {
-					respawn_now = time(NULL);
-					if (first_spawn == 0)
-						first_spawn = respawn_now;
-					if (respawn_now - first_spawn > respawn_period) {
-						respawn_count = 0;
-						first_spawn = 0;
-					} else
-						respawn_count++;
-					if (respawn_count >= respawn_max) {
-						syslog(LOG_INFO, "respawned \"%s\" too many times, "
-								"exiting", exec);
-						exiting = true;
-						continue;
-					}
-				}
-				if (WIFEXITED(i))
-					syslog(LOG_INFO, "%s, pid %d, exited with return code %d",
-							exec, child_pid, WEXITSTATUS(i));
-				else if (WIFSIGNALED(i))
-					syslog(LOG_INFO, "%s, pid %d, terminated by signal %d",
-							exec, child_pid, WTERMSIG(i));
-				child_pid = fork();
-				if (child_pid == -1)
-					eerrorx("%s: fork: %s", applet, strerror(errno));
-				if (child_pid == 0)
-					child_process(exec, argv, svcname, respawn_count);
-			}
-		}
-
-		if (pidfile && exists(pidfile))
-			unlink(pidfile);
-		if (svcname) {
-			rc_service_daemon_set(svcname, exec,
-			    (const char *const *)argv,
-			    pidfile, false);
-			rc_service_mark(svcname, RC_SERVICE_STOPPED);
-		}
-		exit(EXIT_SUCCESS);
-	} else if (child_pid == 0)
-		child_process(exec, argv, svcname, respawn_count);
 }