update ChangeLog

Before this commit, using * in rc_env_allow did not work.

This fixes #60.

AUTHORS

@@ -0,0 +1,99 @@
+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>

FEATURE-REMOVAL-SCHEDULE.md

@@ -53,9 +53,26 @@ Who:
 
 ## the mtab service script
 
-When: make warnings more visible in 1.0, remove in 2.0
+When: force /etc/mtab to link to /proc/self/mounts in 1.0, remove
+	  service 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:
+

HISTORY.md

@@ -54,4 +54,9 @@ 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

LICENSE

@@ -0,0 +1,24 @@
+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.

Makefile

@@ -1,6 +1,12 @@
-# OpenRC Makefile
-# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# 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.
 
 TOP:=		${dir ${realpath ${firstword ${MAKEFILE_LIST}}}}
 MK=			${TOP}/mk

Makefile.inc

@@ -1,3 +1,3 @@
 NAME=		openrc
-VERSION=	0.18
+VERSION=	0.20.5
 PKG=		${NAME}-${VERSION}

NEWS.md

@@ -3,6 +3,52 @@
 This file will contain a list of notable changes for each release. Note
 the information in this file is in reverse order.
 
+## 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

conf.d/Makefile

@@ -1,7 +1,7 @@
 include ../mk/net.mk
 
 DIR=	${CONFDIR}
-CONF=	bootmisc fsck hostname localmount mount netmount urandom tmpfiles \
+CONF=	bootmisc fsck hostname localmount netmount urandom tmpfiles \
 		${CONF-${OS}}
 
 ifeq (${MKNET},yes)
@@ -15,7 +15,8 @@ include ${MK}/os.mk
 
 CONF-FreeBSD=	ipfw moused powerd rarpd savecore syscons
 
-CONF-Linux=	consolefont devfs dmesg hwclock keymaps killprocs modules
+CONF-Linux=	consolefont devfs dmesg hwclock keymaps killprocs modules mtab \
+	net-online
 
 CONF-NetBSD=	moused rarpd savecore
 

conf.d/bootmisc

@@ -8,3 +8,8 @@ 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 dmesc.old
+# This may be useful if you need to compare the current boot to the
+# previous one.
+#previous_dmesg=no

conf.d/fsck

@@ -32,3 +32,9 @@ 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"

conf.d/localmount

@@ -1,3 +1,9 @@
 # Stop the unmounting of certain points.
 # This could be useful for some NFS related work.
 #no_umounts="/dir1:/var/dir2"
+#
+# Ignore errors when mounting local file systems.
+# This should be left alone unless you know what you are doing. If it is
+# set to yes, not only will we allow mount failures, but we will ignore
+# syntax errors in fstab.
+#ignore_mount_errors="NO"

conf.d/mount

@@ -1,23 +0,0 @@
-# The mount service is a multiplexed service. This means you must have
-# symbolic links to it in your init.d directory for each file system you
-# want to mount. I recommend naming those symbolic links the same as the
-# paths to the file systems they mount, removing the leading slash and
-# substituting _ for the remaining slashes, for example:
-#
-# cd /etc/init.d
-# ln -s mount mount.usr
-# ln -s mount mount.usr_local
-#
-# Set up a symbolic link like this for each file system you wish to
-# mount, then add the symbolic link to the appropriate runlevel. Once
-# that is done, add the appropriate definitions for the file system to
-# this file.
-#
-#You will need to define the mountpoint and any dependencies for each
-#filesystem as shown here.
-#
-#If the mountpoint does not match an entry in fstab, the mount will be
-#ignored.
-#
-#mount_usr_mountpoint="/usr"
-#

conf.d/mtab

@@ -0,0 +1,5 @@
+# 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

conf.d/net-online

@@ -0,0 +1,15 @@
+# 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

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"
 #

etc/rc.conf.Linux

@@ -3,9 +3,11 @@
 
 # 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
@@ -62,12 +64,21 @@ 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

etc/rc.conf.in

@@ -29,17 +29,20 @@
 # come up.
 #rc_depend_strict="YES"
 
-# rc_hotplug is a list of services that we allow to be hotplugged.
-# By default we do not allow hotplugging.
+# rc_hotplug controls which services we allow to be hotplugged.
 # A hotplugged service is one started by a dynamic dev manager when a matching
 # hardware device is found.
-# This service is intrinsically included in the boot runlevel.
-# To disable services, prefix with a !
+# 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.
 # Example - rc_hotplug="net.wlan !net.*"
-# 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="*"
+# 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.
 
 # rc_logger launches a logging daemon to log the entire rc process to
 # /var/log/rc.log

etc/rc.devd

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

etc/rc.in

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

etc/rc.shutdown.in

@@ -1,6 +1,13 @@
 #!@SHELL@
-# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# 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.
 
 # Handle interrupts
 trap : SIGINT SIGQUIT

init.d.misc/avahi-dnsconfd.in

@@ -1,6 +1,13 @@
 #!@SBINDIR@/openrc-run
-# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# 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.
 
 command=@PKG_PREFIX@/sbin/avahi-dnsconfd
 command_args="$avahi_dnsconfd_args -D"
@@ -10,6 +17,6 @@ name="Avahi DNS Configuration Daemon"
 depend()
 {
 	use dns
-	need mount.usr mount.var dbus
+	need localmount dbus
 	after bootmisc
 }

init.d.misc/avahid.in

@@ -1,6 +1,13 @@
 #!@SBINDIR@/openrc-run
-# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# 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.
 
 command=@PKG_PREFIX@/sbin/avahi-daemon
 command_args="$avahid_args -D"
@@ -10,6 +17,6 @@ name="Avahi Service Advertisement Daemon"
 depend()
 {
 	use dns
-	need mount.usr mount.var dbus
+	need localmount dbus
 	after bootmisc
 }

init.d.misc/dbus.in

@@ -1,6 +1,13 @@
 #!@SBINDIR@/openrc-run
-# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# 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.
 
 command=@PKG_PREFIX@/bin/dbus-daemon
 pidfile=@VARBASE@/run/dbus/pid
@@ -9,7 +16,7 @@ name="Message Bus Daemon"
 
 depend()
 {
-	need mount.usr mount.var net
+	need localmount net
 	after bootmisc
 }
 

init.d.misc/dhcpcd.in

@@ -1,6 +1,13 @@
 #!@SBINDIR@/openrc-run
-# Copyright (c) 2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# 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.
 
 command=/sbin/dhcpcd
 pidfile=/var/run/dhcpcd.pid
@@ -10,7 +17,7 @@ name="DHCP Client Daemon"
 depend()
 {
 	provide net
-	need mount.usr mount.var
+	need localmount
 	use logger
 	after bootmisc modules
 	before dns

init.d.misc/dnsmasq.in

@@ -1,6 +1,13 @@
 #!@SBINDIR@/openrc-run
-# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# 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.
 
 command=@PKG_PREFIX@/sbin/dnsmasq
 command_args=$dnsmasq_args
@@ -12,7 +19,7 @@ extra_started_commands="reload"
 depend()
 {
 	provide dns
-	need mount.usr mount.var net
+	need localmount net
 	after bootmisc
 }
 

init.d.misc/hald.in

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

init.d.misc/named.in

@@ -1,6 +1,13 @@
 #!@SBINDIR@/openrc-run
-# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# 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.
 
 command=/usr/sbin/named
 command_args=$named_args
@@ -24,7 +31,7 @@ esac
 depend()
 {
 	provide dns
-	need mount.usr mount.var
+	need localmount
 	after bootmisc
 }
 

init.d.misc/ntpd.in

@@ -1,6 +1,13 @@
 #!@SBINDIR@/openrc-run
-# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# 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.
 
 : ${ntpd_config:=/etc/ntp.conf}
 : ${ntpd_drift:=/var/db/ntpd.drift}
@@ -14,7 +21,7 @@ name="Network Time Protocol Daemon"
 depend()
 {
 	use dns
-	need mount.usr mount.var
+	need localmount
 	after bootmisc ntp-client
 }
 

init.d.misc/openvpn.in

@@ -1,6 +1,13 @@
 #!@SBINDIR@/openrc-run
-# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# 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.
 
 vpn=${RC_SVCNAME#*.}
 name="OpenVPN"
@@ -31,7 +38,7 @@ fi
 
 depend()
 {
-	need mount.usr mount.var net
+	need localmount net
 	use dns
 	after bootmisc
 }

init.d.misc/polkitd.in

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

init.d.misc/sshd.in

@@ -1,6 +1,13 @@
 #!@SBINDIR@/openrc-run
-# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# 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.
 
 command=/usr/sbin/sshd
 command_args=$sshd_args

init.d.misc/wpa_supplicant.in

@@ -1,6 +1,13 @@
 #!@SBINDIR@/openrc-run
-# Copyright (c) 2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# 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.
 
 command=/usr/sbin/wpa_supplicant
 : ${wpa_supplicant_conf:=/etc/wpa_supplicant.conf}
@@ -10,7 +17,7 @@ name="WPA Supplicant Daemon"
 
 depend()
 {
-	need mount.usr mount.var
+	need localmount
 	use logger
 	after bootmisc modules
 	before dns dhcpcd net

init.d/.gitignore

@@ -1,10 +1,10 @@
+binfmt
 bootmisc
 fsck
 hostname
 local
 localmount
 loopback
-mount
 moused
 netmount
 network
@@ -23,9 +23,11 @@ killprocs
 modules
 mount-ro
 mtab
+net-online
 numlock
 osclock
 procfs
+s6-svscan
 staticroute
 sysfs
 devdb

init.d/Makefile

@@ -2,7 +2,7 @@ include ../mk/net.mk
 
 DIR=	${INITDIR}
 SRCS=	bootmisc.in fsck.in hostname.in local.in localmount.in loopback.in \
-	mount.in netmount.in osclock.in root.in savecache.in swap.in swapfiles.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}}
 BIN=	${OBJS}
 
@@ -23,7 +23,7 @@ SRCS-FreeBSD+=	adjkerntz.in devd.in dumpon.in encswap.in ipfw.in \
 
 SRCS-Linux=	binfmt.in devfs.in dmesg.in hwclock.in consolefont.in keymaps.in \
 		killprocs.in modules.in mount-ro.in mtab.in numlock.in \
-		procfs.in sysfs.in termencoding.in tmpfiles.dev.in
+		procfs.in net-online.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 \

init.d/adjkerntz.in

@@ -1,6 +1,13 @@
 #!@SBINDIR@/openrc-run
-# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# 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.
 
 extra_commands="save"
 

init.d/binfmt.in

@@ -1,6 +1,13 @@
 #!@SBINDIR@/openrc-run
-# Copyright 2015 William Hubbs <w.d.hubbs@gmail.com>
-# Released under the 2-clause BSD license.
+# 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="Register misc binary format handlers"
 
@@ -16,5 +23,5 @@ start()
 	ebegin "Loading custom binary format handlers"
 	"$RC_LIBEXECDIR"/sh/binfmt.sh
 	eend $?
-return 0
+	return 0
 }

init.d/bootmisc.in

@@ -1,10 +1,17 @@
 #!@SBINDIR@/openrc-run
-# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# Copyright (c) 2007-2015 The OpenRC Authors.
+# See the Authors file at the top-level directory of this distribution and
+# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+#
+# This file is part of OpenRC. It is subject to the license terms in
+# the LICENSE file found in the top-level directory of this
+# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# This file may not be copied, modified, propagated, or distributed
+# except according to the terms contained in the LICENSE file.
 
 depend()
 {
-	need mount.usr mount.var
+	need localmount
 	before logger
 	after clock root sysctl
 	keyword -prefix -timeout
@@ -121,11 +128,11 @@ clean_run()
 	local dir
 	# If / is still read-only due to a problem, this will fail!
 	if ! checkpath -W /; then
-		eerror "/ is not writable; unable to clean up underlying /run"
+		ewarn "/ is not writable; unable to clean up underlying /run"
 		return 1
 	fi
 	if ! checkpath -W /tmp; then
-		eerror "/tmp is not writable; unable to clean up underlying /run"
+		ewarn "/tmp is not writable; unable to clean up underlying /run"
 		return 1
 	fi
 	# Now we know that we can modify /tmp and /
@@ -136,13 +143,12 @@ 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
-		rm -rf $dir
+		umount $dir && rmdir $dir
 	else
 		rc=1
 	fi
 	if [ $rc -ne 0 ]; then
-		eerror "Could not clean up underlying /run on /"
+		ewarn "Could not clean up underlying /run on /"
 		return 1
 	fi
 }
@@ -217,6 +223,9 @@ start()
 			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
 					;;

init.d/consolefont.in

@@ -1,13 +1,20 @@
 #!@SBINDIR@/openrc-run
-# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# 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.
 
 description="Sets a font for the consoles."
 
 depend()
 {
-	need mount.usr mount.var termencoding
-	after hotplug bootmisc
+	need localmount termencoding
+	after hotplug bootmisc modules
 	keyword -openvz -prefix -systemd-nspawn -uml -vserver -xenu -lxc
 }
 

init.d/devd.in

@@ -1,13 +1,20 @@
 #!@SBINDIR@/openrc-run
-# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# 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.
 
 command=/sbin/devd
 command_args=$devd_args
 name="Device State Change Daemon"
 
 depend() {
-	need mount.usr mount.var
+	need localmount
 	after bootmisc
 	before net.lo0
 	keyword -jail -prefix

init.d/devdb.in

@@ -1,12 +1,19 @@
 #!@SBINDIR@/openrc-run
-# Copyright (c) 2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# 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.
 
 description="Creates the dev database"
 
 depend()
 {
-	need mount.usr mount.var
+	need localmount
 }
 
 start()

init.d/devfs.in

@@ -1,6 +1,13 @@
 #!@SBINDIR@/openrc-run
-# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# 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.
 
 description="Set up the /dev directory"
 

init.d/dmesg.in

@@ -1,6 +1,13 @@
 #!@SBINDIR@/openrc-run
-# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# 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.
 
 description="Set the dmesg level for a cleaner boot"
 

init.d/dumpon.in

@@ -1,6 +1,13 @@
 #!@SBINDIR@/openrc-run
-# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# 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.
 
 description="Configures a specific kernel dump device."
 

init.d/fsck.in

@@ -1,6 +1,13 @@
 #!@SBINDIR@/openrc-run
-# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# 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.
 
 description="Check and repair filesystems according to /etc/fstab"
 _IFS="
@@ -13,7 +20,7 @@ depend()
 }
 
 _abort() {
-	rc-abort
+	yesno ${fsck_abort_on_errors:-yes} && rc-abort
 	return 1
 }
 

init.d/hostid.in

@@ -1,6 +1,13 @@
 #!@SBINDIR@/openrc-run
-# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# 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.
 
 extra_commands="reset"
 : ${hostid_file:=/etc/hostid}

init.d/hostname.in

@@ -1,6 +1,13 @@
 #!@SBINDIR@/openrc-run
-# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# 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.
 
 description="Sets the hostname of the machine."
 

init.d/hwclock.in

@@ -1,6 +1,13 @@
 #!@SBINDIR@/openrc-run
-# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# 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.
 
 extra_commands="save show"
 

init.d/ipfw.in

@@ -1,6 +1,13 @@
 #!@SBINDIR@/openrc-run
-# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# 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.
 
 # This is based on /etc/rc.firewall and /etc/rc.firewall6 from FreeBSD
 

init.d/keymaps.in

@@ -1,12 +1,19 @@
 #!@SBINDIR@/openrc-run
-# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# 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.
 
 description="Applies a keymap for the consoles."
 
 depend()
 {
-	need mount.usr mount.var termencoding
+	need localmount termencoding
 	after bootmisc
 	keyword -openvz -prefix -systemd-nspawn -uml -vserver -xenu -lxc
 }

init.d/killprocs.in

@@ -1,6 +1,13 @@
 #!@SBINDIR@/openrc-run
-# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# 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.
 
 description="Kill all processes so we can unmount disks cleanly."
 

init.d/local.in

@@ -1,6 +1,13 @@
 #!@SBINDIR@/openrc-run
-# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# 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.
 
 description="Executes user programs in @SYSCONFDIR@/local.d"
 

init.d/localmount.in

@@ -1,6 +1,13 @@
 #!@SBINDIR@/openrc-run
-# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# 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.
 
 description="Mounts disks and swap according to /etc/fstab."
 
@@ -15,7 +22,7 @@ depend()
 start()
 {
 	# Mount local filesystems in /etc/fstab.
-	local types="noproc" x= no_netdev=
+	local types="noproc" x= no_netdev= rc=
 	for x in $net_fs_list $extra_net_fs_list; do
 		types="${types},no${x}"
 	done
@@ -29,9 +36,16 @@ start()
 	ebegin "Mounting local filesystems"
 	mount -at "$types" $no_netdev
 	eend $? "Some local filesystem failed to mount"
-
-	# Always return 0 - some local mounts may not be critical for boot
-	return 0
+	rc=$?
+	if [ "$RC_UNAME" != Linux ]; then
+		rc=0
+	elif yesno "${ignore_mount_errors:-NO}"; then
+		if [ $rc -ne 0 ]; then
+			ewarn "localmount: errors detected, but ignored"
+		fi
+		rc=0
+	fi
+	return $rc
 }
 
 stop()
@@ -70,17 +84,19 @@ stop()
 			sync
 		fi
 
-		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')"
+		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_}"
 			aufs_mount_point="$(mountinfo -o ${aufs_si_id})"
-			for x in $aufs_si_dir/br[0-9][0-9][0-9]; do
+			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
 				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

init.d/loopback.in

@@ -1,6 +1,13 @@
 #!@SBINDIR@/openrc-run
-# Copyright (c) 2013 William Hubbs <w.d.hubbs@gmail.com>
-# Released under the 2-clause BSD license.
+# 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.
 
 description="Configures the loopback interface."
 

init.d/mixer.in

@@ -1,12 +1,19 @@
 #!@SBINDIR@/openrc-run
-# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# 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.
 
 extra_commands="restore"
 
 depend()
 {
-	need mount.usr mount.var
+	need localmount
 	keyword -jail -prefix
 }
 

init.d/modules.in

@@ -1,6 +1,13 @@
 #!@SBINDIR@/openrc-run
-# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# 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.
 
 description="Loads a user defined list of kernel modules."
 

init.d/mount-ro.in

@@ -1,6 +1,13 @@
 #!@SBINDIR@/openrc-run
-# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# 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.
 
 description="Re-mount filesytems read-only for a clean reboot."
 

init.d/mount.in

@@ -1,118 +0,0 @@
-#!@SBINDIR@/openrc-run
-# Copyright (c) 2015 William Hubbs <w.d.hubbs@gmail.com>
-# Released under the 2-clause BSD license.
-
-description="Mount a file system defined in @SYSCONFDIR@/fstab"
-extra_commands="generate"
-
-depend()
-{
-	need fsck
-	use modules mtab
-	after modules
-	keyword -jail -prefix -vserver -lxc
-}
-
-. "$RC_LIBEXECDIR"/sh/rc-mount.sh
-
-start_pre()
-{
-	# Do not start this service as "mount"
-	if [ "$rc_svcname" = mount ]; then
-		eerror "The mount service should not be started directly"
-		return 1
-	fi
-	return 0
-}
-
-start()
-{
-	if [ "$rc_svcname" = mount-generate-symlinks ]; then
-		generate
-		return $?
-	fi
-
-	local mountname=${rc_svcname#*.}
-	local fspath=${mount_${mountname}_mountpoint}
-
-	# for now, make sure fspath is in fstab
-	if [ ! fstabinfo -q $fspath ]; then
-		einfo "$rc_svcname: $fspath is not in @SYSCONFDIR@/fstab"
-		return 0
-	fi
-
-	# Is the file system mounted?
-	if mountinfo -q $fspath; then
-		action=remount
-		msg=Remounting
-	else
-		action=mount
-		msg=Mounting
-	fi
-
-	ebegin "$msg $fspath according to @SYSCONFDIR@/fstab"
-	fstabinfo --$action $fspath
-	eend $? "$fspath failed to $action"
-}
-
-stop_pre()
-{
-	# Do not stop this service as "mount"
-	if [ "$rc_svcname" = mount ]; then
-		eerror "The mount service should not be stopped directly"
-		return 1
-	fi
-	return 0
-}
-
-stop()
-{
-	yesno $RC_GOINGDOWN || return 0
-	local mountname=${rc_svcname#*.}
-	local fspath=${mount_${mountname}_mountpoint}
-
-	# make sure fspath is in fstab
-	if ! fstabinfo -q $fspath; then
-		einfo "$rc_svcname: $fspath is not in @SYSCONFDIR@/fstab"
-		return 0
-	fi
-
-	# Is the file system mounted?
-	mountinfo -q $fspath || return 0
-
-	# Flush all pending disk writes now
-	sync
-
-	ebegin "Unmounting $fspath"
-	do_unmount umount $fspath
-	eend $? "Unable to umount $fspath"
-	return 0
-}
-
-generate()
-{
-	local fslist="$(fstabinfo)"
-	local fs fsopts rc=0
-	local svcpath=${RC_SVCNAME%/*}
-	ebegin "Generating mount symlinks"
-	for fs in $fslist; do
-		case $fs in
-		/) ;;
-		/*)
-			fsopts="$(fstabinfo -o $fs)"
-			case "$fsopts" in
-			*noauto*) ;;
-			*)
-				local name="${fs#/}"
-				name="$(echo $name | sed 's#/#.#g')"
-				einfo ln -snf mount "${svcpath}/${name}"
-				rc=$?
-				[ $rc -ne 0 ] && break
-			*) ;;
-			esac
-		*) ;;
-		esac
-	done
-	eend $rc "Failed to generate symlinks for all mounts"
-	return $rc
-}

init.d/moused.in

@@ -1,6 +1,13 @@
 #!@SBINDIR@/openrc-run
-# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# 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.
 
 mouse=${RC_SVCNAME##*.}
 if [ -n "$mouse" -a "$mouse" != "moused" ]; then
@@ -14,7 +21,7 @@ name="Console Mouse Daemon"
 
 depend()
 {
-	need mount.usr mount.var
+	need localmount
 	after bootmisc
 	keyword -jail -prefix
 }

init.d/mtab.in

@@ -1,6 +1,13 @@
 #!@SBINDIR@/openrc-run
-# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# 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.
 
 description="Update /etc/mtab to match what the kernel knows about"
 
@@ -12,21 +19,19 @@ depend()
 
 start()
 {
-	[ -L /etc/mtab ] && return 0
 	local rc=0
 	ebegin "Updating /etc/mtab"
 	if ! checkpath -W /etc; then
 		rc=1
-	elif [ ! -e /etc/mtab ]; then
+	elif ! yesno ${mtab_is_file:-no}; then
+		[ ! -L /etc/mtab ] && [ -f /etc/mtab ] &&
+			ewarn "Removing /etc/mtab file"
+		einfo "Creating mtab symbolic link"
 		ln -snf /proc/self/mounts /etc/mtab
 	else
-		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
-
+		[ -L /etc/mtab ] && ewarn "Removing /etc/mtab symbolic link"
+		rm -f /etc/mtab
+		einfo "Creating mtab file"
 		# 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

init.d/net-online.in

@@ -0,0 +1,76 @@
+#!@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 -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"
+}

init.d/netmount.in

@@ -1,13 +1,28 @@
 #!@SBINDIR@/openrc-run
-# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# 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.
 
 description="Mounts network shares according to /etc/fstab."
 
 depend()
 {
-	config /etc/fstab
-	use afc-client amd nfsclient autofs openvpn
+	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
 	use dns
 	keyword -jail -prefix -systemd-nspawn -vserver -lxc
 }
@@ -27,7 +42,10 @@ start()
 		rc=$?
 	fi
 	ewend $rc "Could not mount all network filesystems"
-	return 0
+	if [ "$RC_UNAME" != Linux ]; then
+		rc=0
+	fi
+	return $rc
 }
 
 stop()

init.d/network.in

@@ -1,6 +1,13 @@
 #!@SBINDIR@/openrc-run
-# Copyright (c) 2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# 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.
 
 # This script was inspired by the equivalent rc.d network from NetBSD.
 
@@ -10,7 +17,7 @@ __nl="
 
 depend()
 {
-	need mount.usr mount.var
+	need localmount
 	after bootmisc
 	if [ -n "$(interfaces)" ]; then
 		provide net

init.d/newsyslog.in

@@ -1,12 +1,19 @@
 #!@SBINDIR@/openrc-run
-# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# 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.
 
 required_files="/etc/newsyslog.conf"
 
 depend()
 {
-	need mount.usr mount.var
+	need localmount
 	keyword -prefix
 }
 

init.d/nscd.in

@@ -1,6 +1,13 @@
 #!@SBINDIR@/openrc-run
-# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# 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.
 
 command=/usr/sbin/nscd
 command_args=$nscd_args
@@ -10,7 +17,7 @@ name="Name Service Cache Daemon"
 extra_started_commands="flush"
 
 depend() {
-	need mount.usr mount.var
+	need localmount
 	use net dns ldap ypbind
 	after bootmisc
 }

init.d/numlock.in

@@ -1,6 +1,13 @@
 #!@SBINDIR@/openrc-run
-# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# 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.
 
 description="Turns numlock on for the consoles."
 
@@ -8,7 +15,7 @@ ttyn=${rc_tty_number:-${RC_TTY_NUMBER:-12}}
 
 depend()
 {
-	need mount.usr mount.var
+	need localmount
 	keyword -openvz -prefix -systemd-nspawn -vserver -lxc
 }
 

init.d/osclock.in

@@ -1,6 +1,13 @@
 #!@SBINDIR@/openrc-run
-# Copyright (c) 2014 Ralph Sennhauser <sera@igentoo.org>
-# Released under the 2-clause BSD license.
+# 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.
 
 # Can be used on OSs that take care of the clock.
 

init.d/pf.in

@@ -1,6 +1,13 @@
 #!@SBINDIR@/openrc-run
-# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# 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.
 
 name="Packet Filter"
 : ${pf_conf:=${pf_rules:-/etc/pf.conf}}
@@ -10,7 +17,7 @@ extra_commands="checkconfig showstatus"
 extra_started_commands="reload"
 
 depend() {
-	need mount.usr mount.var
+	need localmount
 	keyword -jail -prefix
 }
 

init.d/powerd.in

@@ -1,6 +1,13 @@
 #!@SBINDIR@/openrc-run
-# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# 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.
 
 command=/usr/sbin/powerd
 command_args=$powerd_args
@@ -9,7 +16,7 @@ name="Power Control Daemon"
 
 depend()
 {
-	need mount.usr mount.var
+	need localmount
 	use logger
 	after bootmisc
 	keyword -jail -prefix

init.d/procfs.in

@@ -1,13 +1,20 @@
 #!@SBINDIR@/openrc-run
-# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# 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.
 
 description="Mounts misc filesystems in /proc."
 
 depend()
 {
 	use modules devfs
-	need mount.usr mount.var
+	need localmount
 	keyword -openvz -prefix -systemd-nspawn -vserver -lxc
 }
 

init.d/rarpd.in

@@ -1,6 +1,13 @@
 #!@SBINDIR@/openrc-run
-# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# 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.
 
 command=/usr/sbin/rarpd
 command_args="-f $rarpd_args"
@@ -17,7 +24,7 @@ command_background=YES
 
 depend()
 {
-	need mount.usr mount.var
+	need localmount
 	after bootmisc
 	need net
 }

init.d/rc-enabled.in

@@ -1,10 +1,17 @@
 #!@SBINDIR@/openrc-run
-# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# Copyright (c) 2007-2015 The OpenRC Authors.
+# See the Authors file at the top-level directory of this distribution and
+# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+#
+# This file is part of OpenRC. It is subject to the license terms in
+# the LICENSE file found in the top-level directory of this
+# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# This file may not be copied, modified, propagated, or distributed
+# except according to the terms contained in the LICENSE file.
 
 depend()
 {
-	need mount.usr mount.var net
+	need localmount net
 	after *
 	before local
 	keyword -prefix

init.d/root.in

@@ -1,6 +1,13 @@
 #!@SBINDIR@/openrc-run
-# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# 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.
 
 description="Mount the root fs read/write"
 

init.d/rpcbind.in

@@ -1,6 +1,13 @@
 #!@SBINDIR@/openrc-run
-# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# 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.
 
 command=/usr/sbin/rpcbind
 command_args=$rpcbind_args
@@ -9,7 +16,7 @@ name="RPC program number mapper"
 depend()
 {
 	provide rpc
-	need mount.usr mount.var
+	need localmount
 	use net logger dns
 	before inetd xinetd ntpd ntp-client
 }

init.d/s6-svscan.in

@@ -1,6 +1,13 @@
 #!@SBINDIR@/openrc-run
-# Copyright (C) 2015 William Hubbs <w.d.hubbs@gmail.com>
-# Released under the 2-clause BSD license.
+# 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
@@ -9,7 +16,7 @@ pidfile=/var/run/s6-svscan.pid
 
 depend()
 {
-	need mount.usr mount.var
+	need localmount
 }
 
 start_pre()

init.d/savecache.in

@@ -1,49 +1,66 @@
 #!@SBINDIR@/openrc-run
-# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# 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.
 
 description="Saves the caches OpenRC uses to non volatile storage"
 
 start()
 {
 	if [ -e "$RC_SVCDIR"/clock-skewed ]; then
-		ewarn "WARNING: clock skew detected!"
+		ewarn "Clock skew detected!"
 		if ! yesno "${RC_GOINGDOWN}"; then
 			eerror "Not saving deptree cache"
 			return 1
 		fi
 	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"
+	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
 			return 1
 		fi
-		return 0
-	fi
-	ebegin "Saving dependency cache"
-	local rc=
-	if [ ! -d "$RC_LIBEXECDIR"/cache ]; then
 		rm -rf "$RC_LIBEXECDIR"/cache
 		if ! mkdir -p "$RC_LIBEXECDIR"/cache; then
-			rc=$?
+			eerror "Unable to create $RC_LIBEXECDIR/cache"
+			eerror "Unable to save dependency cache"
 			if yesno "${RC_GOINGDOWN}"; then
-				rc=0
+				return 0
 			fi
-			eend $rc "Unable to create $RC_LIBEXECDIR/cache"
-			return $rc
+			return 1
 		fi
 	fi
-	local save=
+	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
+	fi
+	ebegin "Saving dependency cache"
+	local rc=0 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 2>/dev/null
+		cp -p $save "$RC_LIBEXECDIR"/cache
+		rc=$?
 	fi
-	rc=$?
 	if yesno "${RC_GOINGDOWN}"; then
-		rc=0
+		if [ $rc -ne 0 ]; then
+			eerror "Unable to save dependency cache"
+		fi
+		eend 0
 	fi
-	eend $rc
+	eend $rc "Unable to save dependency cache"
 }

init.d/savecore.in

@@ -1,12 +1,19 @@
 #!@SBINDIR@/openrc-run
-# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# 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.
 
 description="Saves a kernel dump."
 
 depend()
 {
-	need dumpon mount.usr mount.var
+	need dumpon localmount
 	before encswap
 	keyword -jail -prefix
 }

init.d/staticroute.in

@@ -1,6 +1,13 @@
 #!@SBINDIR@/openrc-run
-# Copyright (c) 2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# 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.
 
 # This script was inspired by the equivalent rc.d staticroute from NetBSD.
 

init.d/swap-blk.in

@@ -1,6 +1,13 @@
 #!@SBINDIR@/openrc-run
-# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# Copyright (c) 2007-2015 The OpenRC Authors.
+# See the Authors file at the top-level directory of this distribution and
+# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+#
+# This file is part of OpenRC. It is subject to the license terms in
+# the LICENSE file found in the top-level directory of this
+# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# This file may not be copied, modified, propagated, or distributed
+# except according to the terms contained in the LICENSE file.
 
 depend()
 {

init.d/swap.in

@@ -1,10 +1,17 @@
 #!@SBINDIR@/openrc-run
-# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# Copyright (c) 2007-2015 The OpenRC Authors.
+# See the Authors file at the top-level directory of this distribution and
+# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+#
+# This file is part of OpenRC. It is subject to the license terms in
+# the LICENSE file found in the top-level directory of this
+# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# This file may not be copied, modified, propagated, or distributed
+# except according to the terms contained in the LICENSE file.
 
 depend()
 {
-	before mount.usr mount.var
+	before localmount
 	keyword -jail -openvz -prefix -systemd-nspawn -vserver -lxc
 }
 

init.d/swapfiles.in

@@ -1,10 +1,17 @@
 #!@SBINDIR@/openrc-run
-# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# Copyright (c) 2007-2015 The OpenRC Authors.
+# See the Authors file at the top-level directory of this distribution and
+# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+#
+# This file is part of OpenRC. It is subject to the license terms in
+# the LICENSE file found in the top-level directory of this
+# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# This file may not be copied, modified, propagated, or distributed
+# except according to the terms contained in the LICENSE file.
 
 depend()
 {
-	need mount.usr mount.var
+	need localmount
 	keyword -jail -openvz -prefix -systemd-nspawn -vserver -lxc
 }
 

init.d/swclock.in

@@ -1,6 +1,13 @@
 #!@SBINDIR@/openrc-run
-# Copyright (c) 2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# 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.
 
 description="Sets the local clock to the mtime of a given file."
 

init.d/syscons.in

@@ -1,9 +1,16 @@
 #!@SBINDIR@/openrc-run
-# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# Copyright (c) 2007-2015 The OpenRC Authors.
+# See the Authors file at the top-level directory of this distribution and
+# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+#
+# This file is part of OpenRC. It is subject to the license terms in
+# the LICENSE file found in the top-level directory of this
+# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# This file may not be copied, modified, propagated, or distributed
+# except according to the terms contained in the LICENSE file.
 
 depend() {
-	need mount.usr mount.var
+	need localmount
 	keyword -jail -prefix
 }
 

init.d/sysctl.BSD.in

@@ -1,6 +1,13 @@
 #!@SBINDIR@/openrc-run
-# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# Copyright (c) 2007-2015 The OpenRC Authors.
+# See the Authors file at the top-level directory of this distribution and
+# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+#
+# This file is part of OpenRC. It is subject to the license terms in
+# the LICENSE file found in the top-level directory of this
+# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# This file may not be copied, modified, propagated, or distributed
+# except according to the terms contained in the LICENSE file.
 
 depend()
 {

init.d/sysctl.GNU-kFreeBSD.in

@@ -1,6 +1,13 @@
 #!@SBINDIR@/openrc-run
-# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# Copyright (c) 2007-2015 The OpenRC Authors.
+# See the Authors file at the top-level directory of this distribution and
+# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+#
+# This file is part of OpenRC. It is subject to the license terms in
+# the LICENSE file found in the top-level directory of this
+# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# This file may not be copied, modified, propagated, or distributed
+# except according to the terms contained in the LICENSE file.
 
 depend()
 {

init.d/sysctl.GNU.in

@@ -1,6 +1,13 @@
 #!@PREFIX@/sbin/openrc-run
-# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# Copyright (c) 2007-2015 The OpenRC Authors.
+# See the Authors file at the top-level directory of this distribution and
+# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+#
+# This file is part of OpenRC. It is subject to the license terms in
+# the LICENSE file found in the top-level directory of this
+# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# This file may not be copied, modified, propagated, or distributed
+# except according to the terms contained in the LICENSE file.
 #FIXME: Modify for GNU/Hurd
 
 depend()

init.d/sysctl.Linux.in

@@ -1,6 +1,13 @@
 #!@SBINDIR@/openrc-run
-# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# Copyright (c) 2007-2015 The OpenRC Authors.
+# See the Authors file at the top-level directory of this distribution and
+# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+#
+# This file is part of OpenRC. It is subject to the license terms in
+# the LICENSE file found in the top-level directory of this
+# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# This file may not be copied, modified, propagated, or distributed
+# except according to the terms contained in the LICENSE file.
 
 depend()
 {

init.d/sysfs.in

@@ -1,6 +1,13 @@
 #!@SBINDIR@/openrc-run
-# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# 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.
 
 description="Mount the sys filesystem."
 
@@ -61,16 +68,6 @@ 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
@@ -108,6 +105,16 @@ 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
@@ -116,7 +123,7 @@ mount_cgroups()
 		mount -n -t cgroup \
 			-o none,${sysfs_opts},name=openrc,release_agent="$agent" \
 			openrc /sys/fs/cgroup/openrc
-		echo 1 > /sys/fs/cgroup/openrc/notify_on_release
+		printf 1 > /sys/fs/cgroup/openrc/notify_on_release
 	fi
 
 	yesno ${rc_controller_cgroups:-YES} && [ -e /proc/cgroups ] || return 0

init.d/syslogd.in

@@ -1,6 +1,13 @@
 #!@SBINDIR@/openrc-run
-# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# 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.
 
 command=/usr/sbin/syslogd
 command_args=$syslogd_args
@@ -14,7 +21,7 @@ depend()
 {
 	provide logger
 	use net newsyslog
-	need mount.usr mount.var
+	need localmount
 	after bootmisc
 	keyword -prefix
 }

init.d/termencoding.in

@@ -1,6 +1,13 @@
 #!@SBINDIR@/openrc-run
-# Copyright (c) 2008-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# 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.
 
 description="Configures terminal encoding."
 

init.d/tmpfiles.setup.in

@@ -6,7 +6,7 @@ description="Set up tmpfiles.d entries"
 
 depend()
 {
-	need mount.usr mount.var
+	need localmount
 }
 
 start()

init.d/ttys.in

@@ -1,6 +1,13 @@
 #!@SBINDIR@/openrc-run
-# Copyright (c) 2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# 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.
 
 depend()
 {

init.d/urandom.in

@@ -1,13 +1,20 @@
 #!@SBINDIR@/openrc-run
-# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# 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.
 
 : ${urandom_seed:=${URANDOM_SEED:-/var/lib/misc/random-seed}}
 description="Initializes the random number generator."
 
 depend()
 {
-	need mount.usr mount.var
+	need localmount
 	keyword -jail -lxc -openvz -prefix -systemd-nspawn
 }
 

init.d/wscons.in

@@ -1,10 +1,17 @@
 #!@SBINDIR@/openrc-run
-# Copyright (c) 2008-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# Copyright (c) 2007-2015 The OpenRC Authors.
+# See the Authors file at the top-level directory of this distribution and
+# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+#
+# This file is part of OpenRC. It is subject to the license terms in
+# the LICENSE file found in the top-level directory of this
+# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# This file may not be copied, modified, propagated, or distributed
+# except according to the terms contained in the LICENSE file.
 
 depend()
 {
-	need mount.usr mount.var
+	need localmount
 	keyword -prefix
 }
 

man/einfo.3

@@ -1,25 +1,12 @@
-.\" Copyright (c) 2007-2008 Roy Marples
+.\" 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
 .\"
-.\" 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.
+.\" 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 Mar 16, 2008
 .Dt EINFO 3 SMM

man/openrc-run.8

@@ -1,25 +1,12 @@
-.\" Copyright (c) 2007-2009 Roy Marples
+.\" 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
 .\"
-.\" 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.
+.\" 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 December 31, 2011
 .Dt openrc-run 8 SMM
@@ -166,24 +153,28 @@ 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 to it to add to that
-dependency type, or prefix it with ! to remove it.
+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.
 .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 we use that have been added
+The service will attempt to start any services it uses 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
-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.
+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.
 .It Ic config
 We should recalculate our dependencies if the listed files have changed.
 .It Ic keyword
@@ -213,6 +204,8 @@ 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
@@ -221,6 +214,11 @@ 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
@@ -462,6 +460,9 @@ 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
@@ -487,8 +488,8 @@ _need_dbus()
 
 depend()
 {
-    # We write a pidfile and to /var/cache, so we need mount.var.
-    need mount.var
+    # We write a pidfile and to /var/cache, so we need localmount.
+    need localmount
     # We can optionally use the network, but it's not essential.
     use net
     # We should be after bootmisc so that /var/run is cleaned before

man/openrc.8

@@ -1,25 +1,12 @@
-.\" Copyright (c) 2007-2009 Roy Marples
+.\" 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
 .\"
-.\" 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.
+.\" 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 May 2, 2009
 .Dt OPENRC 8 SMM

man/rc-service.8

@@ -1,25 +1,12 @@
-.\" Copyright (c) 2008-2009 Roy Marples
+.\" 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
 .\"
-.\" 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.
+.\" 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 May 1, 2009
 .Dt RC-SERVICE 8 SMM

man/rc-sstat.8

@@ -1,25 +1,12 @@
-.\" Copyright (c) 2015 William Hubbs
+.\" 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
 .\"
-.\" 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.
+.\" 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

man/rc-status.8

@@ -1,25 +1,12 @@
-.\" Copyright (c) 2007-2009 Roy Marples
+.\" 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
 .\"
-.\" 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.
+.\" 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-STATUS 8 SMM