Update ChangeLog

librc: Fix crash if the service name is the same as the including runlevel
If a service has the same name as the runlevel it is in, openrc will crash on changing to such runlevel. It goes in a recursive madness and eventually gets a SEGV while in snprintf (don't know why). This fixes two errors: 1. ls_dir stats files not with full path -> stat always returns != 0 2. ls_dir adds files to list if stat failed This fixes #53. X-Gentoo-Bug: 537304 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=537304
2015-05-06 09:28:34 -05:00 · 2015-05-06 09:18:09 -05:00 · 2015-05-06 09:16:11 -05:00
208 changed files with 4045 additions and 6415 deletions
--- a/99
+++ b/99
@@ -1,99 +0,0 @@
-Alessio Ababilov <ilovedevlinux@gmail.com>
-Alexander Berntsen <alexander@plaimi.net>
-Alexander Mezin <mezin.alexander@gmail.com>
-Alexander Tsoy <alexander@tsoy.me>
-Alexander Vershilov <alexander.vershilov@gmail.com>
-Alexander Vershilov <qnikst@gentoo.org>
-Alexander V Vershilov <qnikst@gentoo.org>
-Alexey Shvetsov <alexxy@gentoo.org>
-Alon Bar-Lev <alon.barlev@gmail.com>
-Amadeusz Żołnowski <aidecoe@aidecoe.name>
-Andrew Gregory <andrew.gregory.8@gmail.com>
-Anthony Donnelly <Amzo@archbsd.com>
-Anthony G. Basile <basile@opensource.dyc.edu>
-Anthony G. Basile <blueness@gentoo.org>
-Austin S. Hemmelgarn <ahferroin7@gmail.com>
-Benda Xu <heroxbd@gentoo.org>
-Björn Baumbach <bb@sernet.de>
-Charlie <root@uberlaptop.development.ltl>
-Chris Richards <gizmo@giz-works.com>
-Christian <christian@ch-sc.de>
-Christian Ruppert <idl0r@gentoo.org>
-Christian Wetzig <gentoo@wetzig.de>
-Christopher Head <chead@telus.net>
-Consus <consus@gmx.com>
-Daniel Mierswa <impulze@impulze.org>
-Daniel Robbins <drobbins@funtoo.org>
-Diego Elio Pettenò <flameeyes@flameeyes.eu>
-Diego Elio Pettenò <flameeyes@gmail.com>
-Diego <flameeyes@gentoo.org>
-Dirk Sondermann <ds-gentoo@dyximaq.de>
-Doug Freed <dwfreed@mtu.edu>
-Doug Goldstein <cardoe@cardoe.com>
-Ed Wildgoose <gentoo@wildgooses.com>
-Eray Aslan <eras@gentoo.org>
-Eugeny Shkrigunov <eshkrig@gmail.com>
-Fedja Beader <specing@contact.me.on.irc.freenode.net>
-Flex <frostynova@gmail.com>
-Gabriele Giacone <1o5g4r8o@gmail.com>
-Gary <admin@garyshood.com>
-Gilles Oivier <g.olivier@wanadoo.fr>
-Hank Leininger <hlein@korelogic.com>
-Ian Stakenvicius <axs@gentoo.org>
-Jakob Drexel <jake42@rommel.stw.uni-erlangen.de>
-James Le Cuirot <chewi@aura-online.co.uk>
-Jan Psota <jasiu@belsznica.pl>
-Jason Zaman <jason@perfinion.com>
-Joe Harvell <jharvell@dogpad.net>
-Joe M <joe9mail@gmail.com>
-Johan Bergström <bugs@bergstroem.nu>
-Jory A. Pratt <anarchy@gentoo.org>
-Juan RP <xtraeme@gmail.com>
-Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
-Kfir Lavi <lavi.kfir@gmail.com>
-Kirill Elagin <kirelagin@gmail.com>
-Lars Wendler <polynomial-c@gentoo.org>
-Lorand Kelemen <lorand.kelemen@indgroup.eu>
-Marc Joliet <marcec@gmx.de>
-Marien Zwart <marienz@gentoo.org>
-Michal Gorny <gentoo@mgorny.alt.pl>
-Mihai Moldovan <ionic@ionic.de>
-Mike Frysinger <vapier@gentoo.org>
-Mike Gilbert <floppym@gentoo.org>
-Nao Nakashima <nao.nakashima@gmail.com>
-Natanael Copa <natanael.copa@gmail.com>
-Nathan Phillip Brink <ohnobinki@ohnopublishing.net>
-Ned Ludd <solar@gentoo.org>
-Olivier Huber <oli.huber@gmail.com>
-Patrick Lauer <patrick@gentoo.org>
-Petre Rodan <petre.rodan@simplex.ro>
-Piotr Karbowski <piotr.karbowski@gmail.com>
-Ralph Sennhauser <sera@gentoo.org>
-Richard Yao <ryao@cs.stonybrook.edu>
-Rick Farina (ZeroChaos) <sidhayn@gmail.com>
-Rick Farina (Zero_Chaos) <zerochaos@gentoo.org>
-Robin H. Johnson <robbat2@gentoo.org>
-Robin H. Johnson <robbat2@orbis-terrarum.net>
-Robin Johnson <robbat2@gentoo.org>
-Roy Marples <roy@marples.name>
-Salah Coronya <salah.coronya@gmail.com>
-Sebastian Thorarensen <indigo176@blinkenshell.org>
-Semen Maryasin <marsoft@ya.ru>
-Sergei Trofimovich <slyfox@gentoo.org>
-Seth Robertson <in-gentoo@baka.org>
-S. Gilles <sgilles@umd.edu>
-Stefan Knoblich <s.knoblich@axsentis.de>
-Stef Simoens <stef.simoens@scarlet.be>
-Steve L <slong@rathaus.eclipse.co.uk>
-Steven Chamberlain <steven@pyro.eu.org>
-Svante Signell <svante.signell@gmail.com>
-Sven Vermeulen <sven.vermeulen@siphos.be>
-Thomas D <whissi@whissi.de>
-Thomas Pfaff <tpfaff@gmx.net>
-Trevor Summers Smith <trevorsummerssmith@gmail.com>
-Walter <walter@pratyeka.org>
-William Hubbs <w.d.hubbs@gmail.com>
-William Hubbs <williamh@gentoo.org>
-Will Miles <wmiles@sgl.com>
-Yun Zheng Hu <hu@fox-it.com>
-Yuta SATOH <nigoro.gentoo@0x100.com>
--- a/2217
+++ b/2217
--- a/FEATURE-REMOVAL-SCHEDULE.md
+++ b/FEATURE-REMOVAL-SCHEDULE.md
@@ -38,7 +38,7 @@ Who:

 When: 1.0

-Why: Deprecated in favor of extra_commands, extra_started_commands
+Why: Depprecated in favor of extra_commands, extra_started_commands
 	 and extra_stopped_commands.

 Who:
@@ -47,32 +47,15 @@ Who:

 When: 1.0

-Why: Deprecated in favor of executable scripts in @SYSCONFDIR@/local.d
+Why: Depprecated in favor of executable scripts in @SYSCONFDIR@/local.d

 Who:

 ## the mtab service script

-When: force /etc/mtab to link to /proc/self/mounts in 1.0, remove
-	  service in 2.0
+When: make warnings more visible in 1.0, remove in 2.0

 Why: /etc/mtab should be a symbolic link to /proc/self/mounts on modern
 	 Linux systems

 Who:
-
-## C API Functions in rc.h
-
-If you have a c program that links to librc and uses functions from
-there, this section will list API functions which are deprecated and
-will be removed along with the reason they are being removed.
-
-### rc_getline()
-
-When: 1.0
-
-Why: The getline() function was standardized in POSIX.1-2008, so it
-	 should be available on POSIX systems.
-
-Who:
-
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -54,9 +54,4 @@ Daniel Robbins continues to maintain an independent, forked
 version of OpenRC for Funtoo Linux, which includes a Funtoo-specific network
 configuration system. 

-On 17-Dec-2015 utc, Roy gave the OpenRC developers permission to replace his
-copyrights in all source files with a generic Copyright assertion for
-the OpenRC developers as long as we keep the original copyright in the
-binaries and  LICENSE file.
-
 [1] http://www.gentoo.org/news/en/gwn/20040426-newsletter.xml
--- a/24
+++ b/24
@@ -1,24 +0,0 @@
-Copyright (c) 2007-2008, Roy Marples <roy@marples.name>
-Copyright (c) 2007-2015, the OpenRC authors
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
--- a/12
+++ b/12
@@ -1,12 +1,6 @@
-# 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.
+# OpenRC Makefile
+# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 TOP:=		${dir ${realpath ${firstword ${MAKEFILE_LIST}}}}
 MK=			${TOP}/mk
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -1,3 +1,3 @@
 NAME=		openrc
-VERSION=	0.21.4
+VERSION=	0.15.1
 PKG=		${NAME}-${VERSION}
--- a/NEWS.md
+++ b/NEWS.md
@@ -3,79 +3,6 @@
 This file will contain a list of notable changes for each release. Note
 the information in this file is in reverse order.

-## OpenRC-0.21
-
-This version adds a daemon supervisor which can start daemons and
-restart them if they crash. See supervise-daemon-guide.md in the
-distribution for details on its use.
-
-It is now possible to mark certain mount points as critical. If these
-mount points are unable to be mounted, localmount or netmount will fail.
-This is handled in /etc/conf.d/localmount and /etc/conf.d/netmount. See
-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-lload.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
-service will check all known network interfaces for a configured
-interface or a carrier. It will register as started only when all
-interfaces are configured and there is at least a carrier on one
-interface. The behaviour of this service can be modified in
-/etc/conf.d/net-online.
-
-Currently, this only works on Linux, but if anyone wants to port to
-*bsd, that would be welcomed.
-
-## OpenRC-0.18.3
-
-Modern Linux systems expect /etc/mtab to be a symbolic link to
-/proc/self/mounts. Reasons for this change include support for mount
-namespaces, which will not work if /etc/mtab is a file.
-By default, the mtab service enforces this on each reboot.
-
-If you find that this breaks your system in some way, please do the
-following:
-
- Set mtab_is_file=yes in /etc/conf.d/mtab.
-
- Restart mtab. This will recreate the /etc/mtab file.
-
- Check for an issue on https://github.com/openrc/openrc/issues
-  explaining why you need /etc/mtab to be a file. If there isn't one,
-  please open one and explain in detail why you need this to be a file.
-  If there is one, please add your comments to it. Please give concrete
-  examples of why  it is important that /etc/mtab be a file instead of a
-  symbolic link. Those comments will be taken into consideration for how
-  long to keep supporting mtab as a file or when the support can be
-  removed.
-
-## OpenRC-0.18
-
-The behaviour of localmount and netmount in this version is changing. In
-the past, these services always started successfully. In this version,
-they will be able to fail if file systems they mount fail to mount. If
-you have file systems listed in fstab which should not be mounted at
-boot time, make sure to add noauto to the mount options. If you have
-file systems that you want to attempt to mount at boot time but failure
-should be allowed, add nofail to the mount options for these file
-systems in fstab.
-
 ## OpenRC-0.14

 The binfmt service, which registers misc binary formats with the Linux
--- a/conf.d/Makefile
+++ b/conf.d/Makefile
@@ -15,8 +15,7 @@ include ${MK}/os.mk

 CONF-FreeBSD=	ipfw moused powerd rarpd savecore syscons

-CONF-Linux=	consolefont devfs dmesg hwclock keymaps killprocs modules mtab \
-	net-online
+CONF-Linux=	consolefont devfs dmesg hwclock keymaps killprocs modules

 CONF-NetBSD=	moused rarpd savecore

--- a/conf.d/bootmisc
+++ b/conf.d/bootmisc
@@ -8,8 +8,3 @@ wipe_tmp="YES"
 # Write the initial dmesg log into /var/log/dmesg after boot
 # This may be useful if you need the kernel boot log afterwards
 log_dmesg="YES"
-
-# Save the previous dmesg log to dmesg.old
-# This may be useful if you need to compare the current boot to the
-# previous one.
-#previous_dmesg=no
--- a/conf.d/fsck
+++ b/conf.d/fsck
@@ -32,9 +32,3 @@ fsck_on_battery="YES"
 # This is useful when periodic filesystem checks are causing undesirable
 # delays at startup, but such delays at shutdown are acceptable.
 fsck_shutdown="NO"
-
-# fsck_abort_on_errors can be set to no to cause fsck to not abort on
-# errors.
-# This is useful when periodic filesystem checks are causing undesirable
-# aborts.
-fsck_abort_on_errors="YES"
--- a/conf.d/localmount
+++ b/conf.d/localmount
@@ -1,10 +1,3 @@
 # Stop the unmounting of certain points.
 # This could be useful for some NFS related work.
 #no_umounts="/dir1:/var/dir2"
-#
-# Mark certain mount points as critical.
-# This contains aspace separated list of mount points which should be
-# considered critical. If one of these mount points cannot be mounted,
-# localmount will fail.
-# By default, this is empty.
-#critical_mounts="/home /var"
--- a/conf.d/mtab
+++ b/conf.d/mtab
@@ -1,5 +0,0 @@
-# This setting controls whether /etc/mtab is a file or symbolic link.
-# Most of the time, you shouldn't touch this. However, if the default
-# breaks your system in some way, please see the NEWS.md file that comes
-# with OpenRC for the actions to take.
-# mtab_is_file=no
--- a/conf.d/net-online
+++ b/conf.d/net-online
@@ -1,15 +0,0 @@
-# The interfaces setting controls which interfaces the net-online
-# service considers in deciding whether the network is active. By
-# default, it is all ethernet or wireless LAN interfaces.
-#interfaces=""
-
-# This setting controls whether a ping to the default gateway is
-# included in the test for network connectivity after all interfaces
-# are active.
-#ping_default_gateway=no
-
-# The timeout setting controls how long the net-online service waits
-# for the network to be configured.
-# The default is 120 seconds.
-# if this is set to 0, the wait is infinite.
-#timeout=120
--- a/conf.d/netmount
+++ b/conf.d/netmount
@@ -25,11 +25,11 @@
 #rc_need="net.eth1 net.eth2"
 #
 # If you are using a dynamic network management tool like
-# NetworkManager, dhcpcd in standalone mode, wicd, badvpn-ncd, etc, to
+# networkmanager, dhcpcd in standalone mode, wicd, badvpn-ncd, etc, to
 # manage the network interfaces with the routes to your netmounts, you
 # should list that tool.
 #
-#rc_need="NetworkManager"
+#rc_need="networkmanager"
 #rc_need="dhcpcd"
 #rc_need="wicd"
 #
@@ -38,10 +38,3 @@
 # other words, please change it to be more suited to your system.
 #
 rc_need="net"
-#
-# Mark certain mount points as critical.
-# This contains aspace separated list of mount points which should be
-# considered critical. If one of these mount points cannot be mounted,
-# netmount will fail.
-# By default, this is empty.
-#critical_mounts="/home /var"
--- a/etc/rc.conf.Linux
+++ b/etc/rc.conf.Linux
@@ -3,11 +3,9 @@

 # 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
@@ -64,21 +62,12 @@ rc_tty_number=12
 # 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
--- a/etc/rc.conf.in
+++ b/etc/rc.conf.in
@@ -29,20 +29,17 @@
 # come up.
 #rc_depend_strict="YES"

-# rc_hotplug controls which services we allow to be hotplugged.
+# rc_hotplug is a list of services that we allow to be hotplugged.
+# By default we do not allow hotplugging.
 # A hotplugged service is one started by a dynamic dev manager when a matching
 # hardware device is found.
-# Hotplugged services appear in the "hotplugged" runlevel.
-# If rc_hotplug is set to any value, we compare the name of this service
-# to every pattern in the value, from left to right, and we allow the
-# service to be hotplugged if it matches a pattern, or if it matches no
-# patterns. Patterns can include shell wildcards.
-# To disable services from being hotplugged, prefix patterns with "!".
-#If rc_hotplug is not set or is empty, all hotplugging is disabled.
+# This service is intrinsically included in the boot runlevel.
+# To disable services, prefix with a !
 # Example - rc_hotplug="net.wlan !net.*"
-# This allows net.wlan and any service not matching net.* to be hotplugged.
-# Example - rc_hotplug="!net.*"
-# This allows services that do not match "net.*" to be hotplugged.
+# This allows net.wlan and any service not matching net.* to be plugged.
+# Example - rc_hotplug="*"
+# This allows all services to be hotplugged
+#rc_hotplug="*"

 # rc_logger launches a logging daemon to log the entire rc process to
 # /var/log/rc.log
@@ -119,9 +116,6 @@
 #SSD_NICELEVEL="-19"

 # Pass ulimit parameters
-# If you are using bash in POSIX mode for your shell, note that the
-# ulimit command uses a block size of 512 bytes for the -c and -f
-# options
 #rc_ulimit="-u 30"

 # It's possible to define extra dependencies for services like so
--- a/etc/rc.devd
+++ b/etc/rc.devd
@@ -1,13 +1,6 @@
 #!/bin/sh
-# 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.
+# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 # Inform RC that we are in the background and hotplugged
 IN_BACKGROUND=yes
--- a/etc/rc.in
+++ b/etc/rc.in
@@ -1,13 +1,6 @@
 #!@SHELL@
-# 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.
+# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 # If $TERM is not set then assume default of @TERM@
 # This gives us a nice colour boot :)
--- a/etc/rc.shutdown.in
+++ b/etc/rc.shutdown.in
@@ -1,13 +1,6 @@
 #!@SHELL@
-# 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.
+# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 # Handle interrupts
 trap : SIGINT SIGQUIT
--- a/guide.md
+++ b/guide.md
@@ -1,251 +0,0 @@
-# Purpose and description
-
-OpenRC is an init system for Unixoid operating systems. It takes care of 
-startup and shutdown of the whole system, including services.
-
-It evolved out of the Gentoo "Baselayout" package which was a custom pure-shell 
-startup solution. (This was both hard to maintain and debug, and not very 
-performant)
-
-Most of the core parts are written in C99 for performance and flexibility 
-reasons, while everything else is posix sh.
-The License is 2-clause BSD
-
-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")
-
-# Startup
-
-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 
-graph, then starts the needed service scripts, either serialized (default) or in 
-parallel.
-
-When all the init scripts are started openrc terminates. There is no persistent 
-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.
-
-# Modifying Service Scripts
-
-Any service can, at any time, be started/stopped/restarted by executing 
-"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.
-
-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 
-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
-that the current runlevel is satisfied; if you manually started apache it will be 
-stopped, and if squid died but is in the current runlevel it'll be restarted.
-
-There is a "service" helper that emulates the syntax seen on e.g. older Redhat 
-and Ubuntu ("service nginx start" etc.)
-
-# Runlevels
-
-OpenRC has a concept of runlevels, similar to what sysvinit historically 
-offered. A runlevel is basically a collection of services that needs to be 
-started. Instead of random numbers they are named, and users can create their 
-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 
-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 
-the actual init scripts.
-
-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 
-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 
-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.
-
-
-# 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.
-
-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
-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)
-
-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.
-
-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).
-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
-
-
-# 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 
-	service does
-"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
-	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 
-	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 
-	satisfies a cron dependency
-"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/...
-
-FIXME: Anything missing in this list?
-
-# The Default Functions
-
-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 
-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
-
-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/
-
-This allows you to set random startup-related things easily. Example:
-
-conf.d/foo:
-START_OPTS="--extraparameter sausage"
-
-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.
-
-# Start-Stop-Daemon
-
-OpenRC has its own modified version of s-s-d, which is historically related and 
-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
-
-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 
-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 
-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 
-service. It is easy to find orphan processes of a service that persist after 
-stop(), but by default these will NOT be terminated.
-To change this add rc_cgroup_cleanup="yes" in the conf.d files for services 
-where you desire this functionality.
-
-# Caching
-
-For performance reasons OpenRC keeps a cache of pre-parsed initscript metadata
-(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
-change it'll re-source the relevant files and update the cache
-
-# Convenience functions
-
-OpenRC has wrappers for many common output tasks in libeinfo.
-This allows to print colour-coded status notices and other things.
-To make the output consistent the bundled initscripts all use ebegin/eend to 
-print nice messages.
--- a/init.d.misc/avahi-dnsconfd.in
+++ b/init.d.misc/avahi-dnsconfd.in
@@ -1,13 +1,6 @@
 #!@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.
+# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 command=@PKG_PREFIX@/sbin/avahi-dnsconfd
 command_args="$avahi_dnsconfd_args -D"
--- a/init.d.misc/avahid.in
+++ b/init.d.misc/avahid.in
@@ -1,13 +1,6 @@
 #!@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.
+# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 command=@PKG_PREFIX@/sbin/avahi-daemon
 command_args="$avahid_args -D"
--- a/init.d.misc/dbus.in
+++ b/init.d.misc/dbus.in
@@ -1,13 +1,6 @@
 #!@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.
+# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 command=@PKG_PREFIX@/bin/dbus-daemon
 pidfile=@VARBASE@/run/dbus/pid
--- a/init.d.misc/dhcpcd.in
+++ b/init.d.misc/dhcpcd.in
@@ -1,13 +1,6 @@
 #!@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.
+# Copyright (c) 2009 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 command=/sbin/dhcpcd
 pidfile=/var/run/dhcpcd.pid
--- a/init.d.misc/dnsmasq.in
+++ b/init.d.misc/dnsmasq.in
@@ -1,13 +1,6 @@
 #!@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.
+# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 command=@PKG_PREFIX@/sbin/dnsmasq
 command_args=$dnsmasq_args
--- a/init.d.misc/hald.in
+++ b/init.d.misc/hald.in
@@ -1,13 +1,6 @@
 #!@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.
+# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 command=@PKG_PREFIX@/sbin/hald
 pidfile=@VARBASE@/run/hald/hald.pid
--- a/init.d.misc/named.in
+++ b/init.d.misc/named.in
@@ -1,13 +1,6 @@
 #!@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.
+# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 command=/usr/sbin/named
 command_args=$named_args
--- a/init.d.misc/ntpd.in
+++ b/init.d.misc/ntpd.in
@@ -1,13 +1,6 @@
 #!@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.
+# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 : ${ntpd_config:=/etc/ntp.conf}
 : ${ntpd_drift:=/var/db/ntpd.drift}
--- a/init.d.misc/openvpn.in
+++ b/init.d.misc/openvpn.in
@@ -1,13 +1,6 @@
 #!@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.
+# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 vpn=${RC_SVCNAME#*.}
 name="OpenVPN"
--- a/init.d.misc/polkitd.in
+++ b/init.d.misc/polkitd.in
@@ -1,13 +1,6 @@
 #!@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.
+# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 command=@PKG_PREFIX@/sbin/polkitd
 pidfile=@VARBASE@/run/polkitd/polkitd.pid
--- a/init.d.misc/sshd.in
+++ b/init.d.misc/sshd.in
@@ -1,13 +1,6 @@
 #!@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.
+# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 command=/usr/sbin/sshd
 command_args=$sshd_args
--- a/init.d.misc/wpa_supplicant.in
+++ b/init.d.misc/wpa_supplicant.in
@@ -1,13 +1,6 @@
 #!@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.
+# Copyright (c) 2009 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 command=/usr/sbin/wpa_supplicant
 : ${wpa_supplicant_conf:=/etc/wpa_supplicant.conf}
--- a/init.d/.gitignore
+++ b/init.d/.gitignore
@@ -1,5 +1,3 @@
-binfmt
-modules-load
 bootmisc
 fsck
 hostname
@@ -24,11 +22,9 @@ killprocs
 modules
 mount-ro
 mtab
-net-online
 numlock
 osclock
 procfs
-s6-svscan
 staticroute
 sysfs
 devdb
--- a/init.d/Makefile
+++ b/init.d/Makefile
@@ -3,7 +3,7 @@ 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}}
+	tmpfiles.setup.in swclock.in sysctl.in urandom.in ${SRCS-${OS}}
 BIN=	${OBJS}

 # Are we installing our network scripts?
@@ -19,11 +19,11 @@ SRCS-FreeBSD=	hostid.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 \
-		modules.in modules-load.in mixer.in nscd.in powerd.in syscons.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 modules-load.in mount-ro.in mtab.in numlock.in \
-		procfs.in net-online.in sysfs.in termencoding.in tmpfiles.dev.in
+		killprocs.in modules.in mount-ro.in mtab.in numlock.in \
+		procfs.in sysfs.in termencoding.in tmpfiles.dev.in

 # Generic BSD scripts
 SRCS-NetBSD=	hostid.in moused.in newsyslog.in pf.in rarpd.in rc-enabled.in \
--- a/init.d/adjkerntz.in
+++ b/init.d/adjkerntz.in
@@ -1,13 +1,6 @@
 #!@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.
+# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 extra_commands="save"

--- a/init.d/binfmt.in
+++ b/init.d/binfmt.in
@@ -1,13 +1,6 @@
 #!@SBINDIR@/openrc-run
-# Copyright (c) 2015 The OpenRC Authors.
-# See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
-#
-# This file is part of OpenRC. It is subject to the license terms in
-# the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
-# This file may not be copied, modified, propagated, or distributed
-# except according to the terms contained in the LICENSE file.
+# Copyright 2015 William Hubbs <w.d.hubbs@gmail.com>
+# Released under the 2-clause BSD license.

 description="Register misc binary format handlers"

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

 start()
@@ -23,5 +16,5 @@ start()
 	ebegin "Loading custom binary format handlers"
 	"$RC_LIBEXECDIR"/sh/binfmt.sh
 	eend $?
-	return 0
+return 0
 }
--- a/init.d/bootmisc.in
+++ b/init.d/bootmisc.in
@@ -1,13 +1,6 @@
 #!@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.
+# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 depend()
 {
@@ -128,11 +121,11 @@ clean_run()
 	local dir
 	# If / is still read-only due to a problem, this will fail!
 	if ! checkpath -W /; then
-		ewarn "/ is not writable; unable to clean up underlying /run"
+		eerror "/ is not writable; unable to clean up underlying /run"
 		return 1
 	fi
 	if ! checkpath -W /tmp; then
-		ewarn "/tmp is not writable; unable to clean up underlying /run"
+		eerror "/tmp is not writable; unable to clean up underlying /run"
 		return 1
 	fi
 	# Now we know that we can modify /tmp and /
@@ -143,12 +136,13 @@ clean_run()
 	dir=$(mktemp -d)
 	if [ -n "$dir" -a -d $dir -a -w $dir ]; then
 		mount --bind / $dir && rm -rf $dir/run/* || rc=1
-		umount $dir && rmdir $dir
+		umount $dir
+		rm -rf $dir
 	else
 		rc=1
 	fi
 	if [ $rc -ne 0 ]; then
-		ewarn "Could not clean up underlying /run on /"
+		eerror "Could not clean up underlying /run on /"
 		return 1
 	fi
 }
@@ -220,16 +214,10 @@ start()
 	if yesno $log_dmesg; then
 		if $logw || checkpath -W /var/log; then
 			# Create an 'after-boot' dmesg log
-			case "$RC_SYS" in
-				VSERVER|OPENVZ|LXC|SYSTEMD-NSPAWN) ;;
-				*)
-					if yesno ${previous_dmesg:-no}; then
-						mv /var/log/dmesg /var/log/dmesg.old
-					fi
-					dmesg > /var/log/dmesg
-					chmod 640 /var/log/dmesg
-					;;
-			esac
+			if [ "$RC_SYS" != VSERVER -a "$RC_SYS" != OPENVZ -a "$RC_SYS" != LXC ]; then
+				dmesg > /var/log/dmesg
+				chmod 640 /var/log/dmesg
+			fi
 		fi
 	fi

--- a/init.d/consolefont.in
+++ b/init.d/consolefont.in
@@ -1,21 +1,14 @@
 #!@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.
+# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 description="Sets a font for the consoles."

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

 start()
--- a/init.d/devd.in
+++ b/init.d/devd.in
@@ -1,13 +1,6 @@
 #!@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.
+# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 command=/sbin/devd
 command_args=$devd_args
--- a/init.d/devdb.in
+++ b/init.d/devdb.in
@@ -1,13 +1,6 @@
 #!@SBINDIR@/openrc-run
-# Copyright (c) 2008-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.
+# Copyright (c) 2008 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 description="Creates the dev database"

--- a/init.d/devfs.in
+++ b/init.d/devfs.in
@@ -1,13 +1,6 @@
 #!@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.
+# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 description="Set up the /dev directory"

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

 mount_dev()
--- a/init.d/dmesg.in
+++ b/init.d/dmesg.in
@@ -1,20 +1,13 @@
 #!@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.
+# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 description="Set the dmesg level for a cleaner boot"

 depend()
 {
 	before dev modules
-	keyword -docker -lxc -prefix -systemd-nspawn -vserver
+	keyword -lxc -prefix -systemd-nspawn -vserver
 }

 start()
--- a/init.d/dumpon.in
+++ b/init.d/dumpon.in
@@ -1,13 +1,6 @@
 #!@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.
+# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 description="Configures a specific kernel dump device."

--- a/init.d/fsck.in
+++ b/init.d/fsck.in
@@ -1,13 +1,6 @@
 #!@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.
+# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 description="Check and repair filesystems according to /etc/fstab"
 _IFS="
@@ -16,11 +9,11 @@ _IFS="
 depend()
 {
 	use dev clock modules
-	keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn -timeout -vserver -uml
+	keyword -jail -openvz -prefix -systemd-nspawn -timeout -vserver -lxc -uml
 }

 _abort() {
-	yesno ${fsck_abort_on_errors:-yes} && rc-abort
+	rc-abort
 	return 1
 }

--- a/init.d/hostid.in
+++ b/init.d/hostid.in
@@ -1,13 +1,6 @@
 #!@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.
+# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 extra_commands="reset"
 : ${hostid_file:=/etc/hostid}
--- a/init.d/hostname.in
+++ b/init.d/hostname.in
@@ -1,18 +1,11 @@
 #!@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.
+# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 description="Sets the hostname of the machine."

 depend() {
-	keyword -docker -lxc -prefix -systemd-nspawn
+	keyword -prefix -systemd-nspawn -lxc
 }

 start()
--- a/init.d/hwclock.in
+++ b/init.d/hwclock.in
@@ -1,13 +1,6 @@
 #!@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.
+# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 extra_commands="save show"

@@ -35,7 +28,7 @@ depend()
 	else
 		before *
 	fi
-	keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu
+	keyword -openvz -prefix -systemd-nspawn -uml -vserver -xenu -lxc
 }

 setupopts()
@@ -69,16 +62,6 @@ _hwclock()
 	return 1
 }

-get_noadjfile()
-{
-	if ! yesno $clock_adjfile; then
-		# Some implementations don't handle adjustments
-		if LC_ALL=C hwclock --help 2>&1 | grep -q "\-\-noadjfile"; then
-			echo --noadjfile
-		fi
-	fi
-}
-
 start()
 {
 	local retval=0 errstr=""
@@ -101,16 +84,16 @@ start()
 	fi

 	# Always set the kernel's time zone.
-	_hwclock --systz $utc_cmd $(get_noadjfile) $clock_args
+	_hwclock --systz $utc_cmd $clock_args
 	: $(( retval += $? ))

 	if [ -e /etc/adjtime ] && yesno $clock_adjfile; then
-		_hwclock --adjust $utc_cmd $(get_noadjfile)
+		_hwclock --adjust $utc_cmd
 		: $(( retval += $? ))
 	fi

 	if yesno ${clock_hctosys:-YES}; then
-		_hwclock --hctosys $utc_cmd $(get_noadjfile) $clock_args
+		_hwclock --hctosys $utc_cmd $clock_args
 		: $(( retval += $? ))
 	fi

@@ -132,7 +115,14 @@ stop()

 	ebegin "Setting hardware clock using the system clock" "[$utc]"

-	_hwclock --systohc $utc_cmd $(get_noadjfile) $clock_args
+	if ! yesno $clock_adjfile; then
+		# Some implementations don't handle adjustments
+		if LC_ALL=C hwclock --help 2>&1 | grep -q "\-\-noadjfile"; then
+			utc_cmd="$utc_cmd --noadjfile"
+		fi
+	fi
+
+	_hwclock --systohc $utc_cmd $clock_args
 	retval=$?

 	eend $retval "Failed to sync clocks"
@@ -147,5 +137,5 @@ save()
 show()
 {
 	setupopts
-	hwclock --show "$utc_cmd" $(get_noadjfile) $clock_args
+	hwclock --show "$utc_cmd" $clock_args
 }
--- a/init.d/ipfw.in
+++ b/init.d/ipfw.in
@@ -1,13 +1,6 @@
 #!@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.
+# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 # This is based on /etc/rc.firewall and /etc/rc.firewall6 from FreeBSD

--- a/init.d/keymaps.in
+++ b/init.d/keymaps.in
@@ -1,13 +1,6 @@
 #!@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.
+# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 description="Applies a keymap for the consoles."

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

 start()
--- a/init.d/killprocs.in
+++ b/init.d/killprocs.in
@@ -1,13 +1,6 @@
 #!@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.
+# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 description="Kill all processes so we can unmount disks cleanly."

@@ -20,8 +13,10 @@ start()
 {
 	ebegin "Terminating remaining processes"
 	killall5 -15 ${killall5_opts}
+	sleep 1
 	eend 0
 	ebegin "Killing remaining processes"
 	killall5 -9 ${killall5_opts}
+	sleep 1
 	eend 0
 }
--- a/init.d/local.in
+++ b/init.d/local.in
@@ -1,13 +1,6 @@
 #!@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.
+# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 description="Executes user programs in @SYSCONFDIR@/local.d"

--- a/init.d/localmount.in
+++ b/init.d/localmount.in
@@ -1,13 +1,6 @@
 #!@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.
+# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 description="Mounts disks and swap according to /etc/fstab."

@@ -16,13 +9,13 @@ depend()
 	need fsck
 	use lvm modules mtab
 	after lvm modules
-	keyword -docker -jail -lxc -prefix -systemd-nspawn -vserver
+	keyword -jail -prefix -systemd-nspawn -vserver -lxc
 }

 start()
 {
 	# Mount local filesystems in /etc/fstab.
-	local critical= types="noproc" x= no_netdev= rc=
+	local types="noproc" x= no_netdev=
 	for x in $net_fs_list $extra_net_fs_list; do
 		types="${types},no${x}"
 	done
@@ -36,20 +29,9 @@ start()
 	ebegin "Mounting local filesystems"
 	mount -at "$types" $no_netdev
 	eend $? "Some local filesystem failed to mount"
-	rc=$?
-	if [ -z "$critical_mounts" ]; then
-		rc=0
-	else
-		for x in ${critical_mounts}; do
-		fstabinfo -q $x || continue
-		if ! mountinfo -q $x; then
-			critical=x
-			eerror "Failed to mount $x"
-		fi
-		done
-		[ -z "$critical" ] && rc=0
-	fi
-	return $rc
+
+	# Always return 0 - some local mounts may not be critical for boot
+	return 0
 }

 stop()
@@ -88,19 +70,17 @@ stop()
 			sync
 		fi

-		local aufs_branch aufs_mount_point aufs_si_id aufs_br_id branches
-		for aufs_si_dir in /sys/fs/aufs/si*; do
-			[ -d "${aufs_si_dir}" ] || continue
-			aufs_si_id="si=${aufs_si_dir#/sys/fs/aufs/si_}"
+		local aufs_branch aufs_mount_dir aufs_mount_point aufs_si_dir aufs_si_id
+		for aufs_si_dir in /sys/fs/aufs/*; do
+			aufs_mount_dir=${aufs_si_dir#/sys/fs/aufs/}
+			aufs_si_id="$(printf "%s" $aufs_mount_dir | sed 's/_/=/g')"
 			aufs_mount_point="$(mountinfo -o ${aufs_si_id})"
-			branches="$aufs_si_dir/br[0-9] $aufs_si_dir/br[0-9][0-9] $aufs_si_dir/br[0-9][0-9][0-9]"
-			for x in $branches; do
-				[ -e "${x}" ] || continue
+			for x in $aufs_si_dir/br[0-9][0-9][0-9]; do
 				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"
+						$aufs_mount_point"
 				fi
 				eoutdent
 				sync
--- a/init.d/loopback.in
+++ b/init.d/loopback.in
@@ -1,13 +1,6 @@
 #!@SBINDIR@/openrc-run
-# Copyright (c) 2013-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.
+# Copyright (c) 2013 William Hubbs <w.d.hubbs@gmail.com>
+# Released under the 2-clause BSD license.

 description="Configures the loopback interface."

--- a/init.d/mixer.in
+++ b/init.d/mixer.in
@@ -1,13 +1,6 @@
 #!@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.
+# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 extra_commands="restore"

--- a/init.d/modules-load.in
+++ b/init.d/modules-load.in
@@ -1,72 +0,0 @@
-#!@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 -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
-}
--- a/init.d/modules.in
+++ b/init.d/modules.in
@@ -1,21 +1,13 @@
 #!@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.
+# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 description="Loads a user defined list of kernel modules."

 depend()
 {
 	use isapnp
-	want modules-load
-	keyword -docker -lxc -openvz -prefix -systemd-nspawn -vserver
+	keyword -openvz -prefix -systemd-nspawn -vserver -lxc
 }

 start()
--- a/init.d/mount-ro.in
+++ b/init.d/mount-ro.in
@@ -1,20 +1,13 @@
 #!@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.
+# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 description="Re-mount filesytems read-only for a clean reboot."

 depend()
 {
 	need killprocs savecache
-	keyword -docker -lxc -openvz -prefix -systemd-nspawn -vserver
+	keyword -openvz -prefix -systemd-nspawn -vserver -lxc
 }

 start()
--- a/init.d/moused.in
+++ b/init.d/moused.in
@@ -1,13 +1,6 @@
 #!@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.
+# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 mouse=${RC_SVCNAME##*.}
 if [ -n "$mouse" -a "$mouse" != "moused" ]; then
--- a/init.d/mtab.in
+++ b/init.d/mtab.in
@@ -1,13 +1,6 @@
 #!@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.
+# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 description="Update /etc/mtab to match what the kernel knows about"

@@ -19,19 +12,21 @@ depend()

 start()
 {
+	[ -L /etc/mtab ] && return 0
 	local rc=0
 	ebegin "Updating /etc/mtab"
 	if ! checkpath -W /etc; then
 		rc=1
-	elif ! yesno ${mtab_is_file:-no}; then
-		[ ! -L /etc/mtab ] && [ -f /etc/mtab ] &&
-			ewarn "Removing /etc/mtab file"
-		einfo "Creating mtab symbolic link"
+	elif [ ! -e /etc/mtab ]; then
 		ln -snf /proc/self/mounts /etc/mtab
 	else
-		[ -L /etc/mtab ] && ewarn "Removing /etc/mtab symbolic link"
-		rm -f /etc/mtab
-		einfo "Creating mtab file"
+		ewarn "The support for updating /etc/mtab as a file is"
+		ewarn "deprecated and will be removed in the future."
+		ewarn "Please run the following command as root on your system."
+		ewarn
+		ewarn "ln -snf /proc/self/mounts /etc/mtab"
+		ewarn
+
 		# With / as tmpfs we cannot umount -at tmpfs in localmount as that
 		# makes / readonly and dismounts all tmpfs even if in use which is
 		# not good. Luckily, umount uses /etc/mtab instead of /proc/mounts
--- a/init.d/net-online.in
+++ b/init.d/net-online.in
@@ -1,76 +0,0 @@
-#!@SBINDIR@/openrc-run
-# Copyright (c) 2015 The OpenRC Authors.
-# See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
-#
-# This file is part of OpenRC. It is subject to the license terms in
-# the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
-# This file may not be copied, modified, propagated, or distributed
-# except according to the terms contained in the LICENSE file.
-
-description="Delays until the network is online or a specific timeout"
-
-depend()
-{
-	after modules
-	need sysfs
-	keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn -uml -vserver
-}
-
-get_interfaces()
-{
-	local ifname iftype
-	for ifname in /sys/class/net/*; do
-		read iftype < ${ifname}/type
-		[ "$iftype" = "1" ] && printf "%s " ${ifname##*/}
-	done
-}
-
-get_default_gateway()
-{
-	local cmd gateway
-	if command -v ip > /dev/null 2>&1; then
-		cmd="ip route show"
-	else
-		cmd=route
-	fi
-	set -- $($cmd | grep default)
-	[ "$2" != via ] && gateway="$2" || gateway="$3"
-	printf "%s" $gateway
-}
-
-start ()
-{
-	local carriers configured dev gateway ifcount infinite interfaces
-	local rc state timeout x
-
-	ebegin "Checking to see if the network is online"
-	rc=0
-	interfaces=${interfaces:-$(get_interfaces)}
-	timeout=${timeout:-120}
- [ $timeout -eq 0 ] && infinite=true || infinite=false
- while $infinite || [ $timeout -gt 0 ]; do
-	carriers=0
-	configured=0
-	ifcount=0
- 	for dev in ${interfaces}; do
-		: $((ifcount += 1))
-		read x < /sys/class/net/$dev/carrier
-		[ $x -eq 1 ] && : $((carriers += 1))
-		read x < /sys/class/net/$dev/operstate
-		[ "$x" = up ] && : $((configured += 1))
-	done
-	[ $configured -eq $ifcount ] && [ $carriers -ge 1 ] && break
-	sleep 1
-	: $((timeout -= 1))
- done
- ! $infinite && [ $timeout -eq 0 ] && rc=1
- if [ $rc -eq 0 ] && yesno ${ping_default_gateway:-no}; then
- 	gateway="$(get_default_gateway)"
- 	if [ -n "$gateway" ] && ! ping -c 1 $gateway > /dev/null 2>&1; then
-		rc=1
-	fi
- fi
- eend $rc "The network is offline"
-}
--- a/init.d/netmount.in
+++ b/init.d/netmount.in
@@ -1,30 +1,15 @@
 #!@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.
+# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 description="Mounts network shares according to /etc/fstab."

 depend()
 {
-	local opts mywant=""
-	for opts in $(fstabinfo -o -t nfs,nfs4); do
-		case $opts in
-			noauto) ;;
-			*) mywant="$mywant nfsclient"; break ;;
-		esac
-	done
- 	config /etc/fstab
-	want $mywant
-	use afc-client amd openvpn
+	config /etc/fstab
+	use afc-client amd nfsclient autofs openvpn
 	use dns
-	keyword -docker -jail -lxc -prefix -systemd-nspawn -vserver
+	keyword -jail -prefix -systemd-nspawn -vserver -lxc
 }

 start()
@@ -37,24 +22,12 @@ start()
 	ebegin "Mounting network filesystems"
 	mount -at $fs
 	rc=$?
-	if [ "$RC_UNAME" = Linux ] && [ $rc = 0 ]; then
+	if [ "$RC_UNAME" = Linux ]; then
 		mount -a -O _netdev
 		rc=$?
 	fi
 	ewend $rc "Could not mount all network filesystems"
-	if [ -z "$critical_mounts" ]; then
-		rc=0
-	else
-		for x in ${critical_mounts}; do
-		fstabinfo -q $x || continue
-		if ! mountinfo -q $x; then
-			critical=x
-			eerror "Failed to mount $x"
-		fi
-		done
-		[ -z "$critical" ] && rc=0
-	fi
-	return $rc
+	return 0
 }

 stop()
@@ -81,7 +54,7 @@ stop()
 	retval=$?

 	eoutdent
-	if [ "$RC_UNAME" = Linux ] && [ $retval = 0 ]; then
+	if [ "$RC_UNAME" = Linux ]; then
 		umount -a -O _netdev
 		retval=$?
 	fi
--- a/init.d/network.in
+++ b/init.d/network.in
@@ -1,13 +1,6 @@
 #!@SBINDIR@/openrc-run
-# Copyright (c) 2009-2015 The OpenRC Authors.
-# See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
-#
-# 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.
+# Copyright (c) 2009 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 # This script was inspired by the equivalent rc.d network from NetBSD.

--- a/init.d/newsyslog.in
+++ b/init.d/newsyslog.in
@@ -1,13 +1,6 @@
 #!@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.
+# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 required_files="/etc/newsyslog.conf"

--- a/init.d/nscd.in
+++ b/init.d/nscd.in
@@ -1,13 +1,6 @@
 #!@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.
+# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 command=/usr/sbin/nscd
 command_args=$nscd_args
--- a/init.d/numlock.in
+++ b/init.d/numlock.in
@@ -1,13 +1,6 @@
 #!@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.
+# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 description="Turns numlock on for the consoles."

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

 _setleds()
--- a/init.d/osclock.in
+++ b/init.d/osclock.in
@@ -1,13 +1,6 @@
 #!@SBINDIR@/openrc-run
-# Copyright (c) 2014-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.
+# Copyright (c) 2014 Ralph Sennhauser <sera@igentoo.org>
+# Released under the 2-clause BSD license.

 # Can be used on OSs that take care of the clock.

--- a/init.d/pf.in
+++ b/init.d/pf.in
@@ -1,13 +1,6 @@
 #!@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.
+# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 name="Packet Filter"
 : ${pf_conf:=${pf_rules:-/etc/pf.conf}}
--- a/init.d/powerd.in
+++ b/init.d/powerd.in
@@ -1,13 +1,6 @@
 #!@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.
+# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 command=/usr/sbin/powerd
 command_args=$powerd_args
--- a/init.d/procfs.in
+++ b/init.d/procfs.in
@@ -1,13 +1,6 @@
 #!@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.
+# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 description="Mounts misc filesystems in /proc."

@@ -15,7 +8,7 @@ depend()
 {
 	use modules devfs
 	need localmount
-	keyword -docker -lxc -openvz -prefix -systemd-nspawn -vserver
+	keyword -openvz -prefix -systemd-nspawn -vserver -lxc
 }

 start()
--- a/init.d/rarpd.in
+++ b/init.d/rarpd.in
@@ -1,13 +1,6 @@
 #!@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.
+# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 command=/usr/sbin/rarpd
 command_args="-f $rarpd_args"
--- a/init.d/rc-enabled.in
+++ b/init.d/rc-enabled.in
@@ -1,13 +1,6 @@
 #!@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.
+# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 depend()
 {
--- a/init.d/root.in
+++ b/init.d/root.in
@@ -1,20 +1,13 @@
 #!@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.
+# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 description="Mount the root fs read/write"

 depend()
 {
 	need fsck
-	keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn -vserver
+	keyword -jail -openvz -prefix -systemd-nspawn -vserver -lxc
 }

 start()
--- a/init.d/rpcbind.in
+++ b/init.d/rpcbind.in
@@ -1,13 +1,6 @@
 #!@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.
+# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 command=/usr/sbin/rpcbind
 command_args=$rpcbind_args
--- a/init.d/s6-svscan.in
+++ b/init.d/s6-svscan.in
@@ -1,38 +0,0 @@
-#!@SBINDIR@/openrc-run
-# Copyright (c) 2015 The OpenRC Authors.
-# See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
-#
-# This file is part of OpenRC. It is subject to the license terms in
-# the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
-# This file may not be copied, modified, propagated, or distributed
-# except according to the terms contained in the LICENSE file.
-
-command=/bin/s6-svscan
-command_args="${RC_SVCDIR}"/s6-scan
-command_background=yes
-pidfile=/var/run/s6-svscan.pid
-
-depend()
-{
-	need localmount
-}
-
-start_pre()
-{
-	einfo "Creating s6 scan directory"
-	checkpath -d -m 0755 "$RC_SVCDIR"/s6-scan
-	return $?
-}
-
-stop_post()
-{
-	ebegin "Stopping any remaining s6 services"
-	s6-svc -dx "${RC_SVCDIR}"/s6-scan/* 2>/dev/null || true
-	eend $?
-
-	ebegin "Stopping any remaining s6 service loggers"
-	s6-svc -dx "${RC_SVCDIR}"/s6-scan/*/log 2>/dev/null || true
-	eend $?
-}
--- a/init.d/savecache.in
+++ b/init.d/savecache.in
@@ -1,66 +1,49 @@
 #!@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.
+# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 description="Saves the caches OpenRC uses to non volatile storage"

 start()
 {
 	if [ -e "$RC_SVCDIR"/clock-skewed ]; then
-		ewarn "Clock skew detected!"
+		ewarn "WARNING: clock skew detected!"
 		if ! yesno "${RC_GOINGDOWN}"; then
 			eerror "Not saving deptree cache"
 			return 1
 		fi
 	fi
-	if [ ! -d "$RC_LIBEXECDIR"/cache ]; then
-		if ! checkpath -W "$RC_LIBEXECDIR"; then
-			eerror "${RC_LIBEXECDIR} is not writable!"
-			eerror "Unable to save dependency cache"
-			if yesno "${RC_GOINGDOWN}"; then
-				return 0
-			fi
+	if ! checkpath -W "$RC_LIBEXECDIR"; then
+		ewarn "WARNING: ${RC_LIBEXECDIR} is not writable!"
+		if ! yesno "${RC_GOINGDOWN}"; then
+			ewarn "Unable to save deptree cache"
 			return 1
 		fi
-		rm -rf "$RC_LIBEXECDIR"/cache
-		if ! mkdir -p "$RC_LIBEXECDIR"/cache; then
-			eerror "Unable to create $RC_LIBEXECDIR/cache"
-			eerror "Unable to save dependency cache"
-			if yesno "${RC_GOINGDOWN}"; then
-				return 0
-			fi
-			return 1
-		fi
-	fi
-	if ! checkpath -W "$RC_LIBEXECDIR"/cache; then
-		eerror "${RC_LIBEXECDIR}/cache is not writable!"
-		eerror "Unable to save dependency cache"
-		if yesno "${RC_GOINGDOWN}"; then
-			return 0
-		fi
-		return 1
+		return 0
 	fi
 	ebegin "Saving dependency cache"
-	local rc=0 save=
-	for x in deptree depconfig shutdowntime softlevel rc.log; do
+	local rc=
+	if [ ! -d "$RC_LIBEXECDIR"/cache ]; then
+		rm -rf "$RC_LIBEXECDIR"/cache
+		if ! mkdir -p "$RC_LIBEXECDIR"/cache; then
+			rc=$?
+			if yesno "${RC_GOINGDOWN}"; then
+				rc=0
+			fi
+			eend $rc "Unable to create $RC_SVCDIR/cache"
+			return $rc
+		fi
+	fi
+	local save=
+	for x in deptree depconfig shutdowntime softlevel nettree rc.log; do
 		[ -e "$RC_SVCDIR/$x" ] && save="$save $RC_SVCDIR/$x"
 	done
 	if [ -n "$save" ]; then
-		cp -p $save "$RC_LIBEXECDIR"/cache
-		rc=$?
+		cp -p $save "$RC_LIBEXECDIR"/cache 2>/dev/null
 	fi
+	rc=$?
 	if yesno "${RC_GOINGDOWN}"; then
-		if [ $rc -ne 0 ]; then
-			eerror "Unable to save dependency cache"
-		fi
-		eend 0
+		rc=0
 	fi
-	eend $rc "Unable to save dependency cache"
+	eend $rc
 }
--- a/init.d/savecore.in
+++ b/init.d/savecore.in
@@ -1,13 +1,6 @@
 #!@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.
+# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 description="Saves a kernel dump."

--- a/init.d/staticroute.in
+++ b/init.d/staticroute.in
@@ -1,13 +1,6 @@
 #!@SBINDIR@/openrc-run
-# Copyright (c) 2009-2015 The OpenRC Authors.
-# See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
-#
-# 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.
+# Copyright (c) 2009 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 # This script was inspired by the equivalent rc.d staticroute from NetBSD.

--- a/init.d/swap-blk.in
+++ b/init.d/swap-blk.in
@@ -1,13 +1,6 @@
 #!@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.
+# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 depend()
 {
--- a/init.d/swap.in
+++ b/init.d/swap.in
@@ -1,18 +1,11 @@
 #!@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.
+# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 depend()
 {
 	before localmount
-	keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn -vserver
+	keyword -jail -openvz -prefix -systemd-nspawn -vserver -lxc
 }

 start()
--- a/init.d/swapfiles.in
+++ b/init.d/swapfiles.in
@@ -1,18 +1,11 @@
 #!@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.
+# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 depend()
 {
 	need localmount
-	keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn -vserver
+	keyword -jail -openvz -prefix -systemd-nspawn -vserver -lxc
 }

 start()
--- a/init.d/swclock.in
+++ b/init.d/swclock.in
@@ -1,13 +1,6 @@
 #!@SBINDIR@/openrc-run
-# Copyright (c) 2009-2015 The OpenRC Authors.
-# See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
-#
-# 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.
+# Copyright (c) 2009 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 description="Sets the local clock to the mtime of a given file."

@@ -15,7 +8,7 @@ depend()
 {
 	before *
 	provide clock
-	keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu
+	keyword -openvz -prefix -systemd-nspawn -uml -vserver -xenu -lxc
 }

 # swclock is an OpenRC built in
--- a/init.d/syscons.in
+++ b/init.d/syscons.in
@@ -1,13 +1,6 @@
 #!@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.
+# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 depend() {
 	need localmount
--- a/init.d/sysctl.BSD.in
+++ b/init.d/sysctl.BSD.in
@@ -1,13 +1,6 @@
 #!@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.
+# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 depend()
 {
--- a/init.d/sysctl.GNU-kFreeBSD.in
+++ b/init.d/sysctl.GNU-kFreeBSD.in
@@ -1,13 +1,6 @@
 #!@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.
+# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 depend()
 {
--- a/init.d/sysctl.GNU.in
+++ b/init.d/sysctl.GNU.in
@@ -1,13 +1,6 @@
 #!@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.
+# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.
 #FIXME: Modify for GNU/Hurd

 depend()
--- a/init.d/sysctl.Linux.in
+++ b/init.d/sysctl.Linux.in
@@ -1,13 +1,6 @@
 #!@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.
+# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 depend()
 {
--- a/init.d/sysfs.in
+++ b/init.d/sysfs.in
@@ -1,13 +1,6 @@
 #!@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.
+# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 description="Mount the sys filesystem."

@@ -15,7 +8,7 @@ sysfs_opts=nodev,noexec,nosuid

 depend()
 {
-	keyword -docker -lxc -prefix -systemd-nspawn -vserver
+	keyword -lxc -prefix -systemd-nspawn -vserver
 }

 mount_sys()
@@ -68,6 +61,16 @@ mount_misc()
 		fi
 	fi

+	# set up kernel support for cgroups
+	if [ -d /sys/fs/cgroup ] && ! mountinfo -q /sys/fs/cgroup; then
+		if grep -qs cgroup /proc/filesystems; then
+			ebegin "Mounting cgroup filesystem"
+			local opts="${sysfs_opts},mode=755,size=${rc_cgroupsize:-10m}"
+			mount -n -t tmpfs -o ${opts} cgroup_root /sys/fs/cgroup
+			eend $?
+		fi
+	fi
+
 	# set up kernel support for fusectl
 	if [ -d /sys/fs/fuse/connections ] \
 		&& ! mountinfo -q /sys/fs/fuse/connections; then
@@ -88,15 +91,6 @@ mount_misc()
 		fi
 	fi

-	# Setup Kernel Support for persistent storage
-	if [ -d /sys/fs/pstore ] && ! mountinfo -q /sys/fs/pstore; then
-		if grep -qs 'pstore$' /proc/filesystems; then
-			ebegin "Mounting persistent storage (pstore) filesystem"
-			mount -t pstore pstore -o ${sysfs_opts} /sys/fs/pstore
-			eend $?
-		fi
-	fi
-
 	# setup up kernel support for efivarfs
 	# slightly complicated, as if it's build as a module but NOT yet loaded,
 	# it will NOT appear in /proc/filesystems yet
@@ -114,16 +108,6 @@ mount_misc()

 mount_cgroups()
 {
-	# set up kernel support for cgroups
-	if [ -d /sys/fs/cgroup ] && ! mountinfo -q /sys/fs/cgroup; then
-		if grep -qs cgroup /proc/filesystems; then
-			ebegin "Mounting cgroup filesystem"
-			local opts="${sysfs_opts},mode=755,size=${rc_cgroupsize:-10m}"
-			mount -n -t tmpfs -o ${opts} cgroup_root /sys/fs/cgroup
-			eend $?
-		fi
-	fi
-
 	mountinfo -q /sys/fs/cgroup || return 0

 	if ! mountinfo -q /sys/fs/cgroup/openrc; then
@@ -132,7 +116,7 @@ mount_cgroups()
 		mount -n -t cgroup \
 			-o none,${sysfs_opts},name=openrc,release_agent="$agent" \
 			openrc /sys/fs/cgroup/openrc
-		printf 1 > /sys/fs/cgroup/openrc/notify_on_release
+		echo 1 > /sys/fs/cgroup/openrc/notify_on_release
 	fi

 	yesno ${rc_controller_cgroups:-YES} && [ -e /proc/cgroups ] || return 0
--- a/init.d/syslogd.in
+++ b/init.d/syslogd.in
@@ -1,13 +1,6 @@
 #!@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.
+# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 command=/usr/sbin/syslogd
 command_args=$syslogd_args
--- a/init.d/termencoding.in
+++ b/init.d/termencoding.in
@@ -1,13 +1,6 @@
 #!@SBINDIR@/openrc-run
-# Copyright (c) 2008-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.
+# Copyright (c) 2008-2009 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 description="Configures terminal encoding."

@@ -16,7 +9,7 @@ ttyn=${rc_tty_number:-${RC_TTY_NUMBER:-12}}

 depend()
 {
-	keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu
+	keyword -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu
 	use root
 	after bootmisc
 }
--- a/init.d/ttys.in
+++ b/init.d/ttys.in
@@ -1,13 +1,6 @@
 #!@SBINDIR@/openrc-run
-# Copyright (c) 2008-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.
+# Copyright (c) 2008 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 depend()
 {
--- a/init.d/urandom.in
+++ b/init.d/urandom.in
@@ -1,13 +1,6 @@
 #!@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.
+# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 : ${urandom_seed:=${URANDOM_SEED:-/var/lib/misc/random-seed}}
 description="Initializes the random number generator."
@@ -15,7 +8,7 @@ description="Initializes the random number generator."
 depend()
 {
 	need localmount
-	keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn
+	keyword -jail -lxc -openvz -prefix -systemd-nspawn
 }

 save_seed()
--- a/init.d/wscons.in
+++ b/init.d/wscons.in
@@ -1,13 +1,6 @@
 #!@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.
+# Copyright (c) 2008-2009 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 depend()
 {
--- a/man/Makefile
+++ b/man/Makefile
@@ -1,16 +1,8 @@
-MK=		../mk
-include ${MK}/sys.mk
-include ${MK}/os.mk
-
 MAN3=		einfo.3 \
 		rc_config.3 rc_deptree.3 rc_find_pids.3 rc_plugin_hook.3 \
 		rc_runlevel.3 rc_service.3 rc_stringlist.3
 MAN8=		rc-service.8 rc-status.8 rc-update.8 openrc.8 openrc-run.8 \
-		service.8 start-stop-daemon.8 supervise-daemon.8
-
-ifeq (${OS},Linux)
-MAN8 += rc-sstat.8
-endif
+		service.8 start-stop-daemon.8

 # Handy macro to create symlinks
 # This does rely on correctly formatting our manpages!
@@ -24,6 +16,8 @@ MAKE_LINKS=	suffix=$${man\#*.}; \
 		fi; \
 		done;

+MK=		../mk
+include ${MK}/sys.mk
 include ${MK}/gitignore.mk

 all:
--- a/man/einfo.3
+++ b/man/einfo.3
@@ -1,12 +1,25 @@
-.\" 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
+.\" Copyright (c) 2007-2008 Roy Marples
 .\"
-.\" 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.
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
 .\"
 .Dd Mar 16, 2008
 .Dt EINFO 3 SMM
--- a/man/openrc-run.8
+++ b/man/openrc-run.8
@@ -1,12 +1,25 @@
-.\" 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
+.\" Copyright (c) 2007-2009 Roy Marples
 .\"
-.\" 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.
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
 .\"
 .Dd December 31, 2011
 .Dt openrc-run 8 SMM
@@ -94,41 +107,14 @@ the service has already been stopped.
 String describing the service.
 .It Ar description_$command
 String describing the extra command.
-.It Ar supervisor
-Supervisor to use to monitor this daemon. If this is unset or invalid,
-start-stop-daemon will be used.
-Currently, we support s6 from scarnet software, and supervise-daemon
-which is a light-weight supervisor internal to OpenRC.
-To use s6, set
-supervisor=s6.
-or set
-supervisor=supervise-daemon
-to use supervise-daemon.
-Note that supervise-daemon is still in early development, so it is
-considered experimental.
-.It Ar s6_service_path
-The path to the s6 service directory if you are monitoring this service
-with S6. The default is /var/svc.d/${RC_SVCNAME}.
-.It Ar s6_svwait_options_start
-The options to pass to s6-svwait when starting the service via s6.
-.It Ar s6_service_timeout_stop
-The amount of time, in milliseconds, s6-svc should wait for the service
-to go down when stopping the service. The default is 10000.
 .It Ar start_stop_daemon_args
 List of arguments passed to start-stop-daemon when starting the daemon.
 .It Ar command
 Daemon to start or stop via
 .Nm start-stop-daemon
-or
-.Nm supervise-daemon
 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_foreground
-List of arguments to pass to the daemon when starting via
-.Nm supervise-daemon .
-to force the daemon to stay in the foreground
+List of arguments to pass to the daemon when starting.
 .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
@@ -136,15 +122,11 @@ the background. This implies the "--make-pidfile" and "--pidfile" option of
 so the pidfile variable must be set.
 .It Ar chroot
 .Xr start-stop-daemon 8
-and
-.Xr supervise-daemon 8
 will chroot into this path before writing the pid file or starting the daemon.
 .It Ar pidfile
 Pidfile to use for the above defined command.
 .It Ar name
 Display name used for the above defined command.
-.It Ar stopsig
-Signal to send when stopping the daemon.
 .It Ar retry
 Retry schedule to use when stopping the daemon. It can either be a
 timeout in seconds or multiple signal/timeout pairs (like SIGTERM/5).
@@ -168,28 +150,24 @@ will start and stop it in the right order in relation to other services.
 As it's a function it can be very flexible, see the example below.
 Here is a list of the functions you can use in a
 .Ic depend
-function. You simply pass the names of the services you want to add to
-that dependency type to the function, or prefix the names with ! to
-remove them from the dependencies.
+function. You simply pass the names of the services to it to add to that
+dependency type, or prefix it with ! to remove it.
 .Bl -tag -width "RC_DEFAULTLEVEL"
 .It Ic need
 The service will refuse to start until needed services have started and it
 will refuse to stop until any services that need it have stopped.
 .It Ic use
-The service will attempt to start any services it uses that have been added
+The service will attempt to start any services we use that have been added
 to the runlevel.
-.It Ic want
-The service will attempt to start any services it wants, regardless of
-whether they have been added to the runlevel.
 .It Ic after
 The service will start after these services and stop before these services.
 .It Ic before
 The service will start before these services and stop after these services.
 .It Ic provide
-The service provides this virtual service. For example, named provides dns.
-Note that it is not legal to have a virtual and real service with the
-same name. If you do this, you will receive an error message, and you
-must rename either the real or virtual service.
+We provide this virtual service. For example, named provides dns.
+Virtual services take precedence over real services, so it is highly
+recommended that you do not have a real service that has the same name
+as a virtual service.
 .It Ic config
 We should recalculate our dependencies if the listed files have changed.
 .It Ic keyword
@@ -219,8 +197,6 @@ Same as -jail, but for Linux Resource Containers (LXC).
 Same as -jail, but for OpenVZ systems.
 .It Dv -prefix
 Same as -jail, but for Prefix systems.
-.It Dv -rkt
-Same as -jail, but for RKT systems.
 .It Dv -uml
 Same as -jail, but for UML systems.
 .It Dv -vserver
@@ -229,11 +205,6 @@ Same as -jail, but for VServer systems.
 Same as -jail, but for Xen DOM0 systems.
 .It Dv -xenu
 Same as -jail, but for Xen DOMU systems.
-.It Dv -docker
-Same as -jail, but for docker systems.
-.It Dv -containers
-Same as -jail, but for all relevant container types on the operating
-system.
 .El
 .El
 .Pp
@@ -475,9 +446,6 @@ rc_net_tap1_provide="!net"
 # It's also possible to negate keywords. This is mainly useful for prefix
 # users testing OpenRC.
 rc_keyword="!-prefix"
-# This can also be used to block a script from runining in all
-# containers except one or two
-rc_keyword="!-containers !-docker"
 .Ed
 .Sh EXAMPLES
 .Pp
--- a/man/openrc.8
+++ b/man/openrc.8
@@ -1,12 +1,25 @@
-.\" 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
+.\" Copyright (c) 2007-2009 Roy Marples
 .\"
-.\" 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.
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
 .\"
 .Dd May 2, 2009
 .Dt OPENRC 8 SMM
--- a/man/rc-service.8
+++ b/man/rc-service.8
@@ -1,12 +1,25 @@
-.\" 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
+.\" Copyright (c) 2008-2009 Roy Marples
 .\"
-.\" 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.
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
 .\"
 .Dd May 1, 2009
 .Dt RC-SERVICE 8 SMM
@@ -20,14 +33,6 @@
 .Ar service cmd
 .Op Ar ...
 .Nm
-.Op Fl I , -ifinactive
-.Ar service cmd
-.Op Ar ...
-.Nm
-.Op Fl N , -ifnotstarted
-.Ar service cmd
-.Op Ar ...
-.Nm
 .Fl e , -exists
 .Ar service
 .Nm
@@ -44,13 +49,6 @@ If
 is given then
 .Nm
 returns 0 even if the service does not exist.
-If
-.Fl I , -ifinactive
-or
-.Fl N , -ifnotstarted
-is given then
-.Nm
-returns 0 if the service exists but is in the wrong state.
 .Pp
 If given the
 .Fl l , -list
--- a/man/rc-sstat.8
+++ b/man/rc-sstat.8
@@ -1,33 +0,0 @@
-.\" Copyright (c) 2015 The OpenRC Authors.
-.\" See the Authors file at the top-level directory of this distribution and
-.\" https://github.com/OpenRC/openrc/blob/master/AUTHORS
-.\"
-.\" This file is part of OpenRC. It is subject to the license terms in
-.\" the LICENSE file found in the top-level directory of this
-.\" distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
-.\" This file may not be copied, modified, propagated, or distributed
-.\"    except according to the terms contained in the LICENSE file.
-.\"
-.Dd April 24, 2008
-.Dt RC-sstat 8 SMM
-.Os OpenRC
-.Sh NAME
-.Nm rc-sstat
-.Nd show status info about services supervised by s6 then rc-status
-info
-.Sh SYNOPSIS
-.Nm
-.Sh DESCRIPTION
-.Nm
-gathers and displays information about the status of services supervised
-by s6 then runs rc-status to show info about nnormal OpenRC services.
-.Pp
-.Sh EXIT STATUS
-.Nm
-exits 1 if there is an internal error or exits with the same exit codes
-as rc-status.
-.Sh SEE ALSO
-.Xr rc-status 8 ,
-.Xr rc-update 8
-.Sh AUTHORS
-.An William Hubbs <w.d.hubbs@gmail.com>
--- a/man/rc-status.8
+++ b/man/rc-status.8
@@ -1,12 +1,25 @@
-.\" 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
+.\" Copyright (c) 2007-2009 Roy Marples
 .\"
-.\" 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.
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
 .\"
 .Dd April 24, 2008
 .Dt RC-STATUS 8 SMM
--- a/Show More
+++ b/Show More