Update ChangeLog

add quiet parameter to run_stop_schedule
add retry option to supervise-daemon
2017-09-06 17:31:01 -05:00 · 2017-09-06 17:22:35 -05:00 · 2017-09-06 17:22:21 -05:00 · 2017-08-25 11:36:45 -05:00 · 2017-08-24 11:44:32 -05:00 · 2017-08-24 11:34:18 -05:00
40 changed files with 1648 additions and 1052 deletions
--- a/963
+++ b/963
@@ -1,3 +1,458 @@
+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>
+
+    sh/openrc-run: source service script before ulimit is processed
+    
+    This is needed to allow the service script author to set a default for
+    rc_ulimit inside the service script.
+
+commit c2d256bafb9d1dfafbfd0846c035c5d26f7449c8
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    man/openrc-run.8: document fstabinfo and mountinfo
+    
+    X-Gentoo-Bug: 592374
+    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=592374
+
+commit f48d9c33a5c708c871d6657a39485d1c0c735548
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    man/openrc-run.8: document _pre and _post functions
+    
+    Fixes https://github.com/openrc/openrc/issues/155.
+
+commit 6d4e8433974fd8567885635ae0454031290f96b1
+Author: Jason Graham <jgraha8@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    fix ENT macro usage
+    
+    X-Gentoo-Bug: 624796
+    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=624796
+
+commit 0513cd3964a9564e0ba39b50aa8ebd3d7e9a3920
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    version 0.29
+
+commit 72bb2e57de935ab46ad000f97a5720265bed9342
+Author: John R. Graham <john_r_graham@gentoo.org>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    Typo fix
+    
+    X-Gentoo-Bug: 624908
+    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=624908
+
+commit 84c5da30695db89d686d3c28c7cacdf172cbf429
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    Update ChangeLog
+
+commit b35099cb707e333b6b8d30d956ffa93bcd2da0ab
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    Add comment about overriding the default efivars mount in fstab to news
+
+commit 3fd3bfc76dccc3752f4af949ad4076dab26357fb
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    add link to efivars issue to news file
+
+commit 492a6303cb8314263bfd3631e3b0de5a9df178da
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    Update ChangeLog
+
+commit e7807b3136d8993805082320784460f5059e6275
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    fix sysvinit compatibility for shutdown wrapper
+
+commit 03a461ac0ee34b7900868cdea624c6fd868b1656
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    fix sysvinit compatibility for reboot wrapper
+
+commit 7e0f76e0adc545c74a8332a6ef0811d2aa62cb81
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    fix sysvinit compatibility for poweroff wrapper
+
+commit 9812ce5b8dc22fe36cc7bf75cf6e62db204ece3d
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    fix halt wrapper so it is sysvinit compatible
+    
+    This makes the halt wrapper sysvinit compatible. It ignores several
+    command line switches which are not currently implemented; however,
+    those can be implemented if we need to do so.
+    
+    This fixes https://github.com/openrc/openrc/issues/146.
+
+commit 12f75e4167f84a9a85f69924ebdb28ad36c085cb
+Author: Adam Borowski <kilobyte@angband.pl>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    man: fix an unclosed .Bl/.El warning
+    
+    This fixes #151.
+
+commit 260368e0103e95625c29760f2c2ec89143e5a233
+Author: Adam Borowski <kilobyte@angband.pl>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    man: fix missing .Pp warnings
+    
+    This fixes #151.
+
+commit f87a9eec3d23ea01578500972f1df993d5d24fba
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    init.d/sysfs: mount efivars read only
+    
+    This fixes #134.
+
+commit 1e837d596e483ceb5cec177a6c7faff24a42384b
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    fix argument parsing for the sysvinit shutdown wrapper
+    
+    This fixes #140.
+
+commit dcc686e42b406d63d52ef75de9a326f67d0a06c9
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    scripts/shutdown: fix arguments to be sysvinit shutdown compatible
+    
+    This fixes #140.
+
+commit 2f81c100afdf45ebf787dfc5d3261aa6055640e4
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    Fix link to shutdown for MKSYSVINIT=yes
+
+commit a511a48d77b1dcb8a3fb0dd1abddb750a152869b
+Author: Nuno Silva <nuno.m.ribeiro.silva@tecnico.ulisboa.pt>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    init.d/hostname: fix default parameter syntax
+    
+    The syntax for expanding a variable with a default value is
+            ${parameter:-word}
+    not
+            ${parameter-word}
+    although the latter still works for a reason I could not explain.
+    
+    This fixes #143.
+
+commit 1e5322e5c55ec744a2cdcc3342ef6547eab7c46f
+Author: Nuno Silva <nuno.m.ribeiro.silva@tecnico.ulisboa.pt>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    init.d/hostname: fix indentation
+    
+    This is for #143.
+
+commit 199a210d2fbc524c9c400a06f832dabffd7ed1b3
+Author: udeved <artoo@manjaro.org>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    scripts/Makefile: make symlinks absolute instead of relative
+    
+    This closes #142.
+
+commit 5b7667af32effddf867a5d021c66d43f0645d374
+Author: udeved <artoo@manjaro.org>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    scripts/Makefile: respect SBINDIR with MKSYSVINIT
+    
+    This is for #142.
+
+commit 11243f85b67e5f450ddf50346ffd4a1b2c6faeb5
+Author: Jory A. Pratt <anarchy@gentoo.org>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    kill_all: include limits.h for PATH_MAX
+
+commit 3c40826d3466cdda1a46abcd5c86b661b8185f46
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    version 0.28
+
+commit 560d874d2fee63bf7ca11f17cf9933021b639a1d
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    fix compile issue for musl
+
+commit e84366fd232a41c3ba79ed351e93c74cef8d7c8d
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    Update ChangeLog
+
+commit caacedc0a82285fb2d25c6d3473f154044c7ad66
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    man: update openrc-shutdown man page
+    
+    Add the new wtmp options and fix some cross references.
+
+commit 84d140a1f6abf95a4170d13527152d3ab14e6613
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    scripts/shutdown: pass --single to openrc-shutdown
+    
+    Sysvinit shutdown has a default of single user mode, but openrc-shutdown
+    makes you choose a default action. Because of this, the shutdown wrapper
+    needs to pass --single to openrc-shutdown.
+
+commit ee886c44824b1dd892eaff2c6da666286e61bc73
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    openrc-shutdown: add --single option and clean up option processing
+
+commit 1801561c2d36c330df7fd02c7508f503a61ff5ba
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    init.d/bootmisc: use openrc-shutdown instead of halt to write halt record
+    
+    This fixes #139 and fixes #128.
+    and fixes #124.
+
+commit 7689106aa10f7852b707b4c21ec080ccb2767280
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    add support for writing reboot and shutdown records to wtmp
+
+commit 1564e155b726308200ecd5df315c002bd8b16952
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    openrc-init: add optional sysvinit compatibility
+
+commit 44bac3c3798f7eb9186c3ea8774552aa191bfae7
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    Change killprocs to use kill_all instead of killall5
+    
+    X-Gentoo-Bug:376977
+    X-Gentoo-Bug-URL:https://bugs.gentoo.org/show_bug.cgi?id=376977
+
+commit 0ddee9b7d2b8dea810e252ca6a95c457876df120
+Author: Sergei Trofimovich <slyfox@gentoo.org>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    openrc-init: fix buffer overflow in init.ctl
+    
+    How to reproduce 1-byte overflow:
+    
+    ```
+    $ FEATURES=-test CFLAGS="-fsanitize=address -O0 -ggdb3" emerge -1 openrc
+    
+    =================================================================
+    ==1==ERROR: AddressSanitizer: stack-buffer-overflow on address 0x7fff0efd8710
+        at pc 0x000000402076 bp 0x7fff0efd7d50 sp 0x7fff0efd7d40
+    WRITE of size 1 at 0x7fff0efd8710 thread T0
+        #0 0x402075  (/sbin/openrc-init+0x402075)
+        #1 0x3cf6e2070f in __libc_start_main (/lib64/libc.so.6+0x3cf6e2070f)
+        #2 0x4013b8  (/sbin/openrc-init+0x4013b8)
+    
+    Address 0x7fff0efd8710 is located in stack of thread T0 at offset 2432 in frame
+        #0 0x401cfb  (/sbin/openrc-init+0x401cfb)
+    
+      This frame has 3 object(s):
+        [32, 160) 'signals'
+        [192, 344) 'sa'
+        [384, 2432) 'buf' <== Memory access at offset 2432 overflows this variable
+    HINT: this may be a false positive if your program uses some custom stack unwind mechanism or swapcontext
+          (longjmp and C++ exceptions *are* supported)
+    SUMMARY: AddressSanitizer: stack-buffer-overflow ??:0 ??
+    ```
+    
+    The problem here is in the code handling reads from 'init.ctl':
+    
+    ```
+    int main(int argc, char **argv) {
+    ...
+        char buf[2048];
+        for (;;) {
+            /* This will block until a command is sent down the pipe... */
+            fifo = fopen(RC_INIT_FIFO, "r");
+            count = fread(buf, 1, 2048, fifo);
+            buf[count] = 0;
+            ...
+        }
+    ```
+    
+    `buf[count] = 0;` writes outside the buffer when `fread()` returns non-truncated read.
+    
+    This fixes #138.
+
+commit 688566c535111a141f77caf88db12a4338544f7b
+Author: Sergei Trofimovich <slyfox@inbox.ru>
+Commit: Doug Freed <dwfreed@mtu.edu>
+
+    mk/cc.mk: make implicit function declarations fatal (#136)
+    
+    Avoids issues with missing prototypes causing truncation of pointers.
+    
+    Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+
+commit 7185e242ffaa8cd1b672fe4726502a196fd779c2
+Author: Sergei Trofimovich <slyfox@inbox.ru>
+Commit: Doug Freed <dwfreed@mtu.edu>
+
+    rc-logger.c: fix crash on fclose(NULL) (#137)
+    
+    Only close the log if we successfully opened it.
+    
+    Reported-by: Brian Evans <grknight@gentoo.org>
+    Tested-by: Brian Evans <grknight@gentoo.org>
+    Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+
+commit ec27299f4b88daa80261298fafea76ae634744d9
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    typo fix
+    
+    X-Gentoo-Bug: 618888
+    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=618888
+
+commit 1ece16bfcd0ab71d2f9fe17a75ee6184e0fa4828
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    openrc-shutdown: add dry-run option
+
+commit 0cfd0dd9ef580ed9dc563ccc164d70efe8f299db
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    openrc-shutdown: move to single user mode by default
+    
+    To be more compatible with sysvinit, move to single user mode if no
+    options are specified on the command line.
+
+commit a77ee2e94191ba1a286b8a6835f76556481566ba
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    init: add ability to switch to single user mode
+
+commit 49b8a573a195f4b2cee992cd10678694da0a6f4f
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    add kill_all helper
+    
+    This is similar to the sysvinit killall5 utility.  It should only be used
+    in service scripts, so it will not be installed in the path.
+    
+    This closes #129.
+
+commit a2055af90054f5125cc07d4851b1dc9d16815e7c
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    rc_status: calculate time differences in time_t and display seconds in uptime
+
+commit cbf96967f1b6dc72ae16203dfbbb844bd08e8b6b
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    supervise-daemon: save start time and respawn count before dropping privs
+
+commit f1013037b47cdd6344f1b3ed92b7f84d7fcca01f
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    version 0.27
+
+commit e4bfb4530a86a4ccdff312c857df37fa0da36fd6
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    update ChangeLog
+
 commit 78e0042eccaf5a5554b195ad391b3ab0b8974cf6
 Author: William Hubbs <w.d.hubbs@gmail.com>
 Commit: William Hubbs <w.d.hubbs@gmail.com>
@@ -971,511 +1426,3 @@ Commit: William Hubbs <w.d.hubbs@gmail.com>
    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
-
-commit 1a55d46645b376cd27f394796934150120a08387
-Author: Raymond Jennings <shentino@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    local.d/README: typo fix
-    
-    X-Gentoo-Bug: 591258
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=591258
-
-commit cae3976ef1276ce33aa7e49474f13499a48a3fe6
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    init.d: Add runsvdir to ignore patterns
-
-commit da28a3d367b6078deda6bc205806b43b971e67a9
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    init.d: initial service adjustments for docker support
-    
-    Add -docker keyword to the same scripts that have -lxc keyword.
-
-commit ca8c29ee60b0e8ca89091aaf801725bd71e28001
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    librc: fix Docker auto detection
-    
-    The original auto detection of Docker containers assumed the presence of
-    a container environment variable. However, Docker-1.12 does not
-    implement this, and I'm not sure which versions of docker implemented
-    it.
-    
-    The new test is for the presence of a file named .dockerenv in the
-    root directory.
-
-commit f62253b8334a85dac4671e42817b96a3bedd1881
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    Add support for runit
-    
-    X-Gentoo-Bug: 501364
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=501364
-
-commit f2c2e2dd5a5e0a22da4dcabea6615d0f4697a962
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    init.d/sysctl.in: typo fix
-
-commit 94b98430cb83a8f4e62d837100fc357e9eb12ca6
-Author: Kenneth Lakin <kennethlakin@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    start-stop-daemon: Add SSD_IONICELEVEL
-    
-    This is the disk IO counterpart to SSD_NICELEVEL.
-    Modified by William Hubbs to add the variable to the start-stop-daemon
-    man page.
-    
-    This fixes #69.
-
-commit b19d0a40d7f20987323d5af91469c720ead39561
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    init.d/loopback: remove unnecessary stop function
-
-commit 0c229faf7e6a57bcff70f2143b83cb69a34c89f4
-Author: Martin Väth <martin@mvath.de>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    tmpfiles.sh: Support lines with q Q h H
-    
-    btrfs support is not implemented yet (for q Q v), but at least tmpfiles.sh
-    no longer chokes about tmpfiles.d lines of recent systemd versions
-    
-    This fixes #87.
-
-commit 3092e310acd376fc626cc051549e02bcd7697aed
-Author: Mike Gilbert <floppym@gentoo.org>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    tmpfiles: Accept filenames as command line arguments
-    
-    This brings us closer to being able to use tmpfiles.sh as a full
-    replacement for systemd-tmpfiles.
-    
-    This closes #83.
-
-commit 671911762d1bcd90c10d8ac0eb30fe10be4a65f6
-Author: Mike Gilbert <floppym@gentoo.org>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    tmpfiles: Process command line before gathering config files
-    
-    This is part of #83.
-
-commit 7d68839e9ea89b0a92aef69a9b4fd298554bb9b1
-Author: Mike Gilbert <floppym@gentoo.org>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    tmpfiles: Make unrecognized options fatal
-    
-    This is part of #83.
-
-commit 5341a925c15934674031aebb97533b0adcd10236
-Author: Jakub Jirutka <jakub@jirutka.cz>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    s6-guide: fix typo
-    
-    This fixes #92.
-
-commit 3adb8fb389caaafbed1be13c5ac4d96214c8eed3
-Author: Doug Freed <dwfreed@mtu.edu>
-Commit: Doug Freed <dwfreed@mtu.edu>
-
-    rc-logger: refuse to cat TMPLOG into itself
-    
-    This prevents an infinite loop in case somebody decides to set
-    rc_log_path to match TMPLOG.
-
-commit 8927a37fb790e718c956376242a532ab9d1755e7
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    etc: remove rc.conf.* file fragments
-
-commit b085b2cda58bc884acb959e48f14fb044c983042
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    etc: create default rc.conf
-    
-    Before now, /etc/rc.conf was created by the build system from multiple
-    rc.conf.* file fragments and there was no reason for this.
-
-commit daf93977641201f16c477b075ce9055a1da8f7b3
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    init.d: combine sysctl scripts
-    
-    We had separate sysctl scripts for each operating system. However, there
-    is no need to do this since we can detect the operating system at
-    runtime with $RC_UNAME.
-
-commit 2984504c887afc9a36610eb7c20b097f7d1e70d0
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    conf.d: remove staticroute file fragments
-
-commit 35e8386c24df6483f2918979dae150421f7151df
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    conf.d: makestaticroute file static
-
-commit 2108285d64e2ee8cc03fbe544efc3752fe349bdd
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    conf.d: remove network file fragnents
-
-commit a3133fec250eca3cdfb460c2ce26c707fd593c09
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    conf.d: make network file static
-
-commit 314ae3dc781d7ae8fc26c276a85b0dc6ab6bc326
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    modules: add support for FreeBSD
-    
-    This is based on a patch submitted by
-    Joe Maloney <pkgdemonteam@gmail.com>.
-    
-    This fixes #91.
-
-commit 695be59083cdf0d2ff9296f2c210e591c51bdf40
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    rc-status: add -m/--manual  option to show manually started services
-    
-    X-Gentoo-Bug: 585906
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=585906
-
-commit c962678dd6ab1314b55c2a3bcdae03902bda39b8
-Author: Doug Freed <dwfreed@mtu.edu>
-Commit: Doug Freed <dwfreed@mtu.edu>
-
-    rc: Rename some static variables to kill warnings
-
-commit 3a1262703fd20d2e8288d13d908fb282c77d1793
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    Remove the DEBUG_MEMORY macro
-    
-    This fixes #43.
-
-commit 20035210bdf5d5729734457f35f5f32a53a5b3ad
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    make variable aflag a boolean show_all
-
-commit 7f84b5d741c150cd159d5a3cda3ef532f0381826
-Author: Jaromil <jaromil@dyne.org>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    libeinfo: document the x suffix on function names
-    
-    This fixes #88.
-
-commit 8bca2cd4b3c710809131ac036456b34c223e8d12
-Author: Julian Ospald <hasufell@posteo.de>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    Build: fix hardcoded pkg-config invocation
-    
-    This fixes #89.
-
-commit ac8ad169ae59fece38066c2e08ff57d53d737edd
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    hwclock: always use --noadjfile if available
-    
-    When we use the --utc or --localtime switch, also use --noadjfile if it
-    is available. This means hwclock will not use a drift file.
-    
-    X-Gentoo-Bug: 584722
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=584722
-
-commit 553799400218903ab495d1154a41c6d8890cb752
-Author: Mike Gilbert <floppym@gentoo.org>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    man: Document the procname variable for openrc-run
-    
-    X-Gentoo-Bug: 586794
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/586794
-
-commit 5af5d12f3e56f9f2ff232d124d27c856fd66f551
-Author: Benda Xu <heroxbd@gentoo.org>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    Fix PATH for Prefix.
-    
-    1. remove default /bin:/sbin:/usr/bin:/usr/sbin
-    2. PKG_PREFIX should be defaulted to $(PREFIX)/usr
-    3. LOCAL_PREFIX should be defaulted to $(PREFIX)/usr/local
-    
-    X-Gentoo-Bug:583634
-    X-Gentoo-Bug-URL:https://bugs.gentoo.org/show_bug.cgi?id=583634
-
-commit b2c92b88cc6ce6d81444667efbc6d44542db1788
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    fstabinfo/mountinfo: ensure /etc/fstab exists before calling setmntent
-    
-    This is based on a patch by A. Wilcox <awilfox.gentoo@foxkit.us>.
-    
-    X-Gentoo-Bug: 478226
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=478226
-    
-    X-Gentoo-Bug: 478226
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=478226
-
-commit 1b32af17225a4b18ced7f4326727cbe8265e7fd2
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    increment version to 0.22
-
-commit 5bfb7d6c77ff533e34e2bbfe5b6e57410d961d70
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    Update ChangeLog
-
-commit 12c8248b5f53879935d4e62ef42023f703c7b636
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    update news for 0.21
-
-commit 820ef6dab674c2878d72edc8ea21e7250b1b5aec
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    supervise-daemon: clarify documentation about configuring daemon not to fork
-
-commit 87884db66767eba6317b506a4d7270dd22721831
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    Make deprecation warnings for rc and runscript more visible
-    
-    These warnings were inserted in verbose only mode in OpenRC-0.13.A
-    Now, we are making them more visible in preparation for removing these
-    compatibility binaries in the future.
-
-commit 94077d264e14783e6ca5603d64e9d579fb206c20
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    supervise-daemon: log the exit code or signal when a child process dies
-
-commit 3351c8b4c3027f09003f8ba33e43f46762f5c453
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    supervise-daemon.sh: add support for chroot variable
-
-commit a8214af2fe3aa91930e3270af99cf1d9b7ef5b0a
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    start-stop-daemon.sh: fix regression in chroot support
-    
-    The support for the chroot variable was broken in 0.16, this fixes that
-    breakage.
-
-commit 9a372812c78ea8efc55b3dea6a39c2d0559bca45
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    guide.md: typo fix
-    
-    This fixes #86.
-
-commit 3fa9015b8e5610d38366f781a08789e34159b0dc
-Author: Jason Zaman <jason@perfinion.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    rc-selinux: access check was backwards
-
-commit 3b5a8b331e81ecd9a9362553c16f4527291d5528
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    supervise-daemon: add pam service file
-
-commit b3a04e797e5e459842c2c239886ab6ea08a8dc29
-Author: Anthony G. Basile <blueness@gentoo.org>
-Commit: Anthony G. Basile <blueness@gentoo.org>
-
-    runlevels/Makefile: add support for runlevel ‘nonetwork’
-    
-    Traditional System V reserves runlevel 2 for multiuser with no
-    networking.  We add support for this which is already defined in
-    the inittab as
-    
-        l2:2:wait:/sbin/rc nonetwork
-    
-    X-Gentoo-Bug: 533828
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=533828
-    
-    Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -1,3 +1,3 @@
 NAME=		openrc
-VERSION=	0.26
+VERSION=	0.30
 PKG=		${NAME}-${VERSION}
--- a/NEWS.md
+++ b/NEWS.md
@@ -3,6 +3,20 @@
 This file will contain a list of notable changes for each release. Note
 the information in this file is in reverse order.

+## OpenRC-0.28
+
+This version mounts efivars read only due to concerns about changes in
+this file system making systems unbootable.  If you need to change something
+in this path, you will need to re-mount it read-write, make the change
+and re-mount it read-only.
+
+Also, you can override this behavior by adding a line for efivars to
+fstab if you want efivars mounted read-write.
+
+For more information on this issue, see the following url:
+
+https://github.com/openrc/openrc/issues/134
+
 ## OpenRC-0.25

 This version contains an OpenRC-specific implementation of init for
--- a/README.md
+++ b/README.md
@@ -28,6 +28,7 @@ MKPREFIX=yes
 MKPKGCONFIG=no
 MKSELINUX=yes
 MKSTATICLIBS=no
+MKSYSVINIT=yes
 MKTERMCAP=ncurses
 MKTERMCAP=termcap
 PKG_PREFIX=/usr/pkg
--- a/conf.d/agetty
+++ b/conf.d/agetty
@@ -2,7 +2,7 @@
 #baud=""

 # set the terminal type
-#termtype="linux"
+#term_type="linux"

 # extra options to pass to agetty for this port
 #agetty_options=""
--- a/conf.d/killprocs
+++ b/conf.d/killprocs
@@ -1,3 +1,6 @@
-# If you wish to pass any options to killall5 during shutdown,
+# If you wish to pass any options to kill_all during shutdown,
 # you should do so here.
+#
+# The setting is called killall5_opts because the options here are meant
+# to be identical to those you could pass to killall5.
 killall5_opts=""
--- a/conf.d/localmount
+++ b/conf.d/localmount
@@ -3,7 +3,7 @@
 #no_umounts="/dir1:/var/dir2"
 #
 # Mark certain mount points as critical.
-# This contains aspace separated list of mount points which should be
+# This contains a space separated list of mount points which should be
 # considered critical. If one of these mount points cannot be mounted,
 # localmount will fail.
 # By default, this is empty.
--- a/init.d/agetty.in
+++ b/init.d/agetty.in
@@ -14,7 +14,7 @@ supervisor=supervise-daemon
 port="${RC_SVCNAME#*.}"
 term_type="${term_type:-linux}"
 command=/sbin/agetty
-command_args_foreground="${agetty_options} ${port} ${baud} ${termtype}"
+command_args_foreground="${agetty_options} ${port} ${baud} ${term_type}"
 pidfile="/run/${RC_SVCNAME}.pid"

 depend() {
--- a/init.d/bootmisc.in
+++ b/init.d/bootmisc.in
@@ -241,7 +241,7 @@ stop()
 {
 	# Write a halt record if we're shutting down
 	if [ "$RC_RUNLEVEL" = shutdown ]; then
-		[ "$RC_UNAME" = Linux ] && halt -w
+		[ "$RC_UNAME" = Linux ] && openrc-shutdown -w
 		if [ "$RC_SYS" = OPENVZ ]; then
 			yesno $RC_REBOOT && printf "" >/reboot
 		fi
--- a/init.d/hostname.in
+++ b/init.d/hostname.in
@@ -11,7 +11,8 @@

 description="Sets the hostname of the machine."

-depend() {
+depend()
+{
 	after clock
 	keyword -docker -lxc -prefix -systemd-nspawn
 }
@@ -20,12 +21,12 @@ start()
 {
 	local h source x
 	if [ -s @SYSCONFDIR@/hostname ] && [ -r @SYSCONFDIR@/hostname ]; then
-	read h x <@SYSCONFDIR@/hostname
-	source=" from @SYSCONFDIR@/hostname"
+		read h x <@SYSCONFDIR@/hostname
+		source="from @SYSCONFDIR@/hostname"
 	else
 		# HOSTNAME variable used to be defined in caps in conf.d/hostname.
 		# It is also a magic variable in bash.
-		h=${hostname-${HOSTNAME}} # checkbashisms: false positive
+		h=${hostname:-${HOSTNAME}} # checkbashisms: false positive (HOSTNAME var)
 	fi
 	if [ -z "$h" ]; then
 		einfo "Using default system hostname"
--- a/init.d/killprocs.in
+++ b/init.d/killprocs.in
@@ -19,9 +19,9 @@ depend()
 start()
 {
 	ebegin "Terminating remaining processes"
-	killall5 -15 ${killall5_opts}
+	kill_all 15 ${killall5_opts}
 	eend 0
 	ebegin "Killing remaining processes"
-	killall5 -9 ${killall5_opts}
+	kill_all 9 ${killall5_opts}
 	eend 0
 }
--- a/init.d/sysfs.in
+++ b/init.d/sysfs.in
@@ -101,7 +101,7 @@ mount_misc()
 	if [ -d /sys/firmware/efi/efivars ] &&
 		! mountinfo -q /sys/firmware/efi/efivars; then
 		ebegin "Mounting efivarfs filesystem"
-		mount -n -t efivarfs -o ${sysfs_opts} \
+		mount -n -t efivarfs -o ro \
 			efivarfs /sys/firmware/efi/efivars 2> /dev/null
 		eend 0
 	fi
--- a/man/openrc-run.8
+++ b/man/openrc-run.8
@@ -284,6 +284,18 @@ system.
 To see how to influence dependencies in configuration files, see the
 .Sx FILES
 section below.
+.Sh _pre AND _post FUNCTIONS
+Any command defined in extra_commands, extra_started_commands or
+extra_stopped_commands can have _pre and _post functions in the service
+script. If the command function is called foo, the_pre and _post
+functions for it should be called foo_pre and foo_post.
+.Pp
+These functions should be used to perform preparation before the
+command is run and cleanup after the command completes. In order for
+.Nm
+to record the command as being run successfully, the _pre
+function, command function itself and the _post function should all exit
+with a zero return code.
 .Sh BUILTINS
 .Nm
 defines some builtin functions that you can use inside your service scripts:
@@ -412,27 +424,63 @@ If -d, -f or -p is specified, checkpath checks to see if the path
 exists, is the right type and has the correct owner and access modes. If
 any of these tests fail, the path is created and set up as specified. If
 more than one of -d, -f or -p are specified, the last one will be used.
-
+.Pp
 The argument to -m is a three or four digit octal number. If this option
 is not provided, the value defaults to 0644 for files and 0775 for
 directories.
-
+.Pp
 The argument to -o is a representation of the user and/or group which
 should own the path. The user and group can be represented numerically
 or with names, and are separated by a colon.
-
+.Pp
 The truncate options (-D and -F) cause the directory or file to be
 cleared of all contents.
-
+.Pp
 If -W is specified, checkpath checks to see if the first path given on
 the command line is writable.  This is different from how the test
 command in the shell works, because it also checks to make sure the file
 system is not read only.
-
+.Pp
 Also, the -d, -f or -p options should not be specified along with this option.
-
+.Pp
 The -q option suppresses all informational output. If it is specified
 twice, all error messages are suppressed as well.
+.Ic fstabinfo
+.Op Fl M , -mount
+.Op Fl R , -remount
+.Op Fl b , -blockdevice
+.Op Fl m , -mountargs
+.Op Fl o , -options
+.Op Fl p , -passno Ar passno
+.Op Fl t , -type Ar fstype
+.Ar path
+.Xc
+If -b, -m, -o, -p or -t is specified,the appropriate information is
+extracted from fstab. If -M or -R are given, file systems are mounted or
+remounted.
+.Pp
+The -q option suppresses all informational output. If it is specified
+twice, all error messages are suppressed as well.
+.Ic mountinfo
+.Op Fl f, -fstype-regex Ar regex
+.Op Fl F, -skip-fstype-regex Ar regex
+.Op Fl n, -node-regex Ar regex
+.Op Fl N, -skip-node-regex Ar regex
+.Op Fl o, -options-regex Ar regex
+.Op Fl O, -skip-options-regex Ar regex
+.Op Fl p, -point-regex Ar regex
+.Op Fl P, -skip-point-regex Ar regex
+.Op Fl e, -netdev
+.Op Fl E, -nonetdev
+.Op Fl i, -options
+.Op Fl s, -fstype
+.Op Fl t, -node
+  .Ar mount1 mount2 ...
+.Xc
+The f, F, n, N, o, O, p, P, e and E options specify what you want to
+search for or skip in the mounted file systems. The i, s and t options
+specify what you want to display. If no mount points are given, all
+mount points will be considered.
 .It Ic yesno Ar value
 If
 .Ar value
--- a/man/openrc-shutdown.8
+++ b/man/openrc-shutdown.8
@@ -8,7 +8,7 @@
 .\" This file may not be copied, modified, propagated, or distributed
 .\"    except according to the terms contained in the LICENSE file.
 .\"
-.Dd April 6, 2017
+.Dd May 22, 2017
 .Dt openrc-shutdown 8 SMM
 .Os OpenRC
 .Sh NAME
@@ -16,22 +16,33 @@
 .Nd bring the system down
 .Sh SYNOPSIS
 .Nm
+.Op Fl d , -no-write
+.Op Fl D , -dry-run
 .Op Fl H , -halt
 .Op Fl k , -kexec
 .Op Fl p , -poweroff
 .Op Fl R , -reexec
 .Op Fl r , -reboot
+.Op Fl s , -single
+.Op Fl w , -write-only
 .Sh DESCRIPTION
 .Nm
-is the utility that communicates with openrc-init(8) to bring down the
-system or instruct openrc-init to re-execute itself. It supports the
-following options:
+is the utility that communicates with
+.Xr openrc-init 8
+to bring down the system or instruct openrc-init to re-execute itself.
+It supports the following options:
 .Bl -tag -width "poweroff"
+.It Fl d , -no-write
+Do not write the wtmp boot record.
+.It Fl D , -dry-run
+Print the action that would be taken without executing it. This is to
+allow testing.
 .It Fl H , -halt
 Stop all services, kill all remaining processes and halt the system.
 .It Fl k , -kexec
 Stop all services, kill all processes and boot directly into a new
-kernel loaded via kexec(8).
+kernel loaded via
+.Xr kexec 8 .
 .It Fl p , -poweroff
 Stop all services, kill all processes and power off the system.
 .It Fl R , -reexec
@@ -39,6 +50,10 @@ instruct openrc-init to re-exec itself. This should be used after an
 upgrade of OpenRC if you are using openrc-init as your init process.
 .It Fl r , -reboot
 Stop all services, kill all processes and reboot the system.
+.It Fl s , -single
+Stop all services, kill all processes and move to single user mode.
+.It Fl w , -write-only
+Stop all services, kill all processes and move to single user mode.
 .El
 .Sh SEE ALSO
 .Xr openrc-init 8 ,
--- a/man/supervise-daemon.8
+++ b/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.
@@ -130,6 +135,7 @@ The same thing as
 .Fl 1 , -stdout
 but with the standard error output.
 .El
+.El
 .Sh ENVIRONMENT
 .Va SSD_NICELEVEL
 can also set the scheduling priority of the daemon, but the command line
--- a/mk/cc.mk
+++ b/mk/cc.mk
@@ -26,7 +26,8 @@ _CCFLAGS=	-Wall -Wextra -Wimplicit -Wshadow -Wformat=2 \
 		-Wnested-externs \
 		-Winline -Wwrite-strings -Wcast-align -Wcast-qual \
 		-Wpointer-arith \
-		-Wdeclaration-after-statement -Wsequence-point
+		-Wdeclaration-after-statement -Wsequence-point \
+		-Werror=implicit-function-declaration

 # We should be using -Wredundant-decls, but our library hidden proto stuff
 # gives loads of warnings. I don't fully understand it (the hidden proto,
--- a/scripts/.gitignore
+++ b/scripts/.gitignore
@@ -1 +1,5 @@
+halt
+poweroff
 rc-sstat
+reboot
+shutdown
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -8,12 +8,23 @@ INSTALLAFTER = _installafter
 ifeq (${OS},Linux)
 SRCS+= rc-sstat.in
 BIN+=	rc-sstat
+ifeq (${MKSYSVINIT},yes)
+SRCS+= halt.in poweroff.in reboot.in shutdown.in
+BIN+=	halt poweroff reboot shutdown
+	endif
 endif

 _installafter:
 ifeq (${OS},Linux)
 	${INSTALL} -d ${DESTDIR}${SBINDIR}
 	ln -sf ${DIR}/rc-sstat ${DESTDIR}/${SBINDIR}/rc-sstat
+ifeq (${MKSYSVINIT},yes)
+	ln -sf	${DIR}/halt ${DESTDIR}/${SBINDIR}/halt
+	ln -sf	${DIR}/poweroff ${DESTDIR}/${SBINDIR}/poweroff
+	ln -sf	${DIR}/reboot ${DESTDIR}/${SBINDIR}/reboot
+	ln -sf	${DIR}/shutdown ${DESTDIR}/${SBINDIR}/shutdown
+	ln -sf	openrc-init ${DESTDIR}/${SBINDIR}/init
+endif
 endif

 include ${MK}/scripts.mk
--- a/scripts/halt.in
+++ b/scripts/halt.in
@@ -0,0 +1,24 @@
+#!@SHELL@
+
+option_arg=
+poweroff_arg=
+while getopts :nwdfiph opt; do
+	case "$opt" in
+		n) ;;
+		w) poweroff_arg=--write-only ;;
+		d) option_arg=--no-write ;;
+		f) ;;
+		i) ;;
+		p) poweroff_arg=--poweroff ;;
+		[?]) printf "%s\n" "${0##*/}: invalid command line option" >&2
+		exit 1
+		;;
+	esac
+done
+shift $((OPTIND-1))
+
+if [ -z "${poweroff_arg}" ]; then
+	poweroff_arg=--poweroff
+fi
+
+exec @SBINDIR@/openrc-shutdown ${option_arg} ${poweroff_arg} "$@"
--- a/scripts/poweroff.in
+++ b/scripts/poweroff.in
@@ -0,0 +1,23 @@
+#!@SHELL@
+
+option_arg=
+poweroff_arg=
+while getopts :nwdfiph opt; do
+	case "$opt" in
+		n) ;;
+		w) poweroff_arg=--write-only ;;
+		d) option_arg=--no-write ;;
+		f) ;;
+		i) ;;
+		[?]) printf "%s\n" "${0##*/}: invalid command line option" >&2
+		exit 1
+		;;
+	esac
+done
+shift $((OPTIND-1))
+
+if [ -z "${poweroff_arg}" ]; then
+	poweroff_arg=--poweroff
+fi
+
+exec @SBINDIR@/openrc-shutdown ${option_arg} ${poweroff_arg} "$@"
--- a/scripts/reboot.in
+++ b/scripts/reboot.in
@@ -0,0 +1,25 @@
+#!@SHELL@
+
+option_arg=
+poweroff_arg=
+while getopts :nwdfhik opt; do
+	case "$opt" in
+		n) ;;
+		w) poweroff_arg=--write-only ;;
+		d) option_arg=--no-write ;;
+		f) ;;
+		h) ;;
+		i) ;;
+		k) poweroff_arg=--kexec ;;
+		[?]) printf "%s\n" "${0##*/}: invalid command line option" >&2
+		exit 1
+		;;
+	esac
+done
+shift $((OPTIND-1))
+
+if [ -z "${poweroff_arg}" ]; then
+	poweroff_arg=--reboot
+fi
+
+exec @SBINDIR@/openrc-shutdown ${option_arg} ${poweroff_arg} "$@"
--- a/scripts/shutdown.in
+++ b/scripts/shutdown.in
@@ -0,0 +1,29 @@
+#!@SHELL@
+
+shutdown_arg=
+while getopts :akrhPHfFnct: opt; do
+	case "$opt" in
+		a) ;;
+		k) ;;
+		r) shutdown_arg=--reboot ;;
+		h) shutdown_arg=--halt ;;
+		P) shutdown_arg=--poweroff ;;
+		H) shutdown_arg=--halt ;;
+		f) ;;
+		F) ;;
+		n) ;;
+		c) ;;
+		t) ;;
+		[?]) printf "%s\n" "${0##*/}: invalid command line option" >&2
+		exit 1
+		;;
+	esac
+done
+shift $((OPTIND-1))
+
+if [ -z "${shutdown_arg}" ]; then
+	shutdown_arg=--single
+fi
+
+echo @SBINDIR@/openrc-shutdown ${shutdown_arg} "$@"
+exec @SBINDIR@/openrc-shutdown ${shutdown_arg} "$@"
--- a/sh/openrc-run.sh.in
+++ b/sh/openrc-run.sh.in
@@ -243,6 +243,9 @@ sourcex "@LIBEXECDIR@/sh/s6.sh"
 sourcex "@LIBEXECDIR@/sh/start-stop-daemon.sh"
 sourcex "@LIBEXECDIR@/sh/supervise-daemon.sh"

+# Load our script
+sourcex "$RC_SERVICE"
+
 # Set verbose mode
 if yesno "${rc_verbose:-$RC_VERBOSE}"; then
 	EINFO_VERBOSE=yes
@@ -272,9 +275,6 @@ for _cmd; do
 	fi
 done

-# Load our script
-sourcex "$RC_SERVICE"
-
 eval "printf '%s\n' $required_dirs" | while read _d; do
 	if [ -n "$_d" ] && [ ! -d "$_d" ]; then
 		eerror "$RC_SVCNAME: \`$_d' is not a directory"
--- a/sh/supervise-daemon.sh
+++ b/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 \
--- a/src/includes/rc-misc.h
+++ b/src/includes/rc-misc.h
@@ -71,5 +71,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
--- a/src/includes/rc-wtmp.h
+++ b/src/includes/rc-wtmp.h
@@ -0,0 +1,26 @@
+/*
+ * rc-wtmp.h
+ * This is private to us and not for user consumption
+*/
+
+/*
+ * 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_WTMP_H__
+#define __RC_WTMP_H__
+
+#include <utmp.h>
+
+void log_wtmp(const char *user, const char *id, pid_t pid, int type,
+		const char *line);
+
+#endif
--- a/src/rc/.gitignore
+++ b/src/rc/.gitignore
@@ -62,3 +62,4 @@ openrc
 openrc-init
 openrc-run
 openrc-shutdown
+kill_all
--- a/src/rc/Makefile
+++ b/src/rc/Makefile
@@ -14,7 +14,7 @@ SRCS+=		rc-selinux.c
 endif

 ifeq (${OS},Linux)
-SRCS+=		openrc-init.c openrc-shutdown.c
+SRCS+=		kill_all.c openrc-init.c openrc-shutdown.c rc-wtmp.c
 endif

 CLEANFILES=	version.h rc-selinux.o
@@ -44,6 +44,7 @@ RC_SBINPROGS=	mark_service_starting mark_service_started \
 		rc-abort swclock

 ifeq (${OS},Linux)
+RC_BINPROGS+= kill_all
 SBINPROGS+= openrc-init openrc-shutdown
 endif

@@ -99,6 +100,9 @@ checkpath: rc-selinux.o
 endif
 	${CC} ${LOCAL_CFLAGS} ${LOCAL_LDFLAGS} ${CFLAGS} ${LDFLAGS} -o $@ $^ ${LDADD}

+kill_all: kill_all.o _usage.o
+	${CC} ${LOCAL_CFLAGS} ${LOCAL_LDFLAGS} ${CFLAGS} ${LDFLAGS} -o $@ $^ ${LDADD}
+
 einfon einfo ewarnn ewarn eerrorn eerror ebegin eend ewend \
 eindent eoutdent esyslog eval_ecolors ewaitfile \
 veinfo vewarn vebegin veend vewend veindent veoutdent: do_e.o rc-misc.o
@@ -107,7 +111,7 @@ veinfo vewarn vebegin veend vewend veindent veoutdent: do_e.o rc-misc.o
 fstabinfo: fstabinfo.o _usage.o rc-misc.o
 	${CC} ${LOCAL_CFLAGS} ${LOCAL_LDFLAGS} ${CFLAGS} ${LDFLAGS} -o $@ $^ ${LDADD}

-openrc-init: openrc-init.o
+openrc-init: openrc-init.o rc-wtmp.o
 	${CC} ${LOCAL_CFLAGS} ${LOCAL_LDFLAGS} ${CFLAGS} ${LDFLAGS} -o $@ $^ ${LDADD}

 is_newer_than: is_newer_than.o rc-misc.o
@@ -128,7 +132,7 @@ mountinfo: mountinfo.o _usage.o rc-misc.o
 openrc rc: rc.o rc-logger.o rc-misc.o rc-plugin.o _usage.o
 	${CC} ${LOCAL_CFLAGS} ${LOCAL_LDFLAGS} ${CFLAGS} ${LDFLAGS} -o $@ $^ ${LDADD}

-openrc-shutdown: openrc-shutdown.o _usage.o
+openrc-shutdown: openrc-shutdown.o _usage.o rc-wtmp.o
 	${CC} ${LOCAL_CFLAGS} ${LOCAL_LDFLAGS} ${CFLAGS} ${LDFLAGS} -o $@ $^ ${LDADD}

 openrc-run runscript: openrc-run.o _usage.o rc-misc.o rc-plugin.o
@@ -152,10 +156,10 @@ rc-service service: rc-service.o _usage.o rc-misc.o
 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
--- a/src/rc/fstabinfo.c
+++ b/src/rc/fstabinfo.c
@@ -35,11 +35,11 @@
 #  define GET_ENT getmntent (fp)
 #  define GET_ENT_FILE(_name) getmntfile (_name)
 #  define END_ENT endmntent (fp)
-#  define ENT_BLOCKDEVICE(_ent) ent->mnt_fsname
-#  define ENT_FILE(_ent) ent->mnt_dir
-#  define ENT_TYPE(_ent) ent->mnt_type
-#  define ENT_OPTS(_ent) ent->mnt_opts
-#  define ENT_PASS(_ent) ent->mnt_passno
+#  define ENT_BLOCKDEVICE(_ent) (_ent)->mnt_fsname
+#  define ENT_FILE(_ent) (_ent)->mnt_dir
+#  define ENT_TYPE(_ent) (_ent)->mnt_type
+#  define ENT_OPTS(_ent) (_ent)->mnt_opts
+#  define ENT_PASS(_ent) (_ent)->mnt_passno
 #else
 #  define HAVE_GETFSENT
 #  include <fstab.h>
@@ -48,11 +48,11 @@
 #  define GET_ENT getfsent ()
 #  define GET_ENT_FILE(_name) getfsfile (_name)
 #  define END_ENT endfsent ()
-#  define ENT_BLOCKDEVICE(_ent) ent->fs_spec
-#  define ENT_TYPE(_ent) ent->fs_vfstype
-#  define ENT_FILE(_ent) ent->fs_file
-#  define ENT_OPTS(_ent) ent->fs_mntops
-#  define ENT_PASS(_ent) ent->fs_passno
+#  define ENT_BLOCKDEVICE(_ent) (_ent)->fs_spec
+#  define ENT_TYPE(_ent) (_ent)->fs_vfstype
+#  define ENT_FILE(_ent) (_ent)->fs_file
+#  define ENT_OPTS(_ent) (_ent)->fs_mntops
+#  define ENT_PASS(_ent) (_ent)->fs_passno
 #endif

 #include "einfo.h"
@@ -114,24 +114,24 @@ do_mount(struct ENT *ent, bool remount)

 	argv[0] = UNCONST("mount");
 	argv[1] = UNCONST("-o");
-	argv[2] = ENT_OPTS(*ent);
+	argv[2] = ENT_OPTS(ent);
 	argv[3] = UNCONST("-t");
-	argv[4] = ENT_TYPE(*ent);
+	argv[4] = ENT_TYPE(ent);
 	if (!remount) {
-		argv[5] = ENT_BLOCKDEVICE(*ent);
-		argv[6] = ENT_FILE(*ent);
+		argv[5] = ENT_BLOCKDEVICE(ent);
+		argv[6] = ENT_FILE(ent);
 		argv[7] = NULL;
 	} else {
 #ifdef __linux__
 		argv[5] = UNCONST("-o");
 		argv[6] = UNCONST("remount");
-		argv[7] = ENT_BLOCKDEVICE(*ent);
-		argv[8] = ENT_FILE(*ent);
+		argv[7] = ENT_BLOCKDEVICE(ent);
+		argv[8] = ENT_FILE(ent);
 		argv[9] = NULL;
 #else
 		argv[5] = UNCONST("-u");
-		argv[6] = ENT_BLOCKDEVICE(*ent);
-		argv[7] = ENT_FILE(*ent);
+		argv[6] = ENT_BLOCKDEVICE(ent);
+		argv[7] = ENT_FILE(ent);
 		argv[8] = NULL;
 #endif
 	}
--- a/src/rc/kill_all.c
+++ b/src/rc/kill_all.c
@@ -0,0 +1,251 @@
+/*
+ * kill_all.c
+ * Sends a signal to all processes on the system.
+ */
+
+/*
+ * 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.
+ */
+
+
+#include <dirent.h>
+#include <errno.h>
+#include <getopt.h>
+#include <limits.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <syslog.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+
+#include "einfo.h"
+#include "rc.h"
+#include "rc-misc.h"
+#include "_usage.h"
+
+const char *applet = NULL;
+const char *extraopts = "[signal number]";
+const char *getoptstring = "do:" getoptstring_COMMON;
+const struct option longopts[] = {
+	{ "dry-run",        0, NULL, 'd' },
+	{ "omit",        1, NULL, 'o' },
+	longopts_COMMON
+};
+const char * const longopts_help[] = {
+	"print what would be done",
+	"omit this pid (can be repeated)",
+	longopts_help_COMMON
+};
+const char *usagestring = NULL;
+
+static int mount_proc(void)
+{
+	pid_t pid;
+	pid_t rc;
+	int status;
+
+	if (exists("/proc/version"))
+		return 0;
+	pid = fork();
+	switch(pid) {
+		case -1:
+			syslog(LOG_ERR, "Unable to fork");
+			return -1;
+			break;
+		case 0:
+			/* attempt to mount /proc */
+			execl("mount", "mount", "-t", "proc", "proc", "/proc", NULL);
+			syslog(LOG_ERR, "Unable to execute mount");
+			exit(1);
+			break;
+		default:
+			/* wait for child process */
+			while ((rc = wait(&status)) != pid)
+				if (rc < 0 && errno == ECHILD)
+					break;
+			if (rc != pid || WEXITSTATUS(status) != 0)
+				syslog(LOG_ERR, "mount returned non-zero exit status");
+			break;
+	}
+	if (! exists("/proc/version")) {
+		syslog(LOG_ERR, "Could not mount /proc");
+		return -1;
+	}
+	return 0;
+}
+
+static bool is_user_process(pid_t pid)
+{
+	char buf[PATH_MAX+1];
+	FILE *fp;
+	char path[PATH_MAX+1];
+	pid_t temp_pid;
+	bool user_process = true;
+
+	while (pid >0 && user_process) {
+		if (pid == 2) {
+			user_process = false;
+			continue;
+		}
+		snprintf(path, sizeof(path), "/proc/%d/status", pid);
+		fp = fopen(path, "r");
+		/*
+		 * if we could not open the file, the process disappeared, which
+		 * leaves us no way to determine for sure whether it was a user
+		 * process or kernel thread, so we say it is a kernel thread to
+		 * avoid accidentally killing it.
+		 */
+		if (!fp) {
+			user_process = false;
+			continue;
+		}
+		temp_pid = -1;
+		while (! feof(fp)) {
+			buf[0] = 0;
+			if (fgets(buf, sizeof(buf), fp))
+				sscanf(buf, "PPid: %d", &temp_pid);
+			else
+				break;
+		}
+		fclose(fp);
+		if (temp_pid == -1) {
+			syslog(LOG_ERR, "Unable to read pid from /proc/%d/status", pid);
+			user_process = false;
+			continue;
+		}
+		pid = temp_pid;
+	}
+	return user_process;
+}
+
+static int signal_processes(int sig, RC_STRINGLIST *omits, bool dryrun)
+{
+	sigset_t signals;
+	sigset_t oldsigs;
+	DIR *dir;
+	struct dirent	*d;
+	char buf[PATH_MAX+1];
+	pid_t pid;
+	int sendcount = 0;
+
+	kill(-1, SIGSTOP);
+	sigfillset(&signals);
+	sigemptyset(&oldsigs);
+	sigprocmask(SIG_SETMASK, &signals, &oldsigs);
+	/*
+	 * Open the /proc directory.
+	 * CWD must be /proc to avoid problems if / is affected by the killing
+	 * (i.e. depends on fuse).
+	 */
+	if (chdir("/proc") == -1) {
+		syslog(LOG_ERR, "chdir /proc failed");
+		sigprocmask(SIG_SETMASK, &oldsigs, NULL);
+		kill(-1, SIGCONT);
+		return -1;
+	}
+	dir = opendir(".");
+	if (!dir) {
+		syslog(LOG_ERR, "cannot opendir(/proc)");
+		sigprocmask(SIG_SETMASK, &oldsigs, NULL);
+		kill(-1, SIGCONT);
+		return -1;
+	}
+
+	/* Walk through the directory. */
+	while ((d = readdir(dir)) != NULL) {
+		/* Is this a process? */
+		pid = (pid_t) atoi(d->d_name);
+		if (pid == 0)
+			continue;
+
+		/* Is this a process we have been requested to omit? */
+		sprintf(buf, "%d", pid);
+		if (rc_stringlist_find(omits, buf))
+			continue;
+
+		/* Is this process in our session? */
+		if (getsid(getpid()) == getsid(pid))
+			continue;
+
+		/* Is this a kernel thread? */
+		if (!is_user_process(pid))
+			continue;
+
+		if (dryrun)
+			einfo("Would send signal %d to process %d", sig, pid);
+		else if (kill(pid, sig) == 0)
+			sendcount++;
+	}
+	closedir(dir);
+	sigprocmask(SIG_SETMASK, &oldsigs, NULL);
+	kill(-1, SIGCONT);
+	return sendcount;
+}
+
+int main(int argc, char **argv)
+{
+	char *arg = NULL;
+	int opt;
+	bool dryrun = false;
+	RC_STRINGLIST *omits = rc_stringlist_new();
+	int sig = SIGKILL;
+	char *here;
+	char *token;
+
+	/* Ensure that we are only quiet when explicitly told to be */
+	unsetenv("EINFO_QUIET");
+
+	applet = basename_c(argv[0]);
+	rc_stringlist_addu(omits, "1");
+	while ((opt = getopt_long(argc, argv, getoptstring,
+		    longopts, (int *) 0)) != -1)
+	{
+		switch (opt) {
+			case 'd':
+				dryrun = true;
+				break;
+			case 'o':
+				here = optarg;
+				while ((token = strsep(&here, ",;:"))) {
+					if ((pid_t) atoi(token) > 0)
+						rc_stringlist_addu(omits, token);
+					else {
+						eerror("Invalid omit pid value %s", token);
+						usage(EXIT_FAILURE);
+					}
+				}
+				break;
+			case_RC_COMMON_GETOPT
+		}
+	}
+
+	if (argc > optind) {
+	arg = argv[optind];
+	sig = atoi(arg);
+	if (sig <= 0 || sig > 31) {
+		rc_stringlist_free(omits);
+		eerror("Invalid signal %s", arg);
+		usage(EXIT_FAILURE);
+	}
+	}
+	
+	openlog(applet, LOG_CONS|LOG_PID, LOG_DAEMON);
+	if (mount_proc() != 0) {
+		rc_stringlist_free(omits);
+		eerrorx("Unable to mount /proc file system");
+	}
+	signal_processes(sig, omits, dryrun);
+	rc_stringlist_free(omits);
+	return 0;
+}
--- a/src/rc/openrc-init.c
+++ b/src/rc/openrc-init.c
@@ -32,6 +32,7 @@

 #include "helpers.h"
 #include "rc.h"
+#include "rc-wtmp.h"
 #include "version.h"

 static const char *rc_default_runlevel = "default";
@@ -82,6 +83,7 @@ static void init(const char *default_runlevel)
 	}
 	pid = do_openrc(runlevel);
 	waitpid(pid, NULL, 0);
+	log_wtmp("reboot", "~~", 0, RUN_LVL, "~~");
 }

 static void handle_reexec(char *my_name)
@@ -105,6 +107,14 @@ static void handle_shutdown(const char *runlevel, int cmd)
 	reboot(cmd);
 }

+static void handle_single(void)
+{
+	pid_t pid;
+
+	pid = do_openrc("single");
+	while (waitpid(pid, NULL, 0) != pid);
+}
+
 static void reap_zombies(void)
 {
 	pid_t pid;
@@ -187,7 +197,7 @@ int main(int argc, char **argv)
 				perror("fopen");
 			continue;
 		}
-		count = fread(buf, 1, 2048, fifo);
+		count = fread(buf, 1, sizeof(buf) - 1, fifo);
 		buf[count] = 0;
 		fclose(fifo);
 		printf("PID1: Received \"%s\" from FIFO...\n", buf);
@@ -201,6 +211,8 @@ int main(int argc, char **argv)
 			handle_shutdown("reboot", RB_AUTOBOOT);
 		else if (strcmp(buf, "reexec") == 0)
 			handle_reexec(argv[0]);
+		else if (strcmp(buf, "single") == 0)
+			handle_single();
 	}
 	return 0;
 }
--- a/src/rc/openrc-shutdown.c
+++ b/src/rc/openrc-shutdown.c
@@ -27,42 +27,67 @@
 #include <string.h>
 #include <unistd.h>
 #include <sys/types.h>
+#include <sys/utsname.h>

 #include "einfo.h"
 #include "rc.h"
 #include "helpers.h"
 #include "_usage.h"
+#include "rc-wtmp.h"

 const char *applet = NULL;
 const char *extraopts = NULL;
-const char *getoptstring = "HkpRr" getoptstring_COMMON;
+const char *getoptstring = "dDHKpRrsw" getoptstring_COMMON;
 const struct option longopts[] = {
+	{ "no-write",        no_argument, NULL, 'd'},
+	{ "dry-run",        no_argument, NULL, 'D'},
 	{ "halt",        no_argument, NULL, 'H'},
-	{ "kexec",        no_argument, NULL, 'k'},
+	{ "kexec",        no_argument, NULL, 'K'},
 	{ "poweroff",        no_argument, NULL, 'p'},
 	{ "reexec",        no_argument, NULL, 'R'},
 	{ "reboot",        no_argument, NULL, 'r'},
+	{ "single",        no_argument, NULL, 's'},
+	{ "write-only",        no_argument, NULL, 'w'},
 	longopts_COMMON
 };
 const char * const longopts_help[] = {
+	"do not write wtmp record",
+	"print actions instead of executing them",
 	"halt the system",
 	"reboot the system using kexec",
 	"power off the system",
 	"re-execute init (use after upgrading)",
 	"reboot the system",
+	"single user mode",
+	"write wtmp boot record and exit",
 	longopts_help_COMMON
 };
 const char *usagestring = NULL;
 const char *exclusive = "Select one of "
-"--halt, --kexec, --poweroff, --reexec or --reboot";
+"--halt, --kexec, --poweroff, --reexec, --reboot, --single or --write-only";
+
+static bool do_dryrun = false;
+static bool do_halt = false;
+static bool do_kexec = false;
+static bool do_poweroff = false;
+static bool do_reboot = false;
+static bool do_reexec = false;
+static bool do_single = false;
+static bool do_wtmp = true;
+static bool do_wtmp_only = false;

 static void send_cmd(const char *cmd)
 {
 	FILE *fifo;
 	size_t ignored;

+	if (do_dryrun) {
+		einfo("Would send %s to init", cmd);
+		return;
+	}
+	if (do_wtmp && (do_halt || do_kexec || do_reboot || do_poweroff))
+		log_wtmp("shutdown", "~~", 0, RUN_LVL, "~~");
 	fifo = fopen(RC_INIT_FIFO, "w");
-
 	if (!fifo) {
 		perror("fopen");
 		return;
@@ -78,24 +103,23 @@ int main(int argc, char **argv)
 {
 	int opt;
 	int cmd_count = 0;
-	bool do_halt = false;
-	bool do_kexec = false;
-	bool do_poweroff = false;
-	bool do_reboot = false;
-	bool do_reexec = false;

 	applet = basename_c(argv[0]);
-if (geteuid() != 0)
-	eerrorx("%s: you must be root\n", applet);
 	while ((opt = getopt_long(argc, argv, getoptstring,
 		    longopts, (int *) 0)) != -1)
 	{
 		switch (opt) {
+			case 'd':
+				do_wtmp = false;
+				break;
+		case 'D':
+			do_dryrun = true;
+			break;
 		case 'H':
 			do_halt = true;
 			cmd_count++;
 			break;
-		case 'k':
+		case 'K':
 			do_kexec = true;
 			cmd_count++;
 			break;
@@ -111,9 +135,19 @@ if (geteuid() != 0)
 			do_reboot = true;
 			cmd_count++;
 			break;
+		case 's':
+			do_single = true;
+			cmd_count++;
+			break;
+		case 'w':
+			do_wtmp_only = true;
+			cmd_count++;
+			break;
 		case_RC_COMMON_GETOPT
 		}
 	}
+	if (geteuid() != 0 && ! do_dryrun)
+		eerrorx("%s: you must be root\n", applet);
 	if (cmd_count != 1) {
 		eerror("%s: %s\n", applet, exclusive);
 		usage(EXIT_FAILURE);
@@ -128,5 +162,9 @@ if (geteuid() != 0)
 		send_cmd("reboot");
 	else if (do_reexec)
 		send_cmd("reexec");
+	else if (do_wtmp_only)
+		log_wtmp("shutdown", "~~", 0, RUN_LVL, "~~");
+	else if (do_single)
+		send_cmd("single");
 	return 0;
 }
--- a/src/rc/rc-logger.c
+++ b/src/rc/rc-logger.c
@@ -261,12 +261,12 @@ rc_logger_open(const char *level)
 						break;
 					}
 				}
+				fclose(log);
 			} else {
 				log_error = 1;
 				eerror("Error: fopen(%s) failed: %s", TMPLOG, strerror(errno));
 			}

-			fclose(log);
 			fclose(plog);
 		} else {
 			/*
--- a/src/rc/rc-misc.c
+++ b/src/rc/rc-misc.c
@@ -474,3 +474,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;
+}
--- a/src/rc/rc-schedules.c
+++ b/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 initialize_schedulelist(void)
+{
+	TAILQ_INIT(&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;
+
+	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)
+{
+	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;
+}
+
+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);
+			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)) == 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;
+}
--- a/src/rc/rc-schedules.h
+++ b/src/rc/rc-schedules.h
@@ -0,0 +1,27 @@
+/*
+ * 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 initialize_schedulelist(void);
+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);
+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
--- a/src/rc/rc-status.c
+++ b/src/rc/rc-status.c
@@ -83,11 +83,11 @@ static void get_uptime(const char *service, char *uptime, int uptime_size)
 	time_t now;
 	char *start_time_string;
 	time_t start_time;
-	double time_diff;
-	double diff_tmp;
-	double diff_days;
-	double diff_hours;
-	double diff_mins;
+	time_t time_diff;
+	time_t diff_days = (time_t) 0;
+	time_t diff_hours = (time_t) 0;
+	time_t diff_mins = (time_t) 0;
+	time_t diff_secs = (time_t) 0;

 	uptime[0] = '\0';
 	if (state & RC_SERVICE_STARTED) {
@@ -96,26 +96,29 @@ static void get_uptime(const char *service, char *uptime, int uptime_size)
 		if (start_count && start_time_string) {
 			start_time = to_time_t(start_time_string);
 			now = time(NULL);
-			time_diff = difftime(now, start_time);
-			diff_tmp = time_diff;
-			if (diff_tmp > 86400.0) {
-				diff_days = diff_tmp / 86400.0;
-				diff_tmp -= diff_days * 86400.0;
+			time_diff = (time_t) difftime(now, start_time);
+			diff_secs = time_diff;
+			if (diff_secs > (time_t) 86400) {
+				diff_days = diff_secs / (time_t) 86400;
+				diff_secs %= diff_days * (time_t) 86400;
 			}
-			if (diff_tmp > 3600.0) {
-				diff_hours = diff_tmp / 3600.0;
-				diff_tmp -= diff_hours * 3600.0;
+			if (diff_secs > (time_t) 3600) {
+				diff_hours = diff_secs / (time_t) 3600;
+				diff_secs %= diff_hours * (time_t) 3600;
 			}
-			if (diff_tmp > 60.0) {
-				diff_mins = diff_tmp / 60.0;
-				diff_tmp -= diff_mins * 60.0;
+			if (diff_secs > (time_t) 60) {
+				diff_mins = diff_secs / (time_t) 60;
+				diff_secs %= diff_mins * (time_t) 60;
 			}
-			if ((int) diff_days > 0)
-				snprintf(uptime, uptime_size, "%.0f days %02.0f:%02.0f (%s)",
-						diff_days, diff_hours, diff_mins, start_count);
+			if (diff_days > 0)
+				snprintf(uptime, uptime_size,
+						"%ld day(s) %02ld:%02ld:%02ld (%s)",
+						diff_days, diff_hours, diff_mins, diff_secs,
+						start_count);
 			else
-				snprintf(uptime, uptime_size, "%02.0f:%02.0f (%s)",
-						diff_hours, diff_mins, start_count);
+				snprintf(uptime, uptime_size,
+						"%02ld:%02ld:%02ld (%s)",
+						diff_hours, diff_mins, diff_secs, start_count);
 		}
 	}
 }
--- a/src/rc/rc-wtmp.c
+++ b/src/rc/rc-wtmp.c
@@ -0,0 +1,51 @@
+/*
+ * rc-wtmp.c
+ * This file contains routines to deal with the wtmp file.
+ */
+
+/*
+ * Copyright 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.
+ */
+
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <sys/utsname.h>
+
+#include "rc-wtmp.h"
+
+void log_wtmp(const char *user, const char *id, pid_t pid, int type,
+		const char *line)
+{
+	struct timeval tv;
+	struct utmp utmp;
+	struct utsname uname_buf;
+
+	memset(&utmp, 0, sizeof(utmp));
+	gettimeofday(&tv, NULL);
+	utmp.ut_tv.tv_sec = tv.tv_sec;
+	utmp.ut_tv.tv_usec = tv.tv_usec;
+	utmp.ut_pid  = pid;
+	utmp.ut_type = type;
+	strncpy(utmp.ut_name, user, sizeof(utmp.ut_name));
+	strncpy(utmp.ut_id  , id  , sizeof(utmp.ut_id  ));
+	strncpy(utmp.ut_line, line, sizeof(utmp.ut_line));
+        
+        /* Put the OS version in place of the hostname */
+        if (uname(&uname_buf) == 0)
+		strncpy(utmp.ut_host, uname_buf.release, sizeof(utmp.ut_host));
+
+	updwtmp(WTMP_FILE, &utmp);
+}
--- a/src/rc/start-stop-daemon.c
+++ b/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);
-		i = run_stop_schedule(exec, (const char *const *)margv,
-		    pidfile, uid, test, progress);
+			parse_schedule(applet, NULL, sig);
+		i = run_stop_schedule(applet, exec, (const char *const *)margv,
+		    get_pid(applet, pidfile), uid, test, progress, false);

 		if (i < 0)
 			/* We failed to stop something */
@@ -1090,11 +679,11 @@ 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)
 		eerrorx("%s: %s is already running", applet, exec);

@@ -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,7 +963,7 @@ 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)
 				alive = true;
 		}
--- a/src/rc/supervise-daemon.c
+++ b/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:" \
 	getoptstring_COMMON;
 const struct option longopts[] = {
 	{ "respawn-delay",        1, NULL, 'D'},
@@ -80,6 +81,7 @@ 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'},
@@ -99,6 +101,7 @@ 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",
@@ -147,30 +150,6 @@ static void cleanup(void)
 	free(changeuser);
 }

-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;
-}
-
 static void child_process(char *exec, char **argv, char *svcname,
 		int start_count)
 {
@@ -196,6 +175,14 @@ static void child_process(char *exec, char **argv, char *svcname,

 	setsid();

+	if (svcname) {
+start_time = time(NULL);
+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);
+		rc_service_value_set(svcname, "start_count", start_count_string);
+	}
+
 	if (nicelevel) {
 		if (setpriority(PRIO_PROCESS, getpid(), nicelevel) == -1)
 			eerrorx("%s: setpriority %d: %s", applet, nicelevel,
@@ -342,13 +329,6 @@ static void child_process(char *exec, char **argv, char *svcname,
 		c++;
 	}
 	syslog(LOG_INFO, "Running command line: %s", cmdline);
-	if (svcname) {
-start_time = time(NULL);
-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);
-		rc_service_value_set(svcname, "start_count", start_count_string);
-	}
 	execvp(exec, argv);

 #ifdef HAVE_PAM
@@ -433,6 +413,9 @@ int main(int argc, char **argv)
 	bool stop = false;
 	char *exec = NULL;
 	char *pidfile = NULL;
+	char *retry = NULL;
+	int nkilled;
+	int sig = SIGTERM;
 	char *home = NULL;
 	int tid = 0;
 	pid_t child_pid, pid;
@@ -557,6 +540,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;
@@ -628,6 +614,10 @@ int main(int argc, char **argv)
 				"than %d to avoid infinite respawning", applet, 
 				respawn_delay * respawn_max);
 		}
+		if (retry)
+			parse_schedule(applet, retry, sig);
+		else
+			parse_schedule(applet, NULL, sig);
 	}

 	/* Expand ~ */
@@ -672,15 +662,19 @@ int main(int argc, char **argv)
 		    *exec_file ? exec_file : exec);

 	if (stop) {
-		pid = get_pid(pidfile);
+		pid = get_pid(applet, pidfile);
 		if (pid == -1)
 			i = pid;
 		else
 			i = kill(pid, SIGTERM);
 		if (i != 0)
-			/* We failed to stop something */
+			/* We failed to send the signal */
 			exit(EXIT_FAILURE);

+		/* wait for the supervisor to go down */
+		while (kill(pid, 0) == 0)
+			sleep(1);
+
 		/* Even if we have not actually killed anything, we should
 		 * remove information about it as it may have unexpectedly
 		 * crashed out. We should also return success as the end
@@ -696,7 +690,7 @@ int main(int argc, char **argv)
 		exit(EXIT_SUCCESS);
 	}

-	pid = get_pid(pidfile);
+	pid = get_pid(applet, pidfile);
 	if (pid != -1)
 		if (kill(pid, 0) == 0)
 			eerrorx("%s: %s is already running", applet, exec);
@@ -760,7 +754,10 @@ int main(int argc, char **argv)
 			wait(&i);
 			if (exiting) {
 				syslog(LOG_INFO, "stopping %s, pid %d", exec, child_pid);
-				kill(child_pid, SIGTERM);
+				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) {
Author	SHA1	Message	Date
William Hubbs	a09b8af3f9	Update ChangeLog	2017-09-06 17:31:01 -05:00
William Hubbs	382efdbfcb	add quiet parameter to run_stop_schedule	2017-09-06 17:22:35 -05:00
William Hubbs	17b5cc78d3	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.	2017-09-06 17:22:21 -05:00
William Hubbs	36a0ab9054	make run_stop_schedule accept a pid instead of a pid file	2017-08-25 11:36:45 -05:00
William Hubbs	27c2bd997d	version 0.30	2017-08-24 11:44:32 -05:00
William Hubbs	d7938f54f2	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.	2017-08-24 11:34:18 -05:00
William Hubbs	cfbe9c2ede	move get_pid function to a shared file	2017-08-23 14:36:50 -05:00
William Hubbs	df28002b72	Update ChangeLog	2017-08-16 11:38:37 -05:00
William Hubbs	66ed8082d0	sh/openrc-run: source service script before ulimit is processed This is needed to allow the service script author to set a default for rc_ulimit inside the service script.	2017-08-15 17:15:14 -05:00
William Hubbs	c2d256bafb	man/openrc-run.8: document fstabinfo and mountinfo X-Gentoo-Bug: 592374 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=592374	2017-07-26 11:31:34 -05:00
William Hubbs	f48d9c33a5	man/openrc-run.8: document _pre and _post functions Fixes https://github.com/openrc/openrc/issues/155.	2017-07-25 13:54:12 -05:00
Jason Graham	6d4e843397	fix ENT macro usage X-Gentoo-Bug: 624796 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=624796	2017-07-24 18:24:18 -05:00
William Hubbs	0513cd3964	version 0.29	2017-07-24 17:28:54 -05:00
John R. Graham	72bb2e57de	Typo fix X-Gentoo-Bug: 624908 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=624908	2017-07-24 17:24:13 -05:00
William Hubbs	84c5da3069	Update ChangeLog	2017-07-13 17:51:02 -05:00
William Hubbs	b35099cb70	Add comment about overriding the default efivars mount in fstab to news	2017-07-13 17:49:25 -05:00
William Hubbs	3fd3bfc76d	add link to efivars issue to news file	2017-07-11 15:10:16 -05:00
William Hubbs	492a6303cb	Update ChangeLog	2017-07-11 14:57:13 -05:00
William Hubbs	e7807b3136	fix sysvinit compatibility for shutdown wrapper	2017-07-11 14:41:29 -05:00
William Hubbs	03a461ac0e	fix sysvinit compatibility for reboot wrapper	2017-07-11 11:53:23 -05:00
William Hubbs	7e0f76e0ad	fix sysvinit compatibility for poweroff wrapper	2017-07-11 11:10:46 -05:00
William Hubbs	9812ce5b8d	fix halt wrapper so it is sysvinit compatible This makes the halt wrapper sysvinit compatible. It ignores several command line switches which are not currently implemented; however, those can be implemented if we need to do so. This fixes https://github.com/openrc/openrc/issues/146.	2017-07-10 18:36:24 -05:00
Adam Borowski	12f75e4167	man: fix an unclosed .Bl/.El warning This fixes #151.	2017-07-07 17:14:31 -05:00
Adam Borowski	260368e010	man: fix missing .Pp warnings This fixes #151.	2017-07-07 17:13:40 -05:00
William Hubbs	f87a9eec3d	init.d/sysfs: mount efivars read only This fixes #134.	2017-06-13 13:19:36 -05:00
William Hubbs	1e837d596e	fix argument parsing for the sysvinit shutdown wrapper This fixes #140.	2017-06-12 17:58:18 -05:00
William Hubbs	dcc686e42b	scripts/shutdown: fix arguments to be sysvinit shutdown compatible This fixes #140.	2017-06-12 12:24:18 -05:00
William Hubbs	2f81c100af	Fix link to shutdown for MKSYSVINIT=yes	2017-06-12 12:12:50 -05:00
Nuno Silva	a511a48d77	init.d/hostname: fix default parameter syntax The syntax for expanding a variable with a default value is ${parameter:-word} not ${parameter-word} although the latter still works for a reason I could not explain. This fixes #143.	2017-06-12 10:44:27 -05:00
Nuno Silva	1e5322e5c5	init.d/hostname: fix indentation This is for #143.	2017-06-12 10:43:55 -05:00
udeved	199a210d2f	scripts/Makefile: make symlinks absolute instead of relative This closes #142.	2017-06-12 10:39:44 -05:00
udeved	5b7667af32	scripts/Makefile: respect SBINDIR with MKSYSVINIT This is for #142.	2017-06-12 10:38:47 -05:00
Jory A. Pratt	11243f85b6	kill_all: include limits.h for PATH_MAX	2017-06-08 10:04:19 -05:00
William Hubbs	3c40826d34	version 0.28	2017-06-08 08:45:16 -05:00
William Hubbs	560d874d2f	fix compile issue for musl	2017-06-08 08:43:42 -05:00
William Hubbs	e84366fd23	Update ChangeLog	2017-06-07 12:03:52 -05:00
William Hubbs	caacedc0a8	man: update openrc-shutdown man page Add the new wtmp options and fix some cross references.	2017-06-07 11:28:01 -05:00
William Hubbs	84d140a1f6	scripts/shutdown: pass --single to openrc-shutdown Sysvinit shutdown has a default of single user mode, but openrc-shutdown makes you choose a default action. Because of this, the shutdown wrapper needs to pass --single to openrc-shutdown.	2017-06-07 10:59:42 -05:00
William Hubbs	ee886c4482	openrc-shutdown: add --single option and clean up option processing	2017-06-05 15:49:22 -05:00
William Hubbs	1801561c2d	init.d/bootmisc: use openrc-shutdown instead of halt to write halt record This fixes #139 and fixes #128. and fixes #124.	2017-06-05 16:52:50 +00:00
William Hubbs	7689106aa1	add support for writing reboot and shutdown records to wtmp	2017-06-04 20:56:03 -05:00
William Hubbs	1564e155b7	openrc-init: add optional sysvinit compatibility	2017-05-31 18:07:02 -05:00
William Hubbs	44bac3c379	Change killprocs to use kill_all instead of killall5 X-Gentoo-Bug:376977 X-Gentoo-Bug-URL:https://bugs.gentoo.org/show_bug.cgi?id=376977	2017-05-30 18:48:33 -05:00
Sergei Trofimovich	0ddee9b7d2	openrc-init: fix buffer overflow in init.ctl How to reproduce 1-byte overflow: ``` $ FEATURES=-test CFLAGS="-fsanitize=address -O0 -ggdb3" emerge -1 openrc ================================================================= ==1==ERROR: AddressSanitizer: stack-buffer-overflow on address 0x7fff0efd8710 at pc 0x000000402076 bp 0x7fff0efd7d50 sp 0x7fff0efd7d40 WRITE of size 1 at 0x7fff0efd8710 thread T0 #0 0x402075 (/sbin/openrc-init+0x402075) #1 0x3cf6e2070f in __libc_start_main (/lib64/libc.so.6+0x3cf6e2070f) #2 0x4013b8 (/sbin/openrc-init+0x4013b8) Address 0x7fff0efd8710 is located in stack of thread T0 at offset 2432 in frame #0 0x401cfb (/sbin/openrc-init+0x401cfb) This frame has 3 object(s): [32, 160) 'signals' [192, 344) 'sa' [384, 2432) 'buf' <== Memory access at offset 2432 overflows this variable HINT: this may be a false positive if your program uses some custom stack unwind mechanism or swapcontext (longjmp and C++ exceptions are supported) SUMMARY: AddressSanitizer: stack-buffer-overflow ??:0 ?? ``` The problem here is in the code handling reads from 'init.ctl': ``` int main(int argc, char *argv) { ... char buf[2048]; for (;;) { / This will block until a command is sent down the pipe... */ fifo = fopen(RC_INIT_FIFO, "r"); count = fread(buf, 1, 2048, fifo); buf[count] = 0; ... } ``` `buf[count] = 0;` writes outside the buffer when `fread()` returns non-truncated read. This fixes #138.	2017-05-30 16:21:23 -05:00
Sergei Trofimovich	688566c535	mk/cc.mk: make implicit function declarations fatal (#136 ) Avoids issues with missing prototypes causing truncation of pointers. Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>	2017-05-30 03:51:42 -04:00
Sergei Trofimovich	7185e242ff	rc-logger.c: fix crash on fclose(NULL) (#137 ) Only close the log if we successfully opened it. Reported-by: Brian Evans <grknight@gentoo.org> Tested-by: Brian Evans <grknight@gentoo.org> Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>	2017-05-30 03:47:55 -04:00
William Hubbs	ec27299f4b	typo fix X-Gentoo-Bug: 618888 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=618888	2017-05-22 12:52:58 -05:00
William Hubbs	1ece16bfcd	openrc-shutdown: add dry-run option	2017-05-22 12:42:37 -05:00
William Hubbs	0cfd0dd9ef	openrc-shutdown: move to single user mode by default To be more compatible with sysvinit, move to single user mode if no options are specified on the command line.	2017-05-22 12:15:15 -05:00
William Hubbs	a77ee2e941	init: add ability to switch to single user mode	2017-05-22 11:29:23 -05:00
William Hubbs	49b8a573a1	add kill_all helper This is similar to the sysvinit killall5 utility. It should only be used in service scripts, so it will not be installed in the path. This closes #129.	2017-05-19 18:13:39 -05:00
William Hubbs	a2055af900	rc_status: calculate time differences in time_t and display seconds in uptime	2017-05-15 18:55:47 -05:00
William Hubbs	cbf96967f1	supervise-daemon: save start time and respawn count before dropping privs	2017-05-12 17:15:55 -05:00
William Hubbs	f1013037b4	version 0.27	2017-05-12 17:14:15 -05:00