Update ChangeLog

X-Gentoo-Bug: 595306
X-Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=595306

.gitignore

@@ -1,4 +1,4 @@
-*.bz2
+*.gz
 
 *.diff
 *.patch

ChangeLog

@@ -1,4 +1,598 @@
-commit 6074cbd651da7f27fc6fbc20a66f651c2577857b
+commit 5df511e9e435726e6c16698eae7fda0960d7c021
+Author: Doug Freed <dwfreed@mtu.edu>
+Commit: Doug Freed <dwfreed@mtu.edu>
+
+    openrc-run: fix double free
+
+commit 60ede6b687590282fab7fd7a7aa38a3c7c9958d7
+Author: Doug Freed <dwfreed@mtu.edu>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    init.d: Clean up some bad ewarn output
+
+commit c2f2533db07ff346c5a5ade987c43a526f805341
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    typo fix
+    
+    X-Gentoo-Bug: 595306
+    X-Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=595306
+
+commit e627ad48040437be8a5242ea4a418a0eeca95306
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    version 0.22.1
+
+commit b71bcc242202752bc74fce3a5c629f172b04fca5
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    update ChangeLog
+
+commit 24010dcb483cf7284cd8a5db111ae63f0d4e1038
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    dist: convert to tar.gz
+    
+    This allows the "make dist" target to be used as well as the github
+    archive generation.
+
+commit 0a76627345a173fc00be9864f3f3f5c3b15319cd
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    init.d/swap: remove the case for linux
+    
+    I am removing the separate case for Linux, because we are droppping the
+    "-e" switch.
+
+commit bbf98befb86337a36ef5af7f273e503a6de4b9bd
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    sh/init.sh.Linux.in: update test for live /proc to use md5sum
+    
+    This allows us to avoid the warnings from bash-4.4 about null bytes in
+    command substitutions.
+    
+    If you have separate /usr, are not using an initramfs, and have a file
+    called /proc/self/environ on your root file system, this will break.
+    X-Gentoo-Bug: 594534
+    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=594534
+
+commit 316903fbf0da6edc067a98327c8c6cb2b3cdcf93
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    man/openrc-run.8: typo fix
+
+commit 66a9788435e51e658e4ae9d3ce0d0e54ea53e4f9
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    man/openrc-run.8: Add note about eval usage
+    
+    This fixes #77.
+
+commit bf73363f220ff086d2559e7c2015801f80862749
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    Add --use-blacklist to modprobe calls in modules and modules-load
+    
+    This means that we will honor the modprobe black lists.
+    
+    X-Gentoo-Bug: 594012
+    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=594012
+
+commit d6c30ab12a3b335ac57cd1f0ac00231bb34fc0c4
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    Revert "Remove eval calls from supervisor start functions"
+    
+    This reverts commit 0d1f1010c299a95332f224c3be9e8dfdd85eec54.
+    We need the eval in case someone uses something like:
+    command_args="this \"is a\" test"
+    
+    This is related to #77.
+
+commit 0d1f1010c299a95332f224c3be9e8dfdd85eec54
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    Remove eval calls from supervisor start functions
+    
+    This fixes #77.
+
+commit 83bb827edf5b9be04a326d1970d6f55db239281f
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    Revert "Disable parallel startup in interactive mode"
+    
+    This reverts commit 8b4fc05ff2645b2ecb0f153492f72dd8b39ba431.
+    The original commit did not explain why this feature was disabled, and I
+    now have a request to enable it.
+    
+    This fixes #24.
+
+commit c146b966913ae80652e3be925d3aba60ed82f14d
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    Add command_progress variable
+    
+    If this is set to yes, 1, true, or on, start-stop-daemon will display a
+    progress meter while waiting for a daemon to stop.
+
+commit 6cabaf274defa11773094a2c85b3d0a9f0bd9b08
+Author: Doug Freed <dwfreed@mtu.edu>
+Commit: Doug Freed <dwfreed@mtu.edu>
+
+    rc-misc: allow EINFO_VERBOSE through too
+
+commit 1edb5f6fd9c4827e5d4ed5c854bc322ba8a7df73
+Author: Doug Freed <dwfreed@mtu.edu>
+Commit: Doug Freed <dwfreed@mtu.edu>
+
+    rc-misc: Allow EINFO_COLOR through env_filter()
+    
+    This allows rc-service -C <service> <action> to properly not print color
+    messages.
+    
+    Fixes #93
+
+commit c4d7e02abd7008b8e8ad16f62c2abbb60fab252b
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    Fix permission checks for cgroups
+    
+    This is needed because containers may give read access to cgroups but
+    not allow the settings to be changed.
+
+commit a4e0d675e13f07bf880da10a4d602983a556264d
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    man/openrc-run.8: update variable documentation
+    
+    - document command_args_background and command_user.r
+    - clarify documentation for command_background
+    
+    This fixes #78.
+
+commit 8a8032478a755f6e2ceaebc5425e61c6817df936
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    Make use of name vs RC_SVCNAME consistent in supervisor scripts
+    
+    This fixes #79.
+
+commit ac53c9a658589456c678b6bfe674a66a3845e564
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    sh/init.sh: fix the test for cache restoration
+    
+    This fixes the test for cache restoration since we are no longer caching
+    the dependency tree.
+
+commit b02ff466fa75cc4b5bcfaff3f2989cc65c823f43
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    savecache: stop saving the dependency tree
+    
+    This fixes #85.
+
+commit 6bd0f2d096f149906061a4ac7b66b7e85516784a
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    init.d/procfs: typo fix
+
+commit 63f8ae466f046dcdbb0ba13ef96e63eeec86e6e6
+Author: frickler01 <frickler01@users.noreply.github.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    Format code blocks and variable/path notations
+    
+    Add markdown backticks for commands, variable names and path as well
+    as code blocks for better readability.
+    
+    This fixes #97.
+
+commit 841b883825ddf9982a673b3964757f6df25acd46
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    hwclock: fix module load warning
+
+commit ba10793b0b85b11fae04e6526716c6f7976afde1
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    init.d/procfs: fix binfmt_misc module load warning
+    
+    This reworks the logic so that the warning about configuring the
+    binfmt_misc module is only displayed if the module actually has to be
+    loaded.
+
+commit d4d559323819c8a5279bf197d8d3ff80f1e28cdc
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    sh/openrc-run.sh: read global configuration settings first
+    
+    X-Gentoo-Bug: 503134
+    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=503134
+
+commit d5db5489be135ae9295e378e789b4b7b13367fdd
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    init.d/swap: do not unmount all tmpfs file systems
+    
+    X-Gentoo-Bug: 568162
+    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=568162
+
+commit d06db93d5954460668d09cf6ef2fc401ee9d981c
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    remove swapfiles service
+    
+    The swapfiles service was basically a copy of the swap service, so this
+    commit consolidates the functionality into the swap service.
+    
+    X-Funtoo-Bug-URL: https://bugs.funtoo.org/browse/FL-2523
+    X-Gentoo-Bug: 568162
+    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=568162
+
+commit 8c14d0c476e06fff7598c526e26b6a13d53a4600
+Author: Martin Väth <martin@mvath.de>
+Commit: Martin Väth <martin@mvath.de>
+
+    Fix typo in RC_UNAME check of modules-load
+    
+    The $RC_UNAME "Linux" had been misspelled as "linux".
+    As a consequence, entries in e.g. /etc/modules-load.d failed to
+    load any module succesfully under Linux(!)
+
+commit 04debf6f25b3748a101b61cb85f78617dbe5be6e
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    another news typo fix
+
+commit c289774b00d0d7dc38fdc1f0f623569bd184a4b1
+Author: Doug Freed <dwfreed@mtu.edu>
+Commit: Doug Freed <dwfreed@mtu.edu>
+
+    modules-load: handle comments better
+    
+    This handles comments without a trailing space after the comment
+    character.
+    
+    Reported-By: josef64
+
+commit 9dd8ee330d8a4449c937bc95fc8393a55913c8d1
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    typo fix
+
+commit 5d5856c193768d24f11d5f0533e48c39526aef5c
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    Update news file
+    
+    Add information on modules-load service and more explanation about
+    dealing with the rc -> openrc and runscript -> openrc-run transitions.
+
+commit 686e172207ac9e23560da18a6f877be777ded935
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    init.d: add modules-load to ignore patterns
+
+commit fef6268f8d03e3ab3e2564cbf3634d0db2bcd99e
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    modules-load.d: cleanups
+    
+    Move list of directories to a local variable and create the fn variable
+    to use for an individual file name rather than using path.
+
+commit 556dbff99d53cdcc00e6b1ec67e1679f72b6f284
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    Add modules-load.d support
+
+commit 69ac78d76a31d843c004717eb6aa6a77bb4c9a8e
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    openrc-run: make runscript warning respect quiet option
+    
+    X-Gentoo-Bug: 591414
+    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=591414
+
+commit 4018dfc8de4818101c336ff8bcf0f4762b318c6a
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    init.d/hostname: do not use localhost as a default hostname
+    
+    This allows the operating system default hostname to be used if no
+    hostname is configured.
+
+commit 353bb9bc9a0ab3c6650d72d2ceb14c990762a2a0
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    init.d/hostname: add support for /etc/hostname
+
+commit 73cdf10f1f513be7b5dec4f1cc91e0c68cda689b
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    Deprecate automatic loading of modules
+    
+    In the hwclock, procfs and sysfs service scripts, we automatically
+    attempt to load the kernel modules we need before we take any action. We
+    shouldn't do this, because there are systems which do not use kernel
+    modules and do not have the kmod package installed.
+    
+    With this change, we continue to load the modules ourselves, but we warn
+    the admin that they need to be added to /etc/conf.d/modules or built
+    into the kernel.
+    
+    In the future, this automatic loading will be dropped.
+    
+    X-Gentoo-Bug: 342313
+    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=342313
+
+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>
 
@@ -10,19 +604,16 @@ Commit: William Hubbs <w.d.hubbs@gmail.com>
     X-Gentoo-Bug: 584722
     X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=584722
 
-commit 8b9ea8b9e6631d5cd987a7cb31560aa5a13c060b
-Author: William Hubbs <w.d.hubbs@gmail.com>
+commit 553799400218903ab495d1154a41c6d8890cb752
+Author: Mike Gilbert <floppym@gentoo.org>
 Commit: William Hubbs <w.d.hubbs@gmail.com>
 
-    version 0.21.2
+    man: Document the procname variable for openrc-run
+    
+    X-Gentoo-Bug: 586794
+    X-Gentoo-Bug-URL: https://bugs.gentoo.org/586794
 
-commit c47b497483040107263c9b9984474db5c569485b
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    update changelog
-
-commit 977811563dd93cab7a64caefa0e86f5b864fc04f
+commit 5af5d12f3e56f9f2ff232d124d27c856fd66f551
 Author: Benda Xu <heroxbd@gentoo.org>
 Commit: William Hubbs <w.d.hubbs@gmail.com>
 
@@ -35,7 +626,7 @@ Commit: William Hubbs <w.d.hubbs@gmail.com>
     X-Gentoo-Bug:583634
     X-Gentoo-Bug-URL:https://bugs.gentoo.org/show_bug.cgi?id=583634
 
-commit 47aa0b93cdf14253c3a75b4feefabe97c43cbf8a
+commit b2c92b88cc6ce6d81444667efbc6d44542db1788
 Author: William Hubbs <w.d.hubbs@gmail.com>
 Commit: William Hubbs <w.d.hubbs@gmail.com>
 
@@ -49,11 +640,11 @@ Commit: William Hubbs <w.d.hubbs@gmail.com>
     X-Gentoo-Bug: 478226
     X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=478226
 
-commit f680c89c26709164934ee72534af7a3960166cf3
+commit 1b32af17225a4b18ced7f4326727cbe8265e7fd2
 Author: William Hubbs <w.d.hubbs@gmail.com>
 Commit: William Hubbs <w.d.hubbs@gmail.com>
 
-    version 0.21.1
+    increment version to 0.22
 
 commit 5bfb7d6c77ff533e34e2bbfe5b6e57410d961d70
 Author: William Hubbs <w.d.hubbs@gmail.com>
@@ -981,110 +1572,3 @@ Commit: William Hubbs <w.d.hubbs@gmail.com>
     
     This reverts commit 2a439c85bd69efc14847b4397bd6783cac051405.
     There is another use case for -O involving iscsi, so we can't remove it.
-
-commit 3b6a6df4b5b818e576a88444632d5c73cffd1c57
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    openrc-run: rename some dependency variables and a function for clarity
-    
-    All of the dependency type lists had the types_ prefix in their names;
-    this has been changed to deptypes_ to make them more self documenting.
-    
-    Along the same lines, the setup_types function was renamed
-    setup_deptypes.
-
-commit b047ea47e97d7e8b96d6d0e064613f6860c8eb36
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    localmount/netmount: on Linux, fail if some file systems do not mount
-    
-    The following return codes are returned by mount -a:
-    
-    0:  all file systems mounted.
-    32: no file systems mounted.
-    64: some file systems mounted.
-    
-    The localmount/netmount services should fail if all file systems that
-    should mount did not mount.
-
-commit b652752339690e10a55ae50d046f4cf2a98daf1a
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    Make localmount and netmount always succeed on non-linux
-
-commit 2a439c85bd69efc14847b4397bd6783cac051405
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    local/netmount: remove uses of -O [no]_netdev
-    
-    This was causing an incompatibility with busybox, and we do not use it
-    in Gentoo.
-
-commit 7341cd882fba522c1f1d183603334839bd4df7fc
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    allow localmount and netmount to fail
-
-commit 279f1e5d1013309d99509ab4b7b57521f8a4aba4
-Author: Mike Frysinger <vapier@gentoo.org>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    binfmt: fix indent on return
-
-commit c256a7aa80c683eca6194c80b57294e4d51c9a16
-Author: Doug Freed <dwfreed@mtu.edu>
-Commit: Doug Freed <dwfreed@mtu.edu>
-
-    savecache: clean up implementation
-    
-    X-Gentoo-Bug: 557222
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=557222
-
-commit 6a422982579786cb8308af04ccca6622afa06e50
-Author: Jason Zaman <jason@perfinion.com>
-Commit: Doug Freed <dwfreed@mtu.edu>
-
-    tmpfiles: run restorecon on the entire path
-    
-    The tmpfiles "d" entry will create a full path and only the last dir in
-    the path will have its SELinux label set correctly. This patch will
-    restorecon the parents as well so that the selinux labels are correct.
-    
-    eg, "d /run/libvirt/lxc", then "lxc" would have the correct SELinux
-    label but "libvirt" would not.
-    
-    Signed-off-by: Jason Zaman <jason@perfinion.com>
-
-commit f69833a1e17d1cf65e96a34fcc0e48caf9d90d64
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    mountinfo: fix -e and -E options
-    
-    Add the -e and -E options to getoptstring so they are recognized.
-
-commit eeadca0b8a5b87c26e60a58563251604350a7a3b
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    Add EERROR_QUIET and EINFO_QUIET to environment whitelist
-
-commit dde339070b4850dc1fadf4992cc01d3468992106
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    Increment version
-
-commit 1736be3bc3ebbc1440f87b49fc353e81fb0a6037
-Author: Doug Freed <dwfreed@mtu.edu>
-Commit: Doug Freed <dwfreed@mtu.edu>
-
-    savecache: Fix unable to create cache message
-    
-    The cache is created in $RC_LIBEXECDIR, not $RC_SVCDIR, so fix the error
-    message when we fail to create it to match.

Makefile.inc

@@ -1,3 +1,3 @@
 NAME=		openrc
-VERSION=	0.21.2
+VERSION=	0.22.1
 PKG=		${NAME}-${VERSION}

NEWS.md

@@ -3,6 +3,19 @@
 This file will contain a list of notable changes for each release. Note
 the information in this file is in reverse order.
 
+## OpenRC-0.22
+
+In previous versions of OpenRC, configuration information was processed
+so that service-specific configuration stored in /etc/conf.d/* was
+overridden by global configuration stored in /etc/rc.conf. This release
+reverses that. Global configuration is now overridden by
+service-specific configuration.
+
+The swapfiles service, which was basically a copy of the swap service,
+has been removed. If you are only using swap partitions, this change
+will not affect you. If you are using swap files, please adjust the
+dependencies of the swap service as shown in /etc/conf.d/swap.
+
 ## OpenRC-0.21
 
 This version adds a daemon supervisor which can start daemons and
@@ -17,6 +30,19 @@ these files for the setup.
 The deprecation messages in 0.13.x for runscript and rc are now
 made visible in preparation for the removal of these binaries in 1.0.
 
+The steps you should take to get rid of these warnings is to run openrc
+in initialization steps instead of rc and change the shebang lines in
+service scripts to refer to "openrc-run" instead of "runscript".
+
+In 0.21.4, a modules-load service was added. This works like the
+equivalent service in systemd. It looks for files named *.conf first in
+/usr/lib/modules-load.d, then /run/modules-load.d, then
+/etc/modules-load.d. These files contain a list of modules, one per
+line, which should be loaded into the kernel. If a file name appears in
+/run/modules-load.d, it overrides a file of the same name in
+/usr/lib/modules-load.d. A file appearing in /etc/modules-load.d
+overrides a file of the same name in both previous directories.
+
 ## OpenRC-0.19
 
 This version adds a net-online service. By default, this

README.md

@@ -43,9 +43,6 @@ We don't support building a static OpenRC with PAM.
 
 You may need to use `PROGLDFLAGS=-Wl,-Bstatic` on glibc instead of just `-static`.
 
-If you debug memory under valgrind, add `-DDEBUG_MEMORY`
-to your `CPPFLAGS` so that all malloc memory should be freed at exit.
-
 If you are building OpenRC for a Gentoo Prefix installation, add `MKPREFIX=yes`.
 
 `PKG_PREFIX` should be set to where packages install to by default.

conf.d/.gitignore

@@ -1,2 +0,0 @@
-network
-staticroute

conf.d/Makefile

@@ -1,19 +1,17 @@
 include ../mk/net.mk
 
 DIR=	${CONFDIR}
-CONF=	bootmisc fsck hostname localmount netmount urandom tmpfiles \
+CONF=	bootmisc fsck hostname localmount netmount swap urandom tmpfiles \
 		${CONF-${OS}}
 
 ifeq (${MKNET},yes)
 CONF+= network staticroute
-TARGETS+=	network staticroute
-CLEANFILES+=	network staticroute
 endif
 
 MK=	../mk
 include ${MK}/os.mk
 
-CONF-FreeBSD=	ipfw moused powerd rarpd savecore syscons
+CONF-FreeBSD=	ipfw modules moused powerd rarpd savecore syscons
 
 CONF-Linux=	consolefont devfs dmesg hwclock keymaps killprocs modules mtab \
 	net-online
@@ -21,9 +19,3 @@ CONF-Linux=	consolefont devfs dmesg hwclock keymaps killprocs modules mtab \
 CONF-NetBSD=	moused rarpd savecore
 
 include ${MK}/scripts.mk
-
-network: network.in network${SFX}
-	cat $^ > $@
-
-staticroute: staticroute${SFX}
-	cp $@${SFX} $@

conf.d/modules

@@ -1,18 +1,22 @@
-# You can define a list modules for a specific kernel version,
-# a released kernel version, a main kernel version or just a list.
+# Linux users can define a list of modules for a specific kernel version,
+# a released kernel version, a main kernel version or all kernel versions.
 # The most specific versioned variable will take precedence.
+# FreeBSD users can only use the modules="foo bar" setting.
 #modules_2_6_23_gentoo_r5="ieee1394 ohci1394"
 #modules_2_6_23="tun ieee1394"
 #modules_2_6="tun"
 #modules_2="ipv6"
 #modules="ohci1394"
 
-# You can give modules a different name when they load - the new name
+# Linux users can give modules a different name when they load - the new name
 # will also be used to pick arguments below.
+# This is not supported on FreeBSD.
 #modules="dummy:dummy1"
 
-# Give the modules some arguments if needed, per version if necessary.
+# Linux users can give the modules some arguments if needed, per version
+# if necessary.
 # Again, the most specific versioned variable will take precedence.
+# This is not supported on FreeBSD.
 #module_ieee1394_args="debug"
 #module_ieee1394_args_2_6_23_gentoo_r5="debug2"
 #module_ieee1394_args_2_6_23="debug3"

conf.d/network

@@ -0,0 +1,80 @@
+# Assign static IP addresses and run custom scripts per interface.
+# Seperate commands with ;
+# Prefix with ! to run a shell script.
+# Use \$int to represent the interface
+#ifconfig_eth0="192.168.0.10 netmask 255.255.255.0"
+
+# You also have ifup_eth0 and ifdown_eth0 to run other commands when
+# eth0 is started and stopped.
+# You should note that we don't stop the network at system shutdown by default.
+# If you really need this, then set keep_network=NO
+
+# Lastly, the interfaces variable pulls in virtual interfaces that cannot
+# be automatically detected.
+#interfaces="br0 bond0 vlan0"
+
+# You can also use files instead of variables here if you like:
+# /etc/ifconfig.eth0 is equivalent to ifconfig_eth0
+# /etc/ip.eth0 is equivalent to ifconfig_eth0
+# /etc/ifup.eth0 is equivalent to ifup_eth0
+# /etc/ifdown.eth0 is equivalent to ifdown_eth0
+# Any files found will automatically be put into the interfaces variable.
+# You don't need to escape variables in files, so use $int instead of \$int.
+
+# If you require DHCP, you should install dhcpcd and add it to the boot or
+# default runlevel.
+
+# NIS users can set the domain name here
+#domainname="foobar"
+
+# You can add a default route.
+# The way this is done is slightly different depending on the operating system.
+#
+# *BSD:
+#defaultroute="192.168.0.1"
+#defaultroute6="2001:a:b:c"
+#Hurd/Linux (ifconfig):
+#defaultroute="gw 192.168.0.1"
+#defaultroute6="gw 2001:a:b:c"
+
+# The remainder of this file applies to Linux only and shows how
+# iproute2 is supported along with other examples.
+
+# ifconfig under Linux is not that powerful and doesn't easily handle
+# multiple addresses
+# On the other hand, iproute2 is quite powerful and is also supported
+#ip_eth0="192.168.0.10/24; 192.168.10.10/24"
+
+# You can also use iproute2 to add the default route.
+#defaultiproute="via 192.168.0.1"
+#defaultiproute6="via 2001:a:b:c"
+
+# ip doesn't handle MTU like ifconfig, but we can do it like so
+#ifup_eth0="ip link set \$int mtu 1500"
+
+# Create a bonded interface
+#interfaces="bond0"
+#ifup_bond0="modprobe bonding; ifconfig \$int up; ifenslave \$int bge0"
+#ifconfig_bond0="192.168.0.10 netmask 255.255.255.0"
+#ifdown_bond0="rmmod bonding"
+
+# Create tap interface and a bridge interface.
+# We add the tap to the bridge.
+# An external program, like dhcpcd, will configure the IP on the bridge
+#interfaces="tun0 br0"
+#ifup_tun0="tunctl -t \$int"
+#ifdown_tun0="tunctl -d \$int"
+#ifup_br0="brctl addbr \$int; brctl add \$int eth1; brtctl add \$int eth2"
+#ifdown_br0="ifconfig \$int down; btctl delbr \$int"
+
+# Create VLAN
+#interfaces="eth0_2 eth0_3 eth0_4"
+#ifup_eth0="vconfig add \$int 2; vconfig add \$int 3; vconfig add \$int 4"
+#ifconfig_eth0_2="192.168.2.10 netmask 255.255.255.0"
+#ifconfig_eth0_3="192.168.3.10 netmask 255.255.255.0"
+#ifconfig_eth0_4="192.168.4.10 netmask 255.255.255.0"
+#ifdown_eth0="vconfig rem \$int.2; vconfig rem \$int.3; vconfig rem \$int.4"
+
+# Normally you would use wpa_supplicant to configure wireless, but you can
+# use iwconfig also
+#ifup_wlan0="iwconfig \$int key s:secretkey enc open essid foobar"

conf.d/network.BSD.in

@@ -1,4 +0,0 @@
-
-# You can assign a default route
-#defaultroute="192.168.0.1"
-#defaultroute6="2001:a:b:c"

conf.d/network.GNU-kFreeBSD.in

@@ -1,4 +0,0 @@
-
-# You can assign a default route
-#defaultroute="192.168.0.1"
-#defaultroute6="2001:a:b:c"

conf.d/network.GNU.in

@@ -1,4 +0,0 @@
-
-# You can assign a default route
-#defaultroute="gw 192.168.0.1"
-#defaultroute6="gw 2001:a:b:c"

conf.d/network.Linux.in

@@ -1,43 +0,0 @@
-
-# You can assign a default route
-#defaultroute="gw 192.168.0.1"
-#defaultroute6="gw 2001:a:b:c"
-
-# ifconfig under Linux is not that powerful and doesn't easily handle
-# multiple addresses
-# On the other hand, ip (iproute2) is quite powerful and is also supported
-#ip_eth0="192.168.0.10/24; 192.168.10.10/24"
-
-# You can also use ip to add the default route.
-#defaultiproute="via 192.168.0.1"
-#defaultiproute6="via 2001:a:b:c"
-
-# ip doesn't handle MTU like ifconfig, but we can do it like so
-#ifup_eth0="ip link set \$int mtu 1500"
-
-# Create a bonded interface
-#interfaces="bond0"
-#ifup_bond0="modprobe bonding; ifconfig \$int up; ifenslave \$int bge0"
-#ifconfig_bond0="192.168.0.10 netmask 255.255.255.0"
-#ifdown_bond0="rmmod bonding"
-
-# Create tap interface and a bridge interface.
-# We add the tap to the bridge.
-# An external program, like dhcpcd, will configure the IP on the bridge
-#interfaces="tun0 br0"
-#ifup_tun0="tunctl -t \$int"
-#ifdown_tun0="tunctl -d \$int"
-#ifup_br0="brctl addbr \$int; brctl add \$int eth1; brtctl add \$int eth2"
-#ifdown_br0="ifconfig \$int down; btctl delbr \$int"
-
-# Create VLAN
-#interfaces="eth0_2 eth0_3 eth0_4"
-#ifup_eth0="vconfig add \$int 2; vconfig add \$int 3; vconfig add \$int 4"
-#ifconfig_eth0_2="192.168.2.10 netmask 255.255.255.0"
-#ifconfig_eth0_3="192.168.3.10 netmask 255.255.255.0"
-#ifconfig_eth0_4="192.168.4.10 netmask 255.255.255.0"
-#ifdown_eth0="vconfig rem \$int.2; vconfig rem \$int.3; vconfig rem \$int.4"
-
-# Normally you would use wpa_supplicant to configure wireless, but you can
-# use iwconfig also
-#ifup_wlan0="iwconfig \$int key s:secretkey enc open essid foobar"

conf.d/network.in

@@ -1,28 +0,0 @@
-# Assign static IP addresses and run custom scripts per interface.
-# Seperate commands with ;
-# Prefix with ! to run a shell script.
-# Use \$int to represent the interface
-#ifconfig_eth0="192.168.0.10 netmask 255.255.255.0"
-
-# You also have ifup_eth0 and ifdown_eth0 to run other commands when
-# eth0 is started and stopped.
-# You should note that we don't stop the network at system shutdown by default.
-# If you really need this, then set keep_network=NO
-
-# Lastly, the interfaces variable pulls in virtual interfaces that cannot
-# be automatically detected.
-#interfaces="br0 bond0 vlan0"
-
-# You can also use files instead of variables here if you like:
-# /etc/ifconfig.eth0 is equivalent to ifconfig_eth0
-# /etc/ip.eth0 is equivalent to ifconfig_eth0
-# /etc/ifup.eth0 is equivalent to ifup_eth0
-# /etc/ifdown.eth0 is equivalent to ifdown_eth0
-# Any files found will automatically be put into the interfaces variable.
-# You don't need to escape variables in files, so use $int instead of \$int.
-
-# If you require DHCP, you should install dhcpcd and it to the boot or
-# default runlevel.
-
-# NIS users can set the domain name here
-#domainname="foobar"

conf.d/staticroute

@@ -0,0 +1,26 @@
+# Static routes are defined differently depending on your operating
+# system, so please be sure to use the correct syntax.
+# Do not use this file to define the default route.
+# In all settings, multiple routes should be separated using ; or new lines.
+
+# Define static routes on Linux using route. See route(8) for syntax.
+#staticroute="net 192.168.0.0 netmask 255.255.255.0 gw 10.73.1.1
+#net 192.168.1.0 netmask 255.255.255.0 gw 10.73.1.1"
+
+# Define static routes on Linux using iproute2. See ip(8) for syntax.
+#staticiproute="192.168.0.0/24 via 10.73.1.1; 192.168.1.0/24 via 10.73.1.1"
+
+# Define static routes on GNU/Hurd. See route(8) for syntax.
+# /etc/route.conf(5) takes precedence over this configuration.
+# FIXME: "net ..." not supported
+#staticroute="net 192.168.0.0 -netmask 255.255.255.0 --address 10.73.1.1
+#net 192.168.1.0 -netmask 255.255.255.0 --address 10.73.1.1"
+
+# Define static routes on GNU/KFreeBSD. See route(8) for syntax.
+#staticroute="net 192.168.0.0 10.73.1.1 netmask 255.255.255.0
+#net 192.168.1.0 10.73.1.1 netmask 255.255.255.0"
+
+# Define static routes on other BSD systems. See route(8) for syntax.
+# /etc/route.conf(5) takes precedence over this configuration.
+#staticroute="net 192.168.0.0 -netmask 255.255.255.0 10.73.1.1
+#net 192.168.1.0 -netmask 255.255.255.0 10.73.1.1"

conf.d/staticroute.BSD.in

@@ -1,6 +0,0 @@
-# Separate multiple routes using ; or new lines.
-# /etc/route.conf(5) takes precedence over this configuration.
-
-# Example static routes. See route(8) for syntax.
-#staticroute="net 192.168.0.0 -netmask 255.255.255.0 10.73.1.1
-#net 192.168.1.0 -netmask 255.255.255.0 10.73.1.1"

conf.d/staticroute.GNU-kFreeBSD.in

@@ -1,5 +0,0 @@
-# Separate multiple routes using ; or new lines.
-
-# Example static routes. See route(8) for syntax.
-#staticroute="net 192.168.0.0 10.73.1.1 netmask 255.255.255.0
-#net 192.168.1.0 10.73.1.1 netmask 255.255.255.0"

conf.d/staticroute.GNU.in

@@ -1,7 +0,0 @@
-# Separate multiple routes using ; or new lines.
-# /etc/route.conf(5) takes precedence over this configuration.
-
-# Example static routes. See route(8) for syntax.
-# FIXME: "net ..." not supported
-#staticroute="net 192.168.0.0 -netmask 255.255.255.0 --address 10.73.1.1
-#net 192.168.1.0 -netmask 255.255.255.0 --address 10.73.1.1"

conf.d/staticroute.Linux.in

@@ -1,8 +0,0 @@
-# Separate multiple routes using ; or new lines.
-
-# Example static routes. See route(8) for syntax.
-#staticroute="net 192.168.0.0 netmask 255.255.255.0 gw 10.73.1.1
-#net 192.168.1.0 netmask 255.255.255.0 gw 10.73.1.1"
-
-# Example static routes using iproute2. See ip(8) for syntax.
-#staticiproute="192.168.0.0/24 via 10.73.1.1; 192.168.1.0/24 via 10.73.1.1"

conf.d/swap

@@ -0,0 +1,13 @@
+# If you are only using local swap partitions, you should not change
+# this file. Otherwise, you need to uncomment the below rc_before line
+# followed by the appropriate rc_need line.
+#rc_before="!localmount"
+#
+# If you are using swap files stored on local file systems, uncomment
+# this line.
+#rc_need="localmount"
+#
+# If you are using swap files stored on network file systems or swap
+# partitions stored on network block devices such as iSCSI, uncomment
+# this line.
+#rc_need="netmount"

etc/.gitignore

@@ -1,3 +1,2 @@
-rc.conf
 rc
 rc.shutdown

etc/Makefile

@@ -1,10 +1,8 @@
 DIR=	${SYSCONFDIR}
-SRCS=	rc.conf.in rc.in rc.shutdown.in
+SRCS=	rc.in rc.shutdown.in
 BIN=	${BIN-${OS}}
 CONF=	rc.conf ${BIN-${OS}}
 
-CLEANFILES+=	rc.conf
-
 MK=	../mk
 include ${MK}/os.mk
 
@@ -23,6 +21,3 @@ CONF-NetBSD=
 SED_EXTRA=	${SED_EXTRA-${OS}}
 
 include ${MK}/scripts.mk
-
-rc.conf: rc.conf.in rc.conf.${OS}
-	${SED} ${SED_REPLACE} ${SED_EXTRA} $^ > $@

etc/rc.conf

@@ -117,6 +117,9 @@
 # Some daemons are started and stopped via start-stop-daemon.
 # We can set some things on a per service basis, like the nicelevel.
 #SSD_NICELEVEL="-19"
+# Or the ionice level. The format is class[:data] , just like the
+# --ionice start-stop-daemon parameter.
+#SSD_IONICELEVEL="2:2"
 
 # Pass ulimit parameters
 # If you are using bash in POSIX mode for your shell, note that the
@@ -146,6 +149,102 @@
 #rc_foo_bar_after="clock"
 
 # You can also remove dependencies.
-# This is mainly used for saying which servies do NOT provide net.
+# This is mainly used for saying which services do NOT provide net.
 #rc_net_tap0_provide="!net"
 
+# This is the subsystem type.
+# It is used to match against keywords set by the keyword call in the
+# depend function of service scripts.
+#
+# It should be set to the value representing the environment this file is
+# PRESENTLY in, not the virtualization the environment is capable of.
+# If it is commented out, automatic detection will be used.
+#
+# The list below shows all possible settings as well as the host
+# operating systems where they can be used and autodetected.
+#
+# ""               - nothing special
+# "docker"         - Docker container manager (Linux)
+# "jail"           - Jail (DragonflyBSD or FreeBSD)
+# "lxc"            - Linux Containers
+# "openvz"         - Linux OpenVZ
+# "prefix"         - Prefix
+# "rkt"            - CoreOS container management system (Linux)
+# "subhurd"        - Hurd subhurds (to be checked)
+# "systemd-nspawn" - Container created by systemd-nspawn (Linux)
+# "uml"            - Usermode Linux
+# "vserver"        - Linux vserver
+# "xen0"           - Xen0 Domain (Linux and NetBSD)
+# "xenU"           - XenU Domain (Linux and NetBSD)
+#rc_sys=""
+
+# on Linux and Hurd, this is the number of ttys allocated for logins
+# It is used in the consolefont, keymaps, numlock and termencoding
+# service scripts.
+rc_tty_number=12
+
+##############################################################################
+# LINUX CGROUPS RESOURCE MANAGEMENT
+
+# If you have cgroups turned on in your kernel, this switch controls
+# whether or not a group for each controller is mounted under
+# /sys/fs/cgroup.
+# None of the other options in this section work if this is set to "NO".
+#rc_controller_cgroups="YES"
+
+# The following settings allow you to set up values for the cgroup
+# controllers for your services.
+# They can be set in this file;, however, if you do this, the settings
+# will apply to all of your services.
+# If you want different settings for each service, place the settings in
+# /etc/conf.d/foo for service foo.
+# The format is to specify the names of the settings followed by their
+# values. Each variable can hold multiple settings.
+# For example, you would use this to set the cpu.shares setting in the
+# cpu controller to 512 for your service.
+# rc_cgroup_cpu="
+# cpu.shares 512
+# "
+#
+#For more information about the adjustments that can be made with
+#cgroups, see Documentation/cgroups/* in the linux kernel source tree.
+
+# Set the blkio controller settings for this service.
+#rc_cgroup_blkio=""
+
+# Set the cpu controller settings for this service.
+#rc_cgroup_cpu=""
+
+# Add this service to the cpuacct controller (any value means yes).
+#rc_cgroup_cpuacct=""
+
+# Set the cpuset controller settings for this service.
+#rc_cgroup_cpuset=""
+
+# Set the devices controller settings for this service.
+#rc_cgroup_devices=""
+
+# Set the hugetlb controller settings for this service.
+#rc_cgroup_hugetlb=""
+
+# Set the memory controller settings for this service.
+#rc_cgroup_memory=""
+
+# Set the net_cls controller settings for this service.
+#rc_cgroup_net_cls=""
+
+# Set the net_prio controller settings for this service.
+#rc_cgroup_net_prio=""
+
+# Set the pids controller settings for this service.
+#rc_cgroup_pids=""
+
+# Set this to YES if you want all of the processes in a service's cgroup
+# killed when the service is stopped or restarted.
+# This should not be set globally because it kills all of the service's
+# child processes, and most of the time this is undesirable. Please set
+# it in /etc/conf.d/<service>.
+# To perform this cleanup manually for a stopped service, you can
+# execute cgroup_cleanup with /etc/init.d/<service> cgroup_cleanup or
+# rc-service <service> cgroup_cleanup.
+# rc_cgroup_cleanup="NO"

etc/rc.conf.DragonFly

@@ -1,13 +0,0 @@
-##############################################################################
-# DragonFly BSD SPECIFIC OPTIONS
-
-# This is the subsystem type. Valid options on DragonFly BSD:
-# ""        - nothing special
-# "jail"    - DragonFly BSD jails
-# "prefix"  - Prefix
-# If this is commented out, automatic detection will be used.
-#
-# This should be set to the value representing the environment this file is
-# PRESENTLY in, not the virtualization the environment is capable of.
-#rc_sys=""
-

etc/rc.conf.FreeBSD

@@ -1,13 +0,0 @@
-##############################################################################
-# FreeBSD SPECIFIC OPTIONS
-
-# This is the subsystem type. Valid options on FreeBSD:
-# ""        - nothing special
-# "jail"    - FreeBSD jails
-# "prefix"  - Prefix
-# If this is commented out, automatic detection will be used.
-#
-# This should be set to the value representing the environment this file is
-# PRESENTLY in, not the virtualization the environment is capable of.
-#rc_sys=""
-

etc/rc.conf.GNU

@@ -1,14 +0,0 @@
-##############################################################################
-# GNU/Hurd SPECIFIC OPTIONS
-
-# This is the subsystem type. Valid options on GNU/Hurd:
-# ""        - nothing special
-# "subhurd" - Hurd subhurds (to be checked)
-# If this is commented out, automatic detection will be used.
-#
-# This should be set to the value representing the environment this file is
-# PRESENTLY in, not the virtualization the environment is capable of.
-#rc_sys=""
-# This is the number of tty's used in most of the rc-scripts (like
-# consolefont, numlock, etc ...)
-#rc_tty_number=6?

etc/rc.conf.GNU-kFreeBSD

@@ -1,11 +0,0 @@
-##############################################################################
-# GNU/kFreeBSD SPECIFIC OPTIONS
-
-# This is the subsystem type. Valid options on GNU/kFreeBSD:
-# ""        - nothing special
-# "jail"    - FreeBSD jails (not yet implemented)
-# If this is commented out, automatic detection will be used.
-#
-# This should be set to the value representing the environment this file is
-# PRESENTLY in, not the virtualization the environment is capable of.
-#rc_sys=""

etc/rc.conf.Linux

@@ -1,90 +0,0 @@
-##############################################################################
-# LINUX SPECIFIC OPTIONS
-
-# This is the subsystem type. Valid options on Linux:
-# ""               - nothing special
-# "docker"         - Docker container manager
-# "lxc"            - Linux Containers
-# "openvz"         - Linux OpenVZ
-# "prefix"         - Prefix
-# "rkt"            - CoreOS container management system
-# "uml"            - Usermode Linux
-# "vserver"        - Linux vserver
-# "systemd-nspawn" - Container created by the systemd-nspawn utility
-# "xen0"           - Xen0 Domain
-# "xenU"           - XenU Domain
-# If this is commented out, automatic detection will be used.
-#
-# This should be set to the value representing the environment this file is
-# PRESENTLY in, not the virtualization the environment is capable of.
-#rc_sys=""
-
-# This is the number of tty's used in most of the rc-scripts (like
-# consolefont, numlock, etc ...)
-rc_tty_number=12
-
-##############################################################################
-# CGROUPS RESOURCE MANAGEMENT
-
-# If you have cgroups turned on in your kernel, this switch controls
-# whether or not a group for each controller is mounted under
-# /sys/fs/cgroup.
-# None of the other options in this section work if this is set to "NO".
-#rc_controller_cgroups="YES"
-
-# The following settings allow you to set up values for the cgroup
-# controllers for your services.
-# They can be set in this file;, however, if you do this, the settings
-# will apply to all of your services.
-# If you want different settings for each service, place the settings in
-# /etc/conf.d/foo for service foo.
-# The format is to specify the names of the settings followed by their
-# values. Each variable can hold multiple settings.
-# For example, you would use this to set the cpu.shares setting in the
-# cpu controller to 512 for your service.
-# rc_cgroup_cpu="
-# cpu.shares 512
-# "
-#
-#For more information about the adjustments that can be made with
-#cgroups, see Documentation/cgroups/* in the linux kernel source tree.
-
-# Set the blkio controller settings for this service.
-#rc_cgroup_blkio=""
-
-# Set the cpu controller settings for this service.
-#rc_cgroup_cpu=""
-
-# Add this service to the cpuacct controller (any value means yes).
-#rc_cgroup_cpuacct=""
-
-# Set the cpuset controller settings for this service.
-#rc_cgroup_cpuset=""
-
-# Set the devices controller settings for this service.
-#rc_cgroup_devices=""
-
-# Set the hugetlb controller settings for this service.
-#rc_cgroup_hugetlb=""
-
-# Set the memory controller settings for this service.
-#rc_cgroup_memory=""
-
-# Set the net_cls controller settings for this service.
-#rc_cgroup_net_cls=""
-
-# Set the net_prio controller settings for this service.
-#rc_cgroup_net_prio=""
-
-# Set the pids controller settings for this service.
-#rc_cgroup_pids=""
-
-# Set this to YES if yu want all of the processes in a service's cgroup
-# killed when the service is stopped or restarted.
-# This should not be set globally because it kills all of the service's
-# child processes, and most of the time this is undesirable. Please set
-# it in /etc/conf.d/<service>.
-# To perform this cleanup manually for a stopped service, you can
-# execute cgroup_cleanup with /etc/init.d/<service> cgroup_cleanup or
-# rc-service <service> cgroup_cleanup.
-# rc_cgroup_cleanup="NO"

etc/rc.conf.NetBSD

@@ -1,14 +0,0 @@
-##############################################################################
-# NetBSD SPECIFIC OPTIONS
-
-# This is the subsystem type. Valid options on NetBSD:
-# ""        - nothing special
-# "prefix"  - Prefix
-# "xen0"    - Xen0 Domain
-# "xenU"    - XenU Domain
-# If this is commented out, automatic detection will be used.
-#
-# This should be set to the value representing the environment this file is
-# PRESENTLY in, not the virtualization the environment is capable of.
-#rc_sys=""
-

guide.md

@@ -16,14 +16,14 @@ Current size is about 10k LoC C, and about 4k LoC shell.
 OpenRC is known to work on Linux, many BSDs (FreeBSD, OpenBSD, DragonFlyBSD at 
 least) and HURD.
 
-Services are stateful (i.e. start; start will lead to "it's already started")
+Services are stateful (i.e. `start`; `start` will lead to "it's already started")
 
 # Startup
 
-Usually PID1 (aka. init) calls the OpenRC binary ("/sbin/openrc" by default).
+Usually PID1 (aka. `init`) calls the OpenRC binary (`/sbin/openrc` by default).
 (The default setup assumes sysvinit for this)
 
-openrc scans the runlevels (default: "/etc/runlevels") and builds a dependency 
+openrc scans the runlevels (default: `/etc/runlevels`) and builds a dependency
 graph, then starts the needed service scripts, either serialized (default) or in 
 parallel.
 
@@ -32,29 +32,29 @@ daemon. (Integration with tools like monit, runit or s6 can be done)
 
 # Shutdown
 
-On change to runlevel 0/6 or running "reboot", "halt" etc., openrc stops all 
-services that are started and runs the services in the "shutdown" runlevel.
+On change to runlevel 0/6 or running `reboot`, `halt` etc., openrc stops all
+services that are started and runs the services in the `shutdown` runlevel.
 
 # Modifying Service Scripts
 
 Any service can, at any time, be started/stopped/restarted by executing 
-"rc-service someservice start", "rc-service someservice stop", etc.
+`rc-service someservice start`, `rc-service someservice stop`, etc.
 Another, less preferred method, is to run the service script directly,
-e.g. "/etc/init.d/service start", "/etc/init.d/service stop", etc.
+e.g. `/etc/init.d/service start`, `/etc/init.d/service stop`, etc.
 
 OpenRC will take care of dependencies, e.g starting apache will start network 
 first, and stopping network will stop apache first.
 
-There is a special command "zap" that makes OpenRC 'forget' that a service is 
+There is a special command `zap` that makes OpenRC 'forget' that a service is
 started; this is mostly useful to reset a crashed service to stopped state 
 without invoking the (possibly broken) stop function of the service script.
 
-Calling "openrc" without any arguments will try to reset all services so
+Calling `openrc` without any arguments will try to reset all services so
 that the current runlevel is satisfied; if you manually started apache it will be 
 stopped, and if squid died but is in the current runlevel it'll be restarted.
 
-There is a "service" helper that emulates the syntax seen on e.g. older Redhat 
-and Ubuntu ("service nginx start" etc.)
+There is a `service` helper that emulates the syntax seen on e.g. older Redhat
+and Ubuntu (`service nginx start` etc.)
 
 # Runlevels
 
@@ -65,100 +65,112 @@ own if needed. This allows, for example, to have a default runlevel with
 "everything" enabled, and a "powersaving" runlevel where some services are 
 disabled.
 
-The "rc-status" helper will print all currently active runlevels and the state 
+The `rc-status` helper will print all currently active runlevels and the state
 of init scripts in them:
 
+```
 # rc-status
  * Caching service dependencies ... [ ok ]
 Runlevel: default
  modules                     [  started  ]
  lvm                         [  started  ]
+```
 
-All runlevels are represented as folders in /etc/runlevels/ with symlinks to 
+All runlevels are represented as folders in `/etc/runlevels/` with symlinks to 
 the actual init scripts.
 
-Calling openrc with an argument ("openrc default") will switch to that
+Calling openrc with an argument (`openrc default`) will switch to that
 runlevel; this will start and stop services as needed.
 
-Managing runlevels is usually done through the "rc-update" helper, but could of 
+Managing runlevels is usually done through the `rc-update` helper, but could of 
 course be done by hand if desired.
-e.g. "rc-update add nginx default" - add nginx to the default runlevel
-Note: This will not auto-start nginx! You'd still have to trigger "rc" or run 
+e.g. `rc-update add nginx default` - add nginx to the default runlevel
+Note: This will not auto-start nginx! You'd still have to trigger `rc` or run 
 the initscript by hand.
 
 FIXME: Document stacked runlevels
 
-The default startup uses the runlevels "boot", "sysinit" and "default", in that 
-order. Shutdown uses the "shutdown" runlevel.
+The default startup uses the runlevels `boot`, `sysinit` and `default`, in that 
+order. Shutdown uses the `shutdown` runlevel.
 
 
 # Syntax of Service Scripts
 
 Service scripts are shell scripts. OpenRC aims at using only the standardized 
 POSIX sh subset for portability reasons. The default interpreter (build-time 
-toggle) is /bin/sh, so using for example mksh is not a problem.
+toggle) is `/bin/sh`, so using for example mksh is not a problem.
 
 OpenRC has been tested with busybox sh, ash, dash, bash, mksh, zsh and possibly 
 others. Using busybox sh has been difficult as it replaces commands with 
 builtins that don't offer the expected features.
 
-The interpreter for initscripts is #!/sbin/openrc-run
+The interpreter for initscripts is `#!/sbin/openrc-run`.
 Not using this interpreter will break the use of dependencies and is not 
-supported. (iow: if you insist on using #!/bin/sh you're on your own)
+supported. (iow: if you insist on using `#!/bin/sh` you're on your own)
 
-A "depend" function declares the dependencies of this service script.
+A `depend` function declares the dependencies of this service script.
 All scripts must have start/stop/status functions, but defaults are provided.
 Extra functions can be added easily:
 
+```
 extra_commands="checkconfig"
 checkconfig() {
 	doSomething
 }
+```
 
-This exports the checkconfig function so that "/etc/init.d/someservice 
-checkconfig" will be available, and it "just" runs this function.
+This exports the checkconfig function so that `/etc/init.d/someservice 
+checkconfig` will be available, and it "just" runs this function.
 
-While commands defined in extra_commands are always available, commands
-defined in extra_started_commands will only work when the service is started
-and those defined in extra_stopped_commands will only work when the service is
+While commands defined in `extra_commands` are always available, commands
+defined in `extra_started_commands` will only work when the service is started
+and those defined in `extra_stopped_commands` will only work when the service is
 stopped. This can be used for implementing graceful reload and similar
 behaviour.
 
 Adding a restart function will not work, this is a design decision within 
 OpenRC. Since there may be dependencies involved (e.g. network -> apache) a 
 restart function is in general not going to work. 
-restart is internally mapped to stop() + start() (plus handling dependencies).
+restart is internally mapped to `stop()` + `start()` (plus handling dependencies).
 If a service needs to behave differently when it is being restarted vs
-started or stopped, it should test the $RC_CMD variable, for example:
-
-    [ "$RC_CMD" = restart ] && do_something
+started or stopped, it should test the `$RC_CMD` variable, for example:
 
+```
+[ "$RC_CMD" = restart ] && do_something
+```
 
 # The Depend Function
 
 This function declares the dependencies for a service script. This
 determines the order the service scripts start.
 
+```
 depend() {
 	need net
 	use dns logger netmount
 	want coolservice
 }
+```
 
-"need" declares a hard dependency - net always needs to be started before this 
+`need` declares a hard dependency - net always needs to be started before this 
 	service does
-"use" is a soft dependency - if dns, logger or netmount is in this runlevel 
+
+`use` is a soft dependency - if dns, logger or netmount is in this runlevel 
 	start it before, but we don't care if it's not in this runlevel.
-	"want" is between need and use - try to start coolservice if it is
+	`want` is between need and use - try to start coolservice if it is
 	installed on the system, regardless of whether it is in the
 	runlevel, but we don't care if it starts.
-"before" declares that we need to be started before another service
-"after" declares that we need to be started after another service, without 
+
+`before` declares that we need to be started before another service
+
+`after` declares that we need to be started after another service, without 
 	creating a dependency (so on calling stop the two are independent)
-"provide" allows multiple implementations to provide one service type, e.g.:
-	'provide cron' is set in all cron-daemons, so any one of them started 
+
+`provide` allows multiple implementations to provide one service type, e.g.:
+	`provide cron` is set in all cron-daemons, so any one of them started 
 	satisfies a cron dependency
-"keyword" allows platform-specific overrides, e.g. "keyword -lxc" makes this 
+
+`keyword` allows platform-specific overrides, e.g. `keyword -lxc` makes this 
 	service script a noop in lxc containers. Useful for things like keymaps, 
 	module loading etc. that are either platform-specific or not available 
 	in containers/virtualization/...
@@ -169,31 +181,36 @@ FIXME: Anything missing in this list?
 
 All service scripts are assumed to have the following functions:
 
+```
 start()
 stop()
 status()
+```
 
-There are default implementations in rc/sh/openrc-run.sh - this allows very 
+There are default implementations in `lib/rc/sh/openrc-run.sh` - this allows very 
 compact service scripts. These functions can be overridden per service script as 
 needed.
 
 The default functions assume the following variables to be set in the service 
 script:
 
+```
 command=
 command_args=
 pidfile=
+``
 
 Thus the 'smallest' service scripts can be half a dozen lines long
 
-# The Magic of Conf.d
+# The Magic of `conf.d`
 
 Most service scripts need default values. It would be fragile to
-explicitly source some arbitrary files. By convention openrc-run will source
-the matching file in /etc/conf.d/ for any script in /etc/init.d/
+explicitly source some arbitrary files. By convention `openrc-run` will source
+the matching file in `/etc/conf.d/` for any script in `/etc/init.d/`
 
 This allows you to set random startup-related things easily. Example:
 
+```
 conf.d/foo:
 START_OPTS="--extraparameter sausage"
 
@@ -201,6 +218,7 @@ init.d/foo:
 start() {
 	/usr/sbin/foo-daemon ${STARTOPTS}
 }
+```
 
 The big advantage of this split is that most of the time editing of the init 
 script can be avoided.
@@ -213,34 +231,34 @@ mostly syntax-compatible to Debian's s-s-d, but has been rewritten from scratch.
 It helps with starting daemons, backgrounding, creating PID files and many 
 other convenience functions related to managing daemons.
 
-# /etc/rc.conf
+# `/etc/rc.conf`
 
 This file manages the default configuration for OpenRC, and it has examples of 
 per-service-script variables.
 
-Among these are rc_parallel (for parallelized startup), rc_log (logs all boot 
+Among these are `rc_parallel` (for parallelized startup), `rc_log` (logs all boot 
 messages to a file), and a few others.
 
 # ulimit and CGroups
 
-Setting ulimit and nice values per service can be done through the rc_ulimit 
+Setting `ulimit` and `nice` values per service can be done through the `rc_ulimit`
 variable.
 
 Under Linux, OpenRC can optionally use CGroups for process management.
 By default each service script's processes are migrated to their own CGroup.
 
-By changing certain values in the conf.d file limits can be enforced per 
+By changing certain values in the `conf.d` file limits can be enforced per 
 service. It is easy to find orphan processes of a service that persist after 
-stop(), but by default these will NOT be terminated.
-To change this add rc_cgroup_cleanup="yes" in the conf.d files for services 
+`stop()`, but by default these will NOT be terminated.
+To change this add `rc_cgroup_cleanup="yes"` in the `conf.d` files for services 
 where you desire this functionality.
 
 # Caching
 
 For performance reasons OpenRC keeps a cache of pre-parsed initscript metadata
-(e.g. depend). The default location for this is /${RC_SVCDIR}/cache.
+(e.g. `depend`). The default location for this is `/${RC_SVCDIR}/cache`.
 
-The cache uses mtime to check for file staleness. Should any service script
+The cache uses `mtime` to check for file staleness. Should any service script
 change it'll re-source the relevant files and update the cache
 
 # Convenience functions

init.d/.gitignore

@@ -1,4 +1,5 @@
 binfmt
+modules-load
 bootmisc
 fsck
 hostname
@@ -11,7 +12,6 @@ network
 root
 savecache
 swap
-swapfiles
 sysctl
 urandom
 devfs
@@ -37,6 +37,7 @@ pf
 rarpd
 rc-enabled
 rpcbind
+runsvdir
 savecore
 swap-blk
 swclock

init.d/Makefile

@@ -2,8 +2,8 @@ include ../mk/net.mk
 
 DIR=	${INITDIR}
 SRCS=	bootmisc.in fsck.in hostname.in local.in localmount.in loopback.in \
-	netmount.in osclock.in root.in savecache.in swap.in swapfiles.in \
-	tmpfiles.setup.in swclock.in sysctl.in urandom.in s6-svscan.in ${SRCS-${OS}}
+	netmount.in osclock.in root.in savecache.in swap.in tmpfiles.setup.in  \
+	swclock.in sysctl.in runsvdir.in urandom.in s6-svscan.in ${SRCS-${OS}}
 BIN=	${OBJS}
 
 # Are we installing our network scripts?
@@ -15,14 +15,14 @@ MK=	../mk
 include ${MK}/os.mk
 
 # Generic BSD scripts
-SRCS-FreeBSD=	hostid.in moused.in newsyslog.in pf.in rarpd.in rc-enabled.in \
-		rpcbind.in savecore.in syslogd.in
+SRCS-FreeBSD=	hostid.in modules.in moused.in newsyslog.in pf.in rarpd.in \
+		rc-enabled.in rpcbind.in savecore.in syslogd.in
 # These are FreeBSD specific
 SRCS-FreeBSD+=	adjkerntz.in devd.in dumpon.in encswap.in ipfw.in \
-		mixer.in nscd.in powerd.in syscons.in
+		modules.in modules-load.in mixer.in nscd.in powerd.in syscons.in
 
 SRCS-Linux=	binfmt.in devfs.in dmesg.in hwclock.in consolefont.in keymaps.in \
-		killprocs.in modules.in mount-ro.in mtab.in numlock.in \
+		killprocs.in modules.in modules-load.in mount-ro.in mtab.in numlock.in \
 		procfs.in net-online.in sysfs.in termencoding.in tmpfiles.dev.in
 
 # Generic BSD scripts
@@ -31,9 +31,6 @@ SRCS-NetBSD=	hostid.in moused.in newsyslog.in pf.in rarpd.in rc-enabled.in \
 # These are NetBSD specific
 SRCS-NetBSD+=	devdb.in swap-blk.in ttys.in wscons.in
 
-%.in: %${SFX}
-	sed ${SED_REPLACE} ${SED_EXTRA} $< > $@
-
 include ${MK}/scripts.mk
 
 _installafter_: realinstall

init.d/binfmt.in

@@ -15,7 +15,7 @@ depend()
 {
 	after procfs
 	use modules devfs
-	keyword -openvz -prefix -systemd-nspawn -vserver -lxc
+	keyword -docker -lxc -openvz -prefix -systemd-nspawn -vserver
 }
 
 start()

init.d/consolefont.in

@@ -15,7 +15,7 @@ depend()
 {
 	need localmount termencoding
 	after hotplug bootmisc modules
-	keyword -openvz -prefix -systemd-nspawn -uml -vserver -xenu -lxc
+	keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu
 }
 
 start()

init.d/devfs.in

@@ -15,7 +15,7 @@ depend()
 {
 	provide dev-mount
 	before dev
-	keyword -prefix -systemd-nspawn -vserver -lxc
+	keyword -docker -lxc -prefix -systemd-nspawn -vserver
 }
 
 mount_dev()

init.d/dmesg.in

@@ -14,7 +14,7 @@ description="Set the dmesg level for a cleaner boot"
 depend()
 {
 	before dev modules
-	keyword -lxc -prefix -systemd-nspawn -vserver
+	keyword -docker -lxc -prefix -systemd-nspawn -vserver
 }
 
 start()

init.d/fsck.in

@@ -16,7 +16,7 @@ _IFS="
 depend()
 {
 	use dev clock modules
-	keyword -jail -openvz -prefix -systemd-nspawn -timeout -vserver -lxc -uml
+	keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn -timeout -vserver -uml
 }
 
 _abort() {

init.d/hostname.in

@@ -12,15 +12,25 @@
 description="Sets the hostname of the machine."
 
 depend() {
-	keyword -prefix -systemd-nspawn -lxc
+	keyword -docker -lxc -prefix -systemd-nspawn
 }
 
 start()
 {
-	# HOSTNAME variable used to be defined in caps in conf.d/hostname.
-	# It is also a magic variable in bash.
-	hostname=${hostname-${HOSTNAME-localhost}} # checkbashisms: false positive
-	ebegin "Setting hostname to $hostname"
-	hostname "$hostname"
+	local h source x
+	if [ -s @SYSCONFDIR@/hostname ] && [ -r @SYSCONFDIR@/hostname ]; then
+	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
+	fi
+	if [ -z "$h" ]; then
+		einfo "Using default system hostname"
+		return 0
+	fi
+	ebegin "Setting hostname to $h $source"
+	hostname "$h"
 	eend $? "Failed to set the hostname"
 }

init.d/hwclock.in

@@ -30,12 +30,13 @@ fi
 depend()
 {
 	provide clock
+	want modules
 	if yesno $clock_adjfile; then
 		use root
 	else
 		before *
 	fi
-	keyword -openvz -prefix -systemd-nspawn -uml -vserver -xenu -lxc
+	keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu
 }
 
 setupopts()
@@ -79,9 +80,18 @@ get_noadjfile()
 	fi
 }
 
+rtc_exists()
+{
+	local rtc=
+	for rtc in /dev/rtc /dev/rtc[0-9]*; do
+		[ -e "$rtc" ] && break
+	done
+	[ -e "$rtc" ]
+}
+
 start()
 {
-	local retval=0 errstr=""
+	local retval=0 errstr="" modname
 	setupopts
 
 	if [ -z "$utc_cmd" ]; then
@@ -91,12 +101,13 @@ start()
 
 	ebegin "Setting system clock using the hardware clock [$utc]"
 	if [ -e /proc/modules ]; then
-		local rtc=
-		for rtc in /dev/rtc /dev/rtc[0-9]*; do
-			[ -e "$rtc" ] && break
-		done
-		if [ ! -e "${rtc}" ]; then
-			modprobe -q rtc-cmos || modprobe -q rtc || modprobe -q genrtc
+		if ! rtc_exists; then
+			for x in rtc-cmos rtc genrtc; do
+				modprobe -q $x && rtc_exists && modname="$x" && break
+			done
+			[ -n "$modname" ] &&
+				ewarn "The $modname module needs to be configured in" \
+					"@SYSCONFDIR@/conf.d/modules or built in."
 		fi
 	fi
 

init.d/keymaps.in

@@ -15,7 +15,7 @@ depend()
 {
 	need localmount termencoding
 	after bootmisc
-	keyword -openvz -prefix -systemd-nspawn -uml -vserver -xenu -lxc
+	keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu
 }
 
 start()

init.d/localmount.in

@@ -16,7 +16,7 @@ depend()
 	need fsck
 	use lvm modules mtab
 	after lvm modules
-	keyword -jail -prefix -systemd-nspawn -vserver -lxc
+	keyword -docker -jail -lxc -prefix -systemd-nspawn -vserver
 }
 
 start()
@@ -99,8 +99,8 @@ stop()
 				aufs_branch=$(sed 's/=.*//g' $x)
 				eindent
 				if ! mount -o "remount,del:$aufs_branch" "$aufs_mount_point" > /dev/null 2>&1; then
-					ewarn "Failed to remove branch $aufs_branch from aufs \
-					$aufs_mount_point"
+					ewarn "Failed to remove branch $aufs_branch from aufs" \
+					"$aufs_mount_point"
 				fi
 				eoutdent
 				sync

init.d/loopback.in

@@ -35,8 +35,3 @@ start()
 	fi
 	eend $?
 }
-
-stop()
-{
-	return 0
-}

init.d/modules-load.in

@@ -0,0 +1,72 @@
+#!@SBINDIR@/openrc-run
+# Copyright (c) 2016 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.
+
+description="Loads a list of modules from systemd-compatible locations."
+
+depend()
+{
+	keyword -docker -lxc -openvz -prefix -systemd-nspawn -vserver
+}
+
+find_modfiles()
+{
+	local dirs="/usr/lib/modules-load.d /run/modules-load.d /etc/modules-load.d"
+	local basenames files fn x y
+	for x in $dirs; do
+		[ ! -d $x ] && continue
+		for y in $x/*.conf; do
+			[ -f $y ] && basenames="${basenames}\n${y##*/}"
+		done
+	done
+	basenames=$(printf "$basenames" | sort -u)
+	for x in $basenames; do
+		for y in $dirs; do
+			[ -r $y/$x ] &&
+				fn=$y/$x
+		done
+		files="$files $fn"
+	done
+	echo $files
+}
+
+load_modules()
+{
+	local file m modules rc x
+	file=$1
+	[ -z "$file" ] && return 0
+	while read m x; do
+		case $m in
+			\;*) continue ;;
+			\#*) continue ;;
+			*) modules="$modules $m"
+			;;
+		esac
+	done < $file
+	for x in $modules; do
+		ebegin "Loading module $x"
+		case "$RC_UNAME" in
+			FreeBSD) kldload "$x"; rc=$? ;;
+			Linux) modprobe --use-blacklist -q "$x"; rc=$? ;;
+			*) ;;
+		esac
+		eend $rc "Failed to load $x"
+	done
+}
+
+start()
+{
+	local x
+	files=$(find_modfiles)
+	for x in $files; do
+		load_modules $x
+	done
+	return 0
+}

init.d/modules.in

@@ -14,10 +14,22 @@ description="Loads a user defined list of kernel modules."
 depend()
 {
 	use isapnp
-	keyword -openvz -prefix -systemd-nspawn -vserver -lxc
+	want modules-load
+	keyword -docker -lxc -openvz -prefix -systemd-nspawn -vserver
 }
 
-start()
+FreeBSD_modules()
+{
+	local cnt=0 x
+	for x in $modules; do
+		ebegin "Loading module $x"
+		kldload "$x"
+		eend $? "Failed to load $x" && : $(( cnt += 1 ))
+	done
+	einfo "Autoloaded $cnt module(s)"
+}
+
+Linux_modules()
 {
 	# Should not fail if kernel do not have module
 	# support compiled in ...
@@ -63,8 +75,17 @@ start()
 		done
 		[ -z "$args" ] && eval args=\$module_${aa}_args
 		[ -z "$args" ] && eval args=\$module_${xx}_args
-		eval modprobe -q "$mpargs" "$x" "$args"
+		eval modprobe --use-blacklist -q "$mpargs" "$x" "$args"
 		eend $? "Failed to load $x" && : $(( cnt += 1 ))
 	done
 	einfo "Autoloaded $cnt module(s)"
 }
+
+start()
+{
+	case "$RC_UNAME" in
+		FreeBSD|Linux) ${RC_UNAME}_modules ;;
+		*) ;;
+	esac
+	return 0
+}

init.d/mount-ro.in

@@ -14,7 +14,7 @@ description="Re-mount filesytems read-only for a clean reboot."
 depend()
 {
 	need killprocs savecache
-	keyword -openvz -prefix -systemd-nspawn -vserver -lxc
+	keyword -docker -lxc -openvz -prefix -systemd-nspawn -vserver
 }
 
 start()

init.d/net-online.in

@@ -15,7 +15,7 @@ depend()
 {
 	after modules
 	need sysfs
-	keyword -jail -lxc -openvz -prefix -systemd-nspawn -uml -vserver
+	keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn -uml -vserver
 }
 
 get_interfaces()

init.d/netmount.in

@@ -24,7 +24,7 @@ depend()
 	want $mywant
 	use afc-client amd openvpn
 	use dns
-	keyword -jail -prefix -systemd-nspawn -vserver -lxc
+	keyword -docker -jail -lxc -prefix -systemd-nspawn -vserver
 }
 
 start()

init.d/numlock.in

@@ -16,7 +16,7 @@ ttyn=${rc_tty_number:-${RC_TTY_NUMBER:-12}}
 depend()
 {
 	need localmount
-	keyword -openvz -prefix -systemd-nspawn -vserver -lxc
+	keyword -docker -lxc -openvz -prefix -systemd-nspawn -vserver
 }
 
 _setleds()

init.d/procfs.in

@@ -13,16 +13,22 @@ description="Mounts misc filesystems in /proc."
 
 depend()
 {
-	use modules devfs
+	use devfs
+	want modules
 	need localmount
-	keyword -openvz -prefix -systemd-nspawn -vserver -lxc
+	keyword -docker -lxc -openvz -prefix -systemd-nspawn -vserver
 }
 
 start()
 {
 	# Setup Kernel Support for miscellaneous Binary Formats
-	if [ -d /proc/sys/fs/binfmt_misc -a ! -e /proc/sys/fs/binfmt_misc/register ]; then
-		modprobe -q binfmt-misc
+	if [ -d /proc/sys/fs/binfmt_misc ] &&
+		[ ! -e /proc/sys/fs/binfmt_misc/register ]; then
+		if ! grep -qs binfmt_misc /proc/filesystems &&
+			modprobe -q binfmt-misc; then
+			ewarn "The binfmt-misc module needs to be configured in" \
+				"@SYSCONFDIR@/conf.d/modules or built in."
+		fi
 		if grep -qs binfmt_misc /proc/filesystems; then
 			ebegin "Mounting misc binary format filesystem"
 			mount -t binfmt_misc -o nodev,noexec,nosuid \

init.d/root.in

@@ -14,7 +14,7 @@ description="Mount the root fs read/write"
 depend()
 {
 	need fsck
-	keyword -jail -openvz -prefix -systemd-nspawn -vserver -lxc
+	keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn -vserver
 }
 
 start()

init.d/runsvdir.in

@@ -0,0 +1,20 @@
+#!@SBINDIR@/openrc-run
+# Copyright (c) 2016 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.
+
+command=/usr/bin/runsvdir
+command_background=yes
+pidfile=/var/run/runsvdir.pid
+command_args="-P $RC_SVCDIR/sv 'log: ...........................................................................................................................................................................................................................................................................................................................................................................................................'"
+
+start_pre()
+{
+	checkpath -m 0755 -o root:root -d ${RC_SVCDIR}/sv
+}

init.d/savecache.in

@@ -49,7 +49,7 @@ start()
 	fi
 	ebegin "Saving dependency cache"
 	local rc=0 save=
-	for x in deptree depconfig shutdowntime softlevel rc.log; do
+	for x in shutdowntime softlevel rc.log; do
 		[ -e "$RC_SVCDIR/$x" ] && save="$save $RC_SVCDIR/$x"
 	done
 	if [ -n "$save" ]; then

init.d/swap.in

@@ -12,14 +12,13 @@
 depend()
 {
 	before localmount
-	keyword -jail -openvz -prefix -systemd-nspawn -vserver -lxc
+	keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn -vserver
 }
 
 start()
 {
 	ebegin "Activating swap devices"
 	case "$RC_UNAME" in
-		Linux)		swapon -a -e >/dev/null;;
 		NetBSD|OpenBSD) swapctl -A -t noblk >/dev/null;;
 		*)		swapon -a >/dev/null;;
 	esac
@@ -29,12 +28,6 @@ start()
 stop()
 {
 	ebegin "Deactivating swap devices"
-
-	# Try to unmount all tmpfs filesystems not in use, else a deadlock may
-	# occur. As $RC_SVCDIR may also be tmpfs we cd to it to lock it
-	cd "$RC_SVCDIR"
-	umount -a -t tmpfs 2>/dev/null
-
 	case "$RC_UNAME" in
 		NetBSD|OpenBSD)	swapctl -U -t noblk >/dev/null;;
 		*)		swapoff -a >/dev/null;;

init.d/swapfiles.in

@@ -1,46 +0,0 @@
-#!@SBINDIR@/openrc-run
-# Copyright (c) 2007-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.
-
-depend()
-{
-	need localmount
-	keyword -jail -openvz -prefix -systemd-nspawn -vserver -lxc
-}
-
-start()
-{
-	ebegin "Activating additional swap space"
-	case "$RC_UNAME" in
-		NetBSD|OpenBSD) swapctl -A -t noblk >/dev/null;;
-		*)		swapon -a >/dev/null;;
-	esac
-	eend 0 # If swapon has nothing todo it errors, so always return 0
-}
-
-stop()
-{
-	ebegin "Deactivating additional swap space"
-	case "$RC_UNAME" in
-		Linux)
-			if [ -e /proc/swaps ]; then
-				while read filename type rest; do
-					case "$type" in
-						file) swapoff $filename >/dev/null;;
-					esac
-					case "$filename" in
-						/dev/loop*) swapoff $filename >/dev/null;;
-					esac
-				done < /proc/swaps
-			fi
-			;;
-	esac
-	eend 0
-}

init.d/swclock.in

@@ -15,7 +15,7 @@ depend()
 {
 	before *
 	provide clock
-	keyword -openvz -prefix -systemd-nspawn -uml -vserver -xenu -lxc
+	keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu
 }
 
 # swclock is an OpenRC built in

init.d/sysctl.BSD.in

@@ -1,38 +0,0 @@
-#!@SBINDIR@/openrc-run
-# Copyright (c) 2007-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.
-
-depend()
-{
-	before bootmisc logger
-	keyword -prefix
-}
-
-start()
-{
-	[ -e /etc/sysctl.conf ] || return 0
-	local retval=0 var= comments= conf=
-	ebegin "Configuring kernel parameters"
-	eindent
-	for conf in @SYSCONFDIR@/sysctl.conf @SYSCONFDIR@/sysctl.d/*.conf; do
-		if [ -r "$conf" ]; then
-			vebegin "applying $conf"
-			while read var comments; do
-				case "$var" in
-				""|"#"*) continue;;
-				esac
-				sysctl -w "$var" >/dev/null || retval=1
-			done < "$conf"
-			veend $retval
-		fi
-	done
-	eoutdent
-	eend $retval "Some errors were encountered"
-}

init.d/sysctl.GNU.in

@@ -1,39 +0,0 @@
-#!@PREFIX@/sbin/openrc-run
-# Copyright (c) 2007-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.
-#FIXME: Modify for GNU/Hurd
-
-depend()
-{
-	before bootmisc logger
-	keyword -prefix
-}
-
-start()
-{
-	[ -e /etc/sysctl.conf ] || return 0
-	local retval=0 var= comments= conf=
-	ebegin "Configuring kernel parameters"
-	eindent
-	for conf in @SYSCONFDIR@/sysctl.conf @SYSCONFDIR@/sysctl.d/*.conf; do
-		if [ -r "$conf" ]; then
-			vebegin "applying $conf"
-			while read var comments; do
-				case "$var" in
-				""|"#"*) continue;;
-				esac
-				sysctl -w "$var" >/dev/null || retval=1
-			done < "$conf"
-			veend $retval
-		fi
-	done
-	eoutdent
-	eend $retval "Some errors were encountered"
-}

init.d/sysctl.Linux.in

@@ -1,26 +0,0 @@
-#!@SBINDIR@/openrc-run
-# Copyright (c) 2007-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.
-
-depend()
-{
-	before bootmisc logger
-	keyword -prefix -systemd-nspawn -vserver
-}
-
-start()
-{
-	local quiet
-	yesno $rc_verbose || quiet=-q
-
-	ebegin "Configuring kernel parameters"
-	sysctl ${quiet} --system
-	eend $? "Unable to configure some kernel parameters"
-}

init.d/sysctl.in

@@ -12,14 +12,13 @@
 depend()
 {
 	before bootmisc logger
-	keyword -prefix
+	keyword -prefix -systemd-nspawn -vserver
 }
 
-start()
+BSD_sysctl()
 {
 	[ -e /etc/sysctl.conf ] || return 0
 	local retval=0 var= comments= conf=
-	ebegin "Configuring kernel parameters"
 	eindent
 	for conf in @SYSCONFDIR@/sysctl.conf @SYSCONFDIR@/sysctl.d/*.conf; do
 		if [ -r "$conf" ]; then
@@ -34,5 +33,25 @@ start()
 		fi
 	done
 	eoutdent
-	eend $retval "Some errors were encountered"
+	return $retval
+}
+
+Linux_sysctl()
+{
+	local quiet
+	yesno $rc_verbose || quiet=-q
+
+	sysctl ${quiet} --system
+}
+
+start()
+{
+	local rc=0
+
+	ebegin "Configuring kernel parameters"
+	case "$RC_UNAME" in
+	*BSD|GNU) BSD_sysctl; rc=$? ;;
+	Linux) Linux_sysctl; rc=$? ;;
+	esac
+	eend $rc "Unable to configure some kernel parameters"
 }

init.d/sysfs.in

@@ -15,7 +15,8 @@ sysfs_opts=nodev,noexec,nosuid
 
 depend()
 {
-	keyword -lxc -prefix -systemd-nspawn -vserver
+	want modules
+	keyword -docker -lxc -prefix -systemd-nspawn -vserver
 }
 
 mount_sys()
@@ -102,7 +103,10 @@ mount_misc()
 	# it will NOT appear in /proc/filesystems yet
 	if [ -d /sys/firmware/efi/efivars ] \
 		&& ! mountinfo -q /sys/firmware/efi/efivars; then
-		modprobe -q efivarfs
+		if modprobe -q efivarfs; then
+			ewarn "The efivarfs module needs to be configured in" \
+				"@SYSCONFDIR@/conf.d/modules or built in"
+		fi
 		if grep -qs efivarfs /proc/filesystems; then
 			ebegin "Mounting efivarfs filesystem"
 			mount -n -t efivarfs -o ${sysfs_opts} \

init.d/termencoding.in

@@ -16,7 +16,7 @@ ttyn=${rc_tty_number:-${RC_TTY_NUMBER:-12}}
 
 depend()
 {
-	keyword -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu
+	keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu
 	use root
 	after bootmisc
 }

init.d/urandom.in

@@ -15,7 +15,7 @@ description="Initializes the random number generator."
 depend()
 {
 	need localmount
-	keyword -jail -lxc -openvz -prefix -systemd-nspawn
+	keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn
 }
 
 save_seed()

local.d/README

@@ -8,7 +8,7 @@ service is stopped.
 
 All files are processed in lexical order.
 
-Keep in mind that files in this directory are processed sequencially,
+Keep in mind that files in this directory are processed sequentially,
 and the local service is not considered started or stopped until
 everything is processed, so if you have a process which takes a long
 time to run, it can delay your boot or shutdown processing.

man/openrc-run.8

@@ -125,15 +125,35 @@ if no start or stop function is defined by the service.
 .It Ar command_args
 List of arguments to pass to the daemon when starting via
 .Nm start-stop-daemon .
+.It Ar command_args_background
+This variable should be used if the daemon you are starting with
+.Xr start-stop-daemon 8
+runs in the foreground by default but has its own command line options
+to request that it background and write a pid file. It should be set to
+those options. It should not be used at the same time as
+command_background, because command_background requests that
+.Xr start-stop-daemon 8
+go into the background before executing the daemon.
 .It Ar command_args_foreground
 List of arguments to pass to the daemon when starting via
 .Nm supervise-daemon .
 to force the daemon to stay in the foreground
 .It Ar command_background
-Set this to "true", "yes" or "1" (case-insensitive) to force the daemon into
-the background. This implies the "--make-pidfile" and "--pidfile" option of
+Set this to "true", "yes" or "1" (case-insensitive) if you want 
 .Xr start-stop-daemon 8
-so the pidfile variable must be set.
+to force the daemon into the background. This forces the
+"--make-pidfile" and "--pidfile" options, so the pidfile variable must be set.
+.It Ar command_progress
+Set this to "true", "yes" or "1" (case-insensitive) if you want 
+.Xr start-stop-daemon 8
+to display a progress meter when waiting for a daemon to stop.
+.It Ar command_user
+If the daemon does not support changing to a different user id, you can
+use this to change the user id before
+.Xr start-stop-daemon 8
+or
+.Xr supervise-daemon 8
+launches the daemon
 .It Ar chroot
 .Xr start-stop-daemon 8
 and
@@ -143,6 +163,8 @@ will chroot into this path before writing the pid file or starting the daemon.
 Pidfile to use for the above defined command.
 .It Ar name
 Display name used for the above defined command.
+.It Ar procname
+Process name to match when signaling the daemon.
 .It Ar stopsig
 Signal to send when stopping the daemon.
 .It Ar retry
@@ -158,6 +180,10 @@ used along with in_background_fake to support re-entrant services.
 .It Ar in_background_fake
 Space separated list of commands which should always succeed when
 in_background is yes.
+.Pp
+Keep in mind that eval is used to process chroot, command, command_args_*,
+command_user, pidfile and procname. This may affect how they are
+evaluated depending on how they are quoted.
 .El
 .Sh DEPENDENCIES
 You should define a

man/rc-status.8

@@ -33,6 +33,8 @@ Show all runlevels and their services.
 List all services that have crashed.
 .It Fl l , -list
 List all defined runlevels.
+.It Fl m , -manual
+Show all manually started services.
 .It Fl r , -runlevel
 Print the current runlevel name.
 .It Fl s , -servicelist

man/start-stop-daemon.8

@@ -153,6 +153,10 @@ The retry specification can be either a timeout in seconds or multiple
 signal/timeout pairs (like SIGTERM/5).
 .El
 .Sh ENVIRONMENT
+.Va SSD_IONICELEVEL
+can also set the IO scheduling priority of the daemon, but the command line
+option takes precedence.
+.Pp
 .Va SSD_NICELEVEL
 can also set the scheduling priority of the daemon, but the command line
 option takes precedence.

mk/dist.mk

@@ -11,9 +11,9 @@
 
 GITREF?=	${VERSION}
 DISTPREFIX?=	${NAME}-${VERSION}
-DISTFILE?=	${DISTPREFIX}.tar.bz2
+DISTFILE?=	${DISTPREFIX}.tar.gz
 
-CLEANFILES+=	${NAME}-*.tar.bz2
+CLEANFILES+=	${NAME}-*.tar.gz
 
 CHANGELOG_LIMIT?= --after="1 year ago"
 
@@ -21,13 +21,13 @@ _SNAP_SH=	date -u +%Y%m%d%H%M
 _SNAP:=		$(shell ${_SNAP_SH})
 SNAP=		${_SNAP}
 SNAPDIR=	${DISTPREFIX}-${SNAP}
-SNAPFILE=	${SNAPDIR}.tar.bz2
+SNAPFILE=	${SNAPDIR}.tar.gz
 
 changelog:
 	git log ${CHANGELOG_LIMIT} --format=full > ChangeLog
 
 dist:
-	git archive --prefix=${DISTPREFIX}/ ${GITREF} | bzip2 > ${DISTFILE}
+	git archive --prefix=${DISTPREFIX}/ ${GITREF} --output=${DISTFILE}
 
 distcheck: dist
 	rm -rf ${DISTPREFIX}
@@ -42,7 +42,7 @@ snapshot:
 	cp -RPp * /tmp/${SNAPDIR}
 	(cd /tmp/${SNAPDIR}; make clean)
 	rm -rf /tmp/${SNAPDIR}/.git 2>/dev/null || true
-	tar -cvjpf ${SNAPFILE} -C /tmp ${SNAPDIR}
+	tar -cvzpf ${SNAPFILE} -C /tmp ${SNAPDIR}
 	rm -rf /tmp/${SNAPDIR}
 	ls -l ${SNAPFILE}
 

mk/sys.mk

@@ -11,6 +11,7 @@
 
 AR?=			ar
 CP?=			cp
+PKG_CONFIG?=	pkg-config
 ECHO?=			echo
 INSTALL?=		install
 RANLIB?=		ranlib

mk/termcap.mk

@@ -1,6 +1,6 @@
 ifeq (${MKTERMCAP},ncurses)
-TERMCAP_CFLAGS:=	$(shell pkg-config ncurses --cflags 2> /dev/null)
-LTERMCAP:=			$(shell pkg-config ncurses --libs 2> /dev/null)
+TERMCAP_CFLAGS:=	$(shell ${PKG_CONFIG} ncurses --cflags 2> /dev/null)
+LTERMCAP:=			$(shell ${PKG_CONFIG} ncurses --libs 2> /dev/null)
 ifeq ($(LTERMCAP),)
 LIBTERMCAP?=	-lncurses
 else

runit-guide.md

@@ -0,0 +1,41 @@
+# Using runit with OpenRC
+
+Beginning with OpenRC-0.21, we support using runit [1] in place of
+start-stop-daemon for monitoring and restarting daemons.
+
+## Setup
+
+Documenting runit in detail is beyond the scope of this guide. It will
+document how to set up OpenRC services to communicate with runit.
+
+### Use Default start, stop and status functions
+
+If you write your own start, stop and status functions in your service
+script, none of this will work. You must allow OpenRC to use the default
+functions.
+
+### Dependencies
+
+All OpenRC service scripts that want their daemons monitored by runit
+should have the following line added to their dependencies to make sure
+the runit scan directory is being monitored.
+
+need runsvdir
+
+### Variable Settings
+
+The most important setting is the supervisor variable. At the top of
+your service script, you should set this variable as follows:
+
+supervisor=runit
+
+The second variable you need is runit_service. This is the path to the
+runit service you wish to control via OpenRC. The default is
+/etc/sv/${RC_SVCNAME}. This means that for an OpenRC service
+/etc/init.d/foo, you will need to create the same runit service in
+/etc/sv/foo.
+
+This is very early support, so feel free to file bugs if you have
+issues.
+
+[1] http://www.smarden.org/runit

runlevels/Makefile

@@ -1,7 +1,7 @@
 include ../mk/net.mk
 
 BOOT=		bootmisc fsck hostname localmount loopback \
-		root swap swapfiles sysctl urandom ${BOOT-${OS}}
+		root swap sysctl urandom ${BOOT-${OS}}
 DEFAULT=	local netmount
 NONETWORK=	local
 SHUTDOWN=	savecache ${SHUTDOWN-${OS}}
@@ -32,7 +32,7 @@ SYSINIT-${OS}=
 BOOT-BSD=	hostid newsyslog savecore syslogd swap-blk
 
 # Generic BSD stuff
-BOOT-FreeBSD+=	hostid newsyslog savecore syslogd
+BOOT-FreeBSD+=	hostid modules newsyslog savecore syslogd
 # FreeBSD specific stuff
 BOOT-FreeBSD+=	adjkerntz dumpon syscons
 

s6-guide.md

@@ -1,7 +1,7 @@
 # Using S6 with OpenRC
 
 Beginning with OpenRC-0.16, we support using the s6 supervision suite
-from Skarmet Software in place of start-stop-daemon for monitoring
+from Skarnet Software in place of start-stop-daemon for monitoring
 daemons [1].
 
 ## Setup

sh/Makefile

@@ -1,8 +1,8 @@
 DIR=	${LIBEXECDIR}/sh
 SRCS=	init.sh.in functions.sh.in gendepends.sh.in \
 	openrc-run.sh.in rc-functions.sh.in tmpfiles.sh.in ${SRCS-${OS}}
-INC=	functions.sh rc-mount.sh rc-functions.sh s6.sh start-stop-daemon.sh \
-		supervise-daemon.sh
+INC=	rc-mount.sh functions.sh rc-functions.sh runit.sh s6.sh \
+		start-stop-daemon.sh supervise-daemon.sh
 BIN=	gendepends.sh init.sh openrc-run.sh tmpfiles.sh ${BIN-${OS}}
 
 INSTALLAFTER=	_installafter

sh/init.sh.BSD.in

@@ -57,7 +57,7 @@ case "$(openrc --sys)" in
 esac
 retval=$?
 
-if [ -e "$RC_LIBEXECDIR"/cache/deptree ]; then
+if [ -e "$RC_LIBEXECDIR"/cache/softlevel ]; then
 	cp -p "$RC_LIBEXECDIR"/cache/* "$RC_SVCDIR" 2>/dev/null
 fi
 

sh/init.sh.GNU-kFreeBSD.in

@@ -34,7 +34,7 @@ ebegin "Creating $RC_SVCDIR"
 mkdir -p $RC_SVCDIR
 eend $?
 
-if [ -e "$RC_LIBEXECDIR"/cache/deptree ]; then
+if [ -e "$RC_LIBEXECDIR"/cache/softlevel ]; then
     cp -p "$RC_LIBEXECDIR"/cache/* "$RC_SVCDIR" 2>/dev/null
 fi
 

sh/init.sh.GNU.in

@@ -36,7 +36,7 @@ ebegin "Creating $RC_SVCDIR"
 mkdir -p $RC_SVCDIR
 eend $?
 
-if [ -e "$RC_LIBEXECDIR"/cache/deptree ]; then
+if [ -e "$RC_LIBEXECDIR"/cache/softlevel ]; then
     cp -p "$RC_LIBEXECDIR"/cache/* "$RC_SVCDIR" 2>/dev/null
 fi
 

sh/init.sh.Linux.in

@@ -21,7 +21,7 @@ fi
 mountproc=true
 f=/proc/self/environ
 if [ -e $f ]; then
-	if [ "$(VAR=a cat $f)" = "$(VAR=b cat $f)" ]; then
+	if [ "$(VAR=a md5sum $f)" = "$(VAR=b md5sum $f)" ]; then
 		eerror "You have cruft in /proc that should be deleted"
 	else
 		einfo "/proc is already mounted"
@@ -85,7 +85,7 @@ if grep -Eq "[[:space:]]+xenfs$" /proc/filesystems; then
 	eend $?
 fi
 
-if [ -e "$RC_LIBEXECDIR"/cache/deptree ]; then
+if [ -e "$RC_LIBEXECDIR"/cache/softlevel ]; then
 	cp -p "$RC_LIBEXECDIR"/cache/* "$RC_SVCDIR" 2>/dev/null
 fi
 

sh/openrc-run.sh.in

@@ -153,6 +153,7 @@ start()
 {
 	local func=ssd_start
 	case "$supervisor" in
+		runit) func=runit_start ;;
 		s6) func=s6_start ;;
 		supervise-daemon) func=supervise_start ;;
 		?*)
@@ -166,6 +167,7 @@ stop()
 {
 	local func=ssd_stop
 	case "$supervisor" in
+		runit) func=runit_stop ;;
 		s6) func=s6_stop ;;
 		supervise-daemon) func=supervise_stop ;;
 		?*)
@@ -179,6 +181,7 @@ status()
 {
 	local func=ssd_status
 	case "$supervisor" in
+		runit) func=runit_status ;;
 		s6) func=s6_status ;;
 		supervise-daemon) func=supervise_status ;;
 		?*)
@@ -190,6 +193,15 @@ status()
 
 yesno $RC_DEBUG && set -x
 
+# Load configuration settings. First the global ones, then any
+# service-specific settings.
+sourcex -e "@SYSCONFDIR@/rc.conf"
+if [ -d "@SYSCONFDIR@/rc.conf.d" ]; then
+	for _f in "@SYSCONFDIR@"/rc.conf.d/*.conf; do
+		sourcex -e "$_f"
+	done
+fi
+
 _conf_d=${RC_SERVICE%/*}/../conf.d
 # If we're net.eth0 or openvpn.work then load net or openvpn config
 _c=${RC_SVCNAME%%.*}
@@ -206,16 +218,8 @@ if ! sourcex -e "$_conf_d/$RC_SVCNAME.$RC_RUNLEVEL"; then
 fi
 unset _conf_d
 
-# Load any system overrides
-sourcex -e "@SYSCONFDIR@/rc.conf"
-if [ -d "@SYSCONFDIR@/rc.conf.d" ]; then
-	for _f in "@SYSCONFDIR@"/rc.conf.d/*.conf; do
-		sourcex -e "$_f"
-	done
-fi
-
-
 # load service supervisor functions
+sourcex "@LIBEXECDIR@/sh/runit.sh"
 sourcex "@LIBEXECDIR@/sh/s6.sh"
 sourcex "@LIBEXECDIR@/sh/start-stop-daemon.sh"
 sourcex "@LIBEXECDIR@/sh/supervise-daemon.sh"

sh/rc-cgroup.sh.in

@@ -53,7 +53,7 @@ cgroup_set_values()
 	while [ -n "$1" -a "$controller" != "cpuacct" ]; do
 		case "$1" in
 			$controller.*)
-				if [ -n "$name" -a -f "$cgroup/$name" -a -n "$val" ]; then
+				if [ -n "$name" -a -w "$cgroup/$name" -a -n "$val" ]; then
 					veinfo "$RC_SVCNAME: Setting $cgroup/$name to $val"
 					printf "%s" "$val" > "$cgroup/$name"
 				fi
@@ -68,12 +68,12 @@ cgroup_set_values()
 		esac
 		shift
 	done
-	if [ -n "$name" -a -f "$cgroup/$name" -a -n "$val" ]; then
+	if [ -n "$name" -a -w "$cgroup/$name" -a -n "$val" ]; then
 		veinfo "$RC_SVCNAME: Setting $cgroup/$name to $val"
 		printf "%s" "$val" > "$cgroup/$name"
 	fi
 
-	if [ -f "$cgroup/tasks" ]; then
+	if [ -w "$cgroup/tasks" ]; then
 		veinfo "$RC_SVCNAME: adding to $cgroup/tasks"
 		printf "%d" 0 > "$cgroup/tasks"
 	fi
@@ -88,14 +88,14 @@ cgroup_add_service()
     # cgroups. But may lead to a problems where that inheriting
     # is needed.
 	for d in /sys/fs/cgroup/* ; do
-		[ -f "${d}"/tasks ] && printf "%d" 0 > "${d}"/tasks
+		[ -w "${d}"/tasks ] && printf "%d" 0 > "${d}"/tasks
 	done
 
 	openrc_cgroup=/sys/fs/cgroup/openrc
 	if [ -d "$openrc_cgroup" ]; then
 		cgroup="$openrc_cgroup/$RC_SVCNAME"
 		mkdir -p "$cgroup"
-		[ -f "$cgroup/tasks" ] && printf "%d" 0 > "$cgroup/tasks"
+		[ -w "$cgroup/tasks" ] && printf "%d" 0 > "$cgroup/tasks"
 	fi
 }
 

sh/runit.sh

@@ -0,0 +1,52 @@
+# Copyright (c) 2016 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.
+# Released under the 2-clause BSD license.
+
+runit_start()
+{
+	local service_path service_link
+	service_path="${runit_service:-/etc/sv/${RC_SVCNAME}}"
+	if [ ! -d "${service_path}" ]; then
+		eerror "Runit service ${service_path} not found"
+		return 1
+	fi
+	service_link="${RC_SVCDIR}/sv/${service_path##*/}"
+	ebegin "Starting ${name:-$RC_SVCNAME}"
+	ln -snf "${service_path}" "${service_link}"
+	sv start "${service_link}" > /dev/null 2>&1
+	eend $? "Failed to start ${name:-$RC_SVCNAME}"
+}
+
+runit_stop()
+{
+	local service_path service_link
+	service_path="${runit_service:-/etc/sv/${RC_SVCNAME}}"
+	if [ ! -d "${service_path}" ]; then
+		eerror "Runit service ${service_path} not found"
+		return 1
+	fi
+	service_link="${RC_SVCDIR}/sv/${service_path##*/}"
+	ebegin "Stopping ${name:-$RC_SVCNAME}"
+	sv stop "${service_link}" > /dev/null 2>&1 &&
+	rm "${service_link}"
+	eend $? "Failed to stop ${name:-$RC_SVCNAME}"
+}
+
+runit_status()
+{
+	local service_path service_link
+	service_path="${runit_service:-/etc/sv/${RC_SVCNAME}}"
+	if [ ! -d "${service_path}" ]; then
+		eerror "Runit service ${service_path} not found"
+		return 1
+	fi
+	service_link="${RC_SVCDIR}/sv/${service_path##*/}"
+	sv status "${service_link}"
+}

sh/s6.sh

@@ -30,7 +30,7 @@ s6_start()
 	sleep 1.5
 	set -- $(s6-svstat "${s6_service_link}")
 	[ "$1" = "up" ]
-	eend $? "Failed to start $RC_SVCNAME"
+	eend $? "Failed to start ${name:-$RC_SVCNAME}"
 }
 
 s6_stop()
@@ -44,7 +44,7 @@ s6_stop()
 	s6-svc -wD -d -T ${s6_service_timeout_stop:-10000} "${s6_service_link}"
 	set -- $(s6-svstat "${s6_service_link}")
 	[ "$1" = "down" ]
-	eend $? "Failed to stop $RC_SVCNAME"
+	eend $? "Failed to stop ${name:-$RC_SVCNAME}"
 }
 
 s6_status()

sh/start-stop-daemon.sh

@@ -38,6 +38,9 @@ ssd_start()
 		service_inactive && _inactive=true
 		mark_service_inactive
 	fi
+	#the eval call is necessary for cases like:
+	# command_args="this \"is a\" test"
+	# to work properly.
 	eval start-stop-daemon --start \
 		--exec $command \
 		${chroot:+--chroot} $chroot \
@@ -46,7 +49,7 @@ ssd_start()
 		${command_user+--user} $command_user \
 		$_background $start_stop_daemon_args \
 		-- $command_args $command_args_background
-	if eend $? "Failed to start $RC_SVCNAME"; then
+	if eend $? "Failed to start ${name:-$RC_SVCNAME}"; then
 		service_set_value "command" "${command}"
 		[ -n "${chroot}" ] && service_set_value "chroot" "${chroot}"
 		[ -n "${pidfile}" ] && service_set_value "pidfile" "${pidfile}"
@@ -63,6 +66,7 @@ ssd_start()
 
 ssd_stop()
 {
+	local _progress=
 	local startcommand="$(service_get_value "command")"
 	local startchroot="$(service_get_value "chroot")"
 	local startpidfile="$(service_get_value "pidfile")"
@@ -72,15 +76,17 @@ ssd_stop()
 	pidfile="${startpidfile:-$pidfile}"
 	procname="${startprocname:-$procname}"
 	[ -n "$command" -o -n "$procname" -o -n "$pidfile" ] || return 0
+	yesno "${command_progress}" && _progress=--progress
 	ebegin "Stopping ${name:-$RC_SVCNAME}"
 	start-stop-daemon --stop \
 		${retry:+--retry} $retry \
 		${command:+--exec} $command \
 		${procname:+--name} $procname \
 		${pidfile:+--pidfile} $chroot$pidfile \
-		${stopsig:+--signal} $stopsig
+		${stopsig:+--signal} $stopsig \
+		${_progress}
 
-	eend $? "Failed to stop $RC_SVCNAME"
+	eend $? "Failed to stop ${name:-$RC_SVCNAME}"
 }
 
 ssd_status()

sh/supervise-daemon.sh

@@ -19,6 +19,9 @@ supervise_start()
 	fi
 
 	ebegin "Starting ${name:-$RC_SVCNAME}"
+	# The eval call is necessary for cases like:
+	# command_args="this \"is a\" test"
+	# to work properly.
 	eval supervise-daemon --start \
 		${chroot:+--chroot} $chroot \
 		${pidfile:+--pidfile} $pidfile \
@@ -31,7 +34,7 @@ supervise_start()
 		[ -n "${chroot}" ] && service_set_value "chroot" "${chroot}"
 		[ -n "${pidfile}" ] && service_set_value "pidfile" "${pidfile}"
 	fi
-	eend $rc "failed to start $RC_SVCNAME"
+	eend $rc "failed to start ${name:-$RC_SVCNAME}"
 }
 
 supervise_stop()
@@ -46,7 +49,7 @@ supervise_stop()
 		${pidfile:+--pidfile} $chroot$pidfile \
 		${stopsig:+--signal} $stopsig
 
-	eend $? "Failed to stop $RC_SVCNAME"
+	eend $? "Failed to stop ${name:-$RC_SVCNAME}"
 }
 
 supervise_status()

sh/tmpfiles.sh.in

@@ -10,8 +10,10 @@
 # http://projects.archlinux.org/initscripts.git/tree/arch-tmpfiles
 #
 # See the tmpfiles.d manpage as well:
+# https://www.freedesktop.org/software/systemd/man/tmpfiles.d.html
+# This script should match the old manpage
 # http://0pointer.de/public/systemd-man/tmpfiles.d.html
-# This script should match the manpage as of 2012/03/12
+# as of 2012/03/12 and also implements some more recent features
 #
 
 DRYRUN=0
@@ -33,12 +35,28 @@ warninvalid() {
 	error=$(( error+1 ))
 } >&2
 
+invalid_option() {
+	printf "tmpfiles: invalid option '%s'\n" "$1" >&2
+	exit 1
+}
+
 dryrun_or_real() {
 	local dryrun=
 	[ $DRYRUN -eq 1 ] && dryrun=echo
 	$dryrun "$@"
 }
 
+_chattr() {
+	local attr="$2"
+	case $attr in
+		[+-=]*) : ;;
+		'') return ;;
+		*) attr="+$attr" ;;
+	esac
+	local IFS=
+	dryrun_or_real chattr $1 "$attr" -- $3
+}
+
 relabel() {
 	local path
 	local paths=$1 mode=$2 uid=$3 gid=$4
@@ -158,6 +176,37 @@ _v() {
 	_d "$@"
 }
 
+_q() {
+	# Similar to _v. However, make sure that the subvolume will be assigned
+	# to the same higher-level quota groups as the subvolume it has
+	# been created in.
+	# TODO: Implement btrfs subvol creation.
+	_d "$@"
+}
+
+_Q() {
+	# Similar to q. However, instead of copying the higher-level quota
+	# group assignments from the parent as-is, the lowest quota group
+	# of the parent subvolume is determined that is not the
+	# leaf quota group.
+	# TODO: Implement btrfs subvol creation.
+	_d "$@"
+}
+
+_h() {
+	# Set file/directory attributes. Lines of this type accept
+	# shell-style globs in place of normal path names.
+	# The format of the argument field matches chattr
+	_chattr '' "$6" "$1"
+}
+
+_H() {
+	# Recursively set file/directory attributes. Lines of this type accept
+	# shell-syle globs in place of normal path names.
+	# Does not follow symlinks
+	_chattr -R "$6" "$1"
+}
+
 _L() {
 	# Create a symlink if it doesn't exist yet
 	local path=$1 mode=$2 uid=$3 gid=$4 age=$5 arg=$6
@@ -259,35 +308,7 @@ _Z() {
 BOOT=0 CREATE=0 REMOVE=0 CLEAN=0 VERBOSE=0 DRYRUN=0 error=0 LINENO=0
 EXCLUDE=
 PREFIX=
-FILE=
-fragments=
-# XXX: The harcoding of /usr/lib/ is an explicit choice by upstream
-tmpfiles_dirs='/usr/lib/tmpfiles.d/ /run/tmpfiles.d/ /etc/tmpfiles.d/'
-tmpfiles_basenames=''
-tmpfiles_d=''
-# Build a list of sorted unique basenames
-# directories declared later in the tmpfiles_d array will override earlier
-# directories, on a per file basename basis.
-# `/etc/tmpfiles.d/foo.conf' supersedes `/usr/lib/tmpfiles.d/foo.conf'.
-# `/run/tmpfiles/foo.conf' will always be read after `/etc/tmpfiles.d/bar.conf'
-for d in ${tmpfiles_dirs} ; do
-	[ -d $d ] && for f in ${d}/*.conf ; do
-		case "${f##*/}" in
-			systemd.conf|systemd-*.conf) continue;;
-		esac
-		[ -f $f ] && tmpfiles_basenames="${tmpfiles_basenames}\n${f##*/}"
-	done # for f in ${d}
-done # for d in ${tmpfiles_dirs}
-tmpfiles_basenames="$(printf "${tmpfiles_basenames}\n" | sort -u )"
-
-for b in $tmpfiles_basenames ; do
-	real_f=''
-	for d in $tmpfiles_dirs ; do
-		f=${d}/${b}
-		[ -f "${f}" ] && real_f=$f
-	done
-	[ -f "${real_f}" ] && tmpfiles_d="${tmpfiles_d} ${real_f}"
-done
+FILES=
 
 while [ $# -gt 0 ]; do
 	case $1 in
@@ -299,6 +320,8 @@ while [ $# -gt 0 ]; do
 		--dryrun|--dry-run) DRYRUN=1 ;;
 		--exclude-prefix=*) EXCLUDE="${EXCLUDE}${1##--exclude-prefix=} " ;;
 		--prefix=*) PREFIX="${PREFIX}${1##--prefix=} " ;;
+		-*) invalid_option "$1" ;;
+		*) FILES="${FILES} $1"
 	esac
 	shift
 done
@@ -313,10 +336,49 @@ if [ "$CREATE$REMOVE" = '00' ]; then
 	exit 1
 fi
 
+# XXX: The harcoding of /usr/lib/ is an explicit choice by upstream
+tmpfiles_dirs='/usr/lib/tmpfiles.d /run/tmpfiles.d /etc/tmpfiles.d'
+tmpfiles_basenames=''
+
+if [ -z "${FILES}" ]; then
+	# Build a list of sorted unique basenames
+	# directories declared later in the tmpfiles_d array will override earlier
+	# directories, on a per file basename basis.
+	# `/etc/tmpfiles.d/foo.conf' supersedes `/usr/lib/tmpfiles.d/foo.conf'.
+	# `/run/tmpfiles/foo.conf' will always be read after `/etc/tmpfiles.d/bar.conf'
+	for d in ${tmpfiles_dirs} ; do
+		[ -d $d ] && for f in ${d}/*.conf ; do
+			case "${f##*/}" in
+				systemd.conf|systemd-*.conf) continue;;
+			esac
+			[ -f $f ] && tmpfiles_basenames="${tmpfiles_basenames}\n${f##*/}"
+		done # for f in ${d}
+	done # for d in ${tmpfiles_dirs}
+	FILES="$(printf "${tmpfiles_basenames}\n" | sort -u )"
+fi
+
+tmpfiles_d=''
+
+for b in ${FILES} ; do
+	if [ "${b##*/}" != "${b}" ]; then
+		# The user specified a path on the command line
+		# Just pass it through unaltered
+		tmpfiles_d="${tmpfiles_d} ${b}"
+	else
+		real_f=''
+		for d in $tmpfiles_dirs ; do
+			f=${d}/${b}
+			[ -f "${f}" ] && real_f=$f
+		done
+		[ -f "${real_f}" ] && tmpfiles_d="${tmpfiles_d} ${real_f}"
+	fi
+done
+
 error=0
 
 # loop through the gathered fragments, sorted globally by filename.
 # `/run/tmpfiles/foo.conf' will always be read after `/etc/tmpfiles.d/bar.conf'
+FILE=
 for FILE in $tmpfiles_d ; do
 	LINENUM=0
 
@@ -353,7 +415,7 @@ for FILE in $tmpfiles_d ; do
 
 		# whine about invalid entries
 		case $cmd in
-			f|F|w|d|D|v|p|L|c|C|b|x|X|r|R|z|Z) ;;
+			f|F|w|d|D|v|p|L|c|C|b|x|X|r|R|z|Z|q|Q|h|H) ;;
 			*) warninvalid ; continue ;;
 		esac
 

src/libeinfo/einfo.h

@@ -71,6 +71,7 @@ void elog(int, const char * EINFO_RESTRICT, ...) EINFO_PRINTF(2, 3);
  *
  * The n suffix denotes that no new line should be printed.
  * The v suffix means only print if EINFO_VERBOSE is yes.
+ * The x suffix means function will exit() returning failure.
  */
 /*@{*/
 int einfon(const char * __EINFO_RESTRICT, ...) EINFO_PRINTF(1, 2);

src/librc/librc-misc.c

@@ -404,6 +404,12 @@ librc_hidden_def(rc_config_value)
  * each rc_conf_value call */
 static RC_STRINGLIST *rc_conf = NULL;
 
+static void
+_free_rc_conf(void)
+{
+	rc_stringlist_free(rc_conf);
+}
+
 char *
 rc_conf_value(const char *setting)
 {
@@ -413,17 +419,13 @@ rc_conf_value(const char *setting)
 
 	if (! rc_conf) {
 		rc_conf = rc_config_load(RC_CONF);
-#ifdef DEBUG_MEMORY
 		atexit(_free_rc_conf);
-#endif
 
 		/* Support old configs. */
 		if (exists(RC_CONF_OLD)) {
 			old = rc_config_load(RC_CONF_OLD);
 			TAILQ_CONCAT(rc_conf, old, entries);
-#ifdef DEBUG_MEMORY
 			free(old);
-#endif
 		}
 
 		rc_conf = rc_config_directory(rc_conf);
@@ -443,11 +445,3 @@ rc_conf_value(const char *setting)
 	return rc_config_value(rc_conf, setting);
 }
 librc_hidden_def(rc_conf_value)
-
-#ifdef DEBUG_MEMORY
-static void
-_free_rc_conf(void)
-{
-	rc_stringlist_free(rc_conf);
-}
-#endif

src/librc/librc.c

@@ -285,6 +285,9 @@ detect_container(const char *systype)
 		return RC_SYS_RKT;
 	else if (file_regex("/proc/1/environ", "container=systemd-nspawn"))
 		return RC_SYS_SYSTEMD_NSPAWN;
+	else if (exists("/.dockerenv"))
+		return RC_SYS_DOCKER;
+	/* old test, I'm not sure when this was valid. */
 	else if (file_regex("/proc/1/environ", "container=docker"))
 		return RC_SYS_DOCKER;
 #endif

src/rc/openrc-run.c

@@ -247,7 +247,6 @@ cleanup(void)
 
 	rc_plugin_unload();
 
-#ifdef DEBUG_MEMORY
 	rc_stringlist_free(deptypes_b);
 	rc_stringlist_free(deptypes_n);
 	rc_stringlist_free(deptypes_nw);
@@ -267,7 +266,6 @@ cleanup(void)
 	free(service);
 	free(prefix);
 	free(runlevel);
-#endif
 }
 
 /* Buffer and lock all output messages so that we get readable content */
@@ -1097,9 +1095,7 @@ service_plugable(void)
 			break;
 		}
 	}
-#ifdef DEBUG_MEMORY
 	free(list);
-#endif
 	return allow;
 }
 
@@ -1173,9 +1169,6 @@ int main(int argc, char **argv)
 	if (argc < 3)
 		usage(EXIT_FAILURE);
 
-	if (runscript)
-		ewarn("%s uses runscript, please convert to openrc-run.", service);
-
 	/* Change dir to / to ensure all init scripts don't use stuff in pwd */
 	if (chdir("/") == -1)
 		eerror("chdir: %s", strerror(errno));
@@ -1295,6 +1288,9 @@ int main(int argc, char **argv)
 	applet_list = rc_stringlist_new();
 	rc_stringlist_add(applet_list, applet);
 
+	if (runscript)
+		ewarn("%s uses runscript, please convert to openrc-run.", service);
+
 	/* Now run each option */
 	retval = EXIT_SUCCESS;
 	while (optind < argc) {
@@ -1348,6 +1344,7 @@ int main(int argc, char **argv)
 			    applet_list,
 			    runlevel, depoptions);
 			rc_stringlist_free(tmplist);
+			tmplist = NULL;
 			TAILQ_FOREACH(svc, services, entries)
 			    printf("%s ", svc->value);
 			printf ("\n");

src/rc/rc-logger.c

@@ -247,6 +247,10 @@ rc_logger_open(const char *level)
 		logfile = rc_conf_value("rc_log_path");
 		if (logfile == NULL)
 			logfile = DEFAULTLOG;
+		if (!strcmp(logfile, TMPLOG)) {
+			eerror("Cowardly refusing to concatenate a logfile into itself.");
+			eerrorx("Please change rc_log_path to something other than %s to get rid of this message", TMPLOG);
+		}
 
 		if ((plog = fopen(logfile, "ae"))) {
 			if ((log = fopen(TMPLOG, "re"))) {

src/rc/rc-misc.c

@@ -53,6 +53,7 @@ static const char *const env_whitelist[] = {
 	"EERROR_QUIET", "EINFO_QUIET",
 	"IN_BACKGROUND", "IN_HOTPLUG",
 	"LANG", "LC_MESSAGES", "TERM",
+	"EINFO_COLOR", "EINFO_VERBOSE",
 	NULL
 };
 
@@ -110,11 +111,9 @@ env_filter(void)
 			setenv(env->value, e + 1, 1);
 	}
 
-#ifdef DEBUG_MEMORY
 	rc_stringlist_free(env_list);
 	rc_stringlist_free(env_allow);
 	rc_stringlist_free(profile);
-#endif
 }
 
 void

src/rc/rc-service.c

@@ -76,9 +76,7 @@ int main(int argc, char **argv)
 		case 'e':
 			service = rc_service_resolve(optarg);
 			opt = service ? EXIT_SUCCESS : EXIT_FAILURE;
-#ifdef DEBUG_MEMORY
 			free(service);
-#endif
 			return opt;
 			/* NOTREACHED */
 		case 'i':
@@ -97,9 +95,7 @@ int main(int argc, char **argv)
 			rc_stringlist_sort(&list);
 			TAILQ_FOREACH(s, list, entries)
 			    printf("%s\n", s->value);
-#ifdef DEBUG_MEMORY
 			rc_stringlist_free(list);
-#endif
 			return EXIT_SUCCESS;
 			/* NOTREACHED */
 		case 'r':
@@ -107,9 +103,7 @@ int main(int argc, char **argv)
 			if (service == NULL)
 				return EXIT_FAILURE;
 			printf("%s\n", service);
-#ifdef DEBUG_MEMORY
 			free(service);
-#endif
 			return EXIT_SUCCESS;
 			/* NOTREACHED */
 

src/rc/rc-status.c

@@ -29,11 +29,12 @@
 
 const char *applet = NULL;
 const char *extraopts = NULL;
-const char *getoptstring = "aclrsu" getoptstring_COMMON;
+const char *getoptstring = "aclmrsu" getoptstring_COMMON;
 const struct option longopts[] = {
 	{"all",         0, NULL, 'a'},
 	{"crashed",     0, NULL, 'c'},
 	{"list",        0, NULL, 'l'},
+	{"manual",        0, NULL, 'm'},
 	{"runlevel",    0, NULL, 'r'},
 	{"servicelist", 0, NULL, 's'},
 	{"unused",      0, NULL, 'u'},
@@ -43,6 +44,7 @@ const char * const longopts_help[] = {
 	"Show services from all run levels",
 	"Show crashed services",
 	"Show list of run levels",
+	"Show manually started services",
 	"Show the name of the current runlevel",
 	"Show service list",
 	"Show services not assigned to any runlevel",
@@ -50,7 +52,7 @@ const char * const longopts_help[] = {
 };
 const char *usagestring = ""						\
 	"Usage: rc-status [options] <runlevel>...\n"		\
-	"   or: rc-status [options] [-a | -c | -l | -r | -s | -u]";
+	"   or: rc-status [options] [-a | -c | -l | -m | -r | -s | -u]";
 
 static bool test_crashed = false;
 static RC_DEPTREE *deptree;
@@ -176,9 +178,9 @@ print_stacked_services(const char *runlevel)
 int main(int argc, char **argv)
 {
     RC_STRING *s, *l, *t, *level;
-
+	bool show_all = false;
 	char *p, *runlevel = NULL;
-	int opt, aflag = 0, retval = 0;
+	int opt, retval = 0;
 
 	test_crashed = _rc_can_find_pids();
 
@@ -187,7 +189,7 @@ int main(int argc, char **argv)
 				  (int *) 0)) != -1)
 		switch (opt) {
 		case 'a':
-			aflag++;
+			show_all = true;
 			levels = rc_runlevel_list();
 			break;
 		case 'c':
@@ -205,6 +207,27 @@ int main(int argc, char **argv)
 			TAILQ_FOREACH(l, levels, entries)
 				printf("%s\n", l->value);
 			goto exit;
+		case 'm':
+			services = rc_services_in_runlevel(NULL);
+			levels = rc_runlevel_list();
+			TAILQ_FOREACH_SAFE(s, services, entries, t) {
+				TAILQ_FOREACH(l, levels, entries)
+					if (rc_service_in_runlevel(s->value, l->value)) {
+						TAILQ_REMOVE(services, s, entries);
+						free(s->value);
+						free(s);
+						break;
+					}
+			}
+			TAILQ_FOREACH_SAFE(s, services, entries, t)
+				if (rc_service_state(s->value) &
+					(RC_SERVICE_STOPPED | RC_SERVICE_HOTPLUGGED)) {
+					TAILQ_REMOVE(services, s, entries);
+					free(s->value);
+					free(s);
+				}
+			print_services(NULL, services);
+			goto exit;
 		case 'r':
 			runlevel = rc_runlevel_get();
 			printf("%s\n", runlevel);
@@ -265,7 +288,7 @@ int main(int argc, char **argv)
 		services = NULL;
 	}
 
-	if (aflag || argc < 2) {
+	if (show_all || argc < 2) {
 		/* Show hotplugged services */
 		print_level("Dynamic", "hotplugged");
 		services = rc_services_in_state(RC_SERVICE_HOTPLUGGED);
@@ -274,7 +297,7 @@ int main(int argc, char **argv)
 		services = NULL;
 
 		/* Show manually started and unassigned depended services */
-		if (aflag) {
+		if (show_all) {
 			rc_stringlist_free(levels);
 			levels = rc_stringlist_new();
 			if (!runlevel)
@@ -331,7 +354,6 @@ int main(int argc, char **argv)
 
 exit:
 	free(runlevel);
-#ifdef DEBUG_MEMORY
 	rc_stringlist_free(alist);
 	rc_stringlist_free(needsme);
 	rc_stringlist_free(sservices);
@@ -340,7 +362,6 @@ exit:
 	rc_stringlist_free(types);
 	rc_stringlist_free(levels);
 	rc_deptree_free(deptree);
-#endif
 
 	return retval;
 }

src/rc/rc.c

@@ -86,6 +86,12 @@ const char *usagestring = ""					\
 #define DEVBOOT			"/dev/.rcboot"
 
 const char *applet = NULL;
+static RC_STRINGLIST *main_hotplugged_services;
+static RC_STRINGLIST *main_stop_services;
+static RC_STRINGLIST *main_start_services;
+static RC_STRINGLIST *main_types_nw;
+static RC_STRINGLIST *main_types_nwua;
+static RC_DEPTREE *main_deptree;
 static char *runlevel;
 static RC_HOOK hook_out;
 
@@ -127,10 +133,8 @@ clean_failed(void)
 static void
 cleanup(void)
 {
-#ifdef DEBUG_MEMORY
 	RC_PID *p1 = LIST_FIRST(&service_pids);
 	RC_PID *p2;
-#endif
 
 	if (!rc_in_logger && !rc_in_plugin &&
 	    applet && (strcmp(applet, "rc") == 0 || strcmp(applet, "openrc") == 0))
@@ -152,21 +156,19 @@ cleanup(void)
 		rc_logger_close();
 	}
 
-#ifdef DEBUG_MEMORY
 	while (p1) {
 		p2 = LIST_NEXT(p1, entries);
 		free(p1);
 		p1 = p2;
 	}
 
-	rc_stringlist_free(hotplugged_services);
-	rc_stringlist_free(stop_services);
-	rc_stringlist_free(start_services);
-	rc_stringlist_free(types_nw);
-	rc_stringlist_free(types_nwua);
-	rc_deptree_free(deptree);
+	rc_stringlist_free(main_hotplugged_services);
+	rc_stringlist_free(main_stop_services);
+	rc_stringlist_free(main_start_services);
+	rc_stringlist_free(main_types_nw);
+	rc_stringlist_free(main_types_nwua);
+	rc_deptree_free(main_deptree);
 	free(runlevel);
-#endif
 }
 
 static char
@@ -662,7 +664,6 @@ do_start_services(const RC_STRINGLIST *start_services, bool parallel)
 			interactive = want_interactive();
 
 		if (interactive) {
-			parallel = false;
 	interactive_retry:
 			printf("\n");
 			einfo("About to start the service %s",
@@ -735,12 +736,6 @@ int main(int argc, char **argv)
 	const char *bootlevel = NULL;
 	char *newlevel = NULL;
 	const char *systype = NULL;
-	static RC_STRINGLIST *hotplugged_services;
-	static RC_STRINGLIST *stop_services;
-	static RC_STRINGLIST *start_services;
-	static RC_STRINGLIST *types_nw;
-	static RC_STRINGLIST *types_nwua;
-	static RC_DEPTREE *deptree;
 	RC_STRINGLIST *deporder = NULL;
 	RC_STRINGLIST *tmplist;
 	RC_STRING *service;
@@ -943,7 +938,7 @@ int main(int argc, char **argv)
 	}
 
 	/* Load our deptree */
-	if ((deptree = _rc_deptree_load(0, &regen)) == NULL)
+	if ((main_deptree = _rc_deptree_load(0, &regen)) == NULL)
 		eerrorx("failed to load deptree");
 	if (exists(RC_DEPTREE_SKEWED))
 		ewarn("WARNING: clock skew detected!");
@@ -965,27 +960,27 @@ int main(int argc, char **argv)
 	* in the new or current runlevel so we won't actually be stopping
 	* them all.
 	*/
-	stop_services = rc_services_in_state(RC_SERVICE_STARTED);
+	main_stop_services = rc_services_in_state(RC_SERVICE_STARTED);
 	tmplist = rc_services_in_state(RC_SERVICE_INACTIVE);
-	TAILQ_CONCAT(stop_services, tmplist, entries);
+	TAILQ_CONCAT(main_stop_services, tmplist, entries);
 	free(tmplist);
 	tmplist = rc_services_in_state(RC_SERVICE_STARTING);
-	TAILQ_CONCAT(stop_services, tmplist, entries);
+	TAILQ_CONCAT(main_stop_services, tmplist, entries);
 	free(tmplist);
-	if (stop_services)
-		rc_stringlist_sort(&stop_services);
+	if (main_stop_services)
+		rc_stringlist_sort(&main_stop_services);
 
-	types_nwua = rc_stringlist_new();
-	rc_stringlist_add(types_nwua, "ineed");
-	rc_stringlist_add(types_nwua, "iwant");
-	rc_stringlist_add(types_nwua, "iuse");
-	rc_stringlist_add(types_nwua, "iafter");
+	main_types_nwua = rc_stringlist_new();
+	rc_stringlist_add(main_types_nwua, "ineed");
+	rc_stringlist_add(main_types_nwua, "iwant");
+	rc_stringlist_add(main_types_nwua, "iuse");
+	rc_stringlist_add(main_types_nwua, "iafter");
 
-	if (stop_services) {
-		tmplist = rc_deptree_depends(deptree, types_nwua, stop_services,
+	if (main_stop_services) {
+		tmplist = rc_deptree_depends(main_deptree, main_types_nwua, main_stop_services,
 		    runlevel, depoptions | RC_DEP_STOP);
-		rc_stringlist_free(stop_services);
-		stop_services = tmplist;
+		rc_stringlist_free(main_stop_services);
+		main_stop_services = tmplist;
 	}
 
 	/* Create a list of all services which should be started for the new or
@@ -993,14 +988,14 @@ int main(int argc, char **argv)
 	 * runlevels.  Clearly, some of these will already be started so we
 	 * won't actually be starting them all.
 	 */
-	hotplugged_services = rc_services_in_state(RC_SERVICE_HOTPLUGGED);
-	start_services = rc_services_in_runlevel_stacked(newlevel ?
+	main_hotplugged_services = rc_services_in_state(RC_SERVICE_HOTPLUGGED);
+	main_start_services = rc_services_in_runlevel_stacked(newlevel ?
 	    newlevel : runlevel);
 	if (strcmp(newlevel ? newlevel : runlevel, RC_LEVEL_SHUTDOWN) != 0 &&
 	    strcmp(newlevel ? newlevel : runlevel, RC_LEVEL_SYSINIT) != 0)
 	{
 		tmplist = rc_services_in_runlevel(RC_LEVEL_SYSINIT);
-		TAILQ_CONCAT(start_services, tmplist, entries);
+		TAILQ_CONCAT(main_start_services, tmplist, entries);
 		free(tmplist);
 		/* If we are NOT headed for the single-user runlevel... */
 		if (strcmp(newlevel ? newlevel : runlevel,
@@ -1011,13 +1006,13 @@ int main(int argc, char **argv)
 				bootlevel) != 0)
 			{
 				tmplist = rc_services_in_runlevel(bootlevel);
-				TAILQ_CONCAT(start_services, tmplist, entries);
+				TAILQ_CONCAT(main_start_services, tmplist, entries);
 				free(tmplist);
 			}
-			if (hotplugged_services) {
-				TAILQ_FOREACH(service, hotplugged_services,
+			if (main_hotplugged_services) {
+				TAILQ_FOREACH(service, main_hotplugged_services,
 				    entries)
-				    rc_stringlist_addu(start_services,
+				    rc_stringlist_addu(main_start_services,
 					service->value);
 			}
 		}
@@ -1026,8 +1021,8 @@ int main(int argc, char **argv)
 	parallel = rc_conf_yesno("rc_parallel");
 
 	/* Now stop the services that shouldn't be running */
-	if (stop_services && !nostop)
-		do_stop_services(types_nw, start_services, stop_services, deptree, newlevel, parallel, going_down);
+	if (main_stop_services && !nostop)
+		do_stop_services(main_types_nw, main_start_services, main_stop_services, main_deptree, newlevel, parallel, going_down);
 
 	/* Wait for our services to finish */
 	wait_for_services();
@@ -1059,8 +1054,8 @@ int main(int argc, char **argv)
 	hook_out = RC_HOOK_RUNLEVEL_START_OUT;
 
 	/* Re-add our hotplugged services if they stopped */
-	if (hotplugged_services)
-		TAILQ_FOREACH(service, hotplugged_services, entries)
+	if (main_hotplugged_services)
+		TAILQ_FOREACH(service, main_hotplugged_services, entries)
 		    rc_service_mark(service->value, RC_SERVICE_HOTPLUGGED);
 
 #ifdef __linux__
@@ -1076,7 +1071,7 @@ int main(int argc, char **argv)
 #endif
 
 	/* If we have a list of services to start then... */
-	if (start_services) {
+	if (main_start_services) {
 		/* Get a list of the chained runlevels which compose the target runlevel */
 		RC_STRINGLIST *runlevel_chain = rc_runlevel_stacks(runlevel);
 
@@ -1089,7 +1084,7 @@ int main(int argc, char **argv)
 
 			/* Start those services. */
 			rc_stringlist_sort(&run_services);
-			deporder = rc_deptree_depends(deptree, types_nwua, run_services, rlevel->value, depoptions | RC_DEP_START);
+			deporder = rc_deptree_depends(main_deptree, main_types_nwua, run_services, rlevel->value, depoptions | RC_DEP_START);
 			rc_stringlist_free(run_services);
 			run_services = deporder;
 			do_start_services(run_services, parallel);

src/rc/start-stop-daemon.c

@@ -177,7 +177,6 @@ free_schedulelist(void)
 	TAILQ_INIT(&schedule);
 }
 
-#ifdef DEBUG_MEMORY
 static void
 cleanup(void)
 {
@@ -185,7 +184,6 @@ cleanup(void)
 	free(nav);
 	free_schedulelist();
 }
-#endif
 
 static int
 parse_signal(const char *sig)
@@ -688,9 +686,7 @@ int main(int argc, char **argv)
 
 	applet = basename_c(argv[0]);
 	TAILQ_INIT(&schedule);
-#ifdef DEBUG_MEMORY
 	atexit(cleanup);
-#endif
 
 	signal_setup(SIGINT, handle_signal);
 	signal_setup(SIGQUIT, handle_signal);
@@ -700,6 +696,17 @@ int main(int argc, char **argv)
 		if (sscanf(tmp, "%d", &nicelevel) != 1)
 			eerror("%s: invalid nice level `%s' (SSD_NICELEVEL)",
 			    applet, tmp);
+		if ((tmp = getenv("SSD_IONICELEVEL"))) {
+			int n = sscanf(tmp, "%d:%d", &ionicec, &ioniced);
+			if (n != 1 && n != 2)
+				eerror("%s: invalid ionice level `%s' (SSD_IONICELEVEL)",
+				    applet, tmp);
+			if (ionicec == 0)
+				ioniced = 0;
+			else if (ionicec == 3)
+				ioniced = 7;
+			ionicec <<= 13; /* class shift */
+		}
 
 	/* Get our user name and initial dir */
 	p = getenv("USER");
@@ -1199,7 +1206,8 @@ int main(int argc, char **argv)
 			if ((strncmp(env->value, "RC_", 3) == 0 &&
 				strncmp(env->value, "RC_SERVICE=", 10) != 0 &&
 				strncmp(env->value, "RC_SVCNAME=", 10) != 0) ||
-			    strncmp(env->value, "SSD_NICELEVEL=", 14) == 0)
+				strncmp(env->value, "SSD_NICELEVEL=", 14) == 0 ||
+				strncmp(env->value, "SSD_IONICELEVEL=", 16) == 0)
 			{
 				p = strchr(env->value, '=');
 				*p = '\0';