update ChangeLog

selinux: fix SIGSEGV with invalid contexts
Fixes: https://github.com/openrc/openrc/issues/104
2016-11-17 12:10:47 -06:00 · 2016-11-17 12:05:34 -06:00 · 2016-11-17 12:05:17 -06:00 · 2016-11-03 16:27:33 -05:00 · 2016-11-03 13:26:19 -05:00 · 2016-11-03 13:20:48 -05:00
299 changed files with 11193 additions and 12157 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-*.bz2
+*.gz

 *.diff
 *.patch
--- a/99
+++ b/99
@@ -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>
--- a/BUSYBOX.md
+++ b/BUSYBOX.md
@@ -0,0 +1,29 @@
+# Using Busybox as your Default Shell with OpenRC
+
+If you have/bin/sh linked to busybox, you need to be aware of several
+incompatibilities between busybox's applets and the standalone
+counterparts. Since it is possible to configure busybox to not include
+these applets or to prefer the standalone counterparts, OpenRC does not
+attempt to support the busybox applets.
+
+For now, it is recommended that you disable the following busybox
+configuration settings for best results with OpenRC.
+
+CONFIG_START_STOP_DAEMON -- The start-stop-daemon applet is not compatible with
+start-stop-daemon in OpenRC.
+
+CONFIG_MOUNT -- The mount applet does not support the -O [no]_netdev options to
+skip over or include network file systems when the -a option is present.
+
+CONFIG_UMOUNT -- The umount applet does not support the -O option along with -a.
+
+CONFIG_SWAPONOFF -- The swapon applet does not support the -e option
+or recognize the nofail option in fstab.
+
+CONFIG_SETFONT -- The setfont applet does not support the -u option from kbd.
+
+CONFIG_BB_SYSCTL -- The sysctl applet does not support the --system command
+line switch.
+
+There is work to get most of these supported by busybox, so this file
+will be updated as things change.
--- a/1442
+++ b/1442
--- a/49
+++ b/49
@@ -1,49 +0,0 @@
-The following is a list of files and features that are going to be removed in
-the source tree.  Every entry should contain what exactly is going away, why it
-is happening, and who is going to be doing the work.  When the feature is
-removed, it should also be removed from this file.
-
---------------------------
-
-What: oldnet ADSL rp-pppoe mode
-
-When: undecided
-
-Why: Replaced by the oldnet PPP module
-
-Who:  Robin H. Johnson <robbat2@gentoo.org>
-
---------------------------
-
-What: oldnet /etc/conf.d/wireless
-
-When: undecided
-
-Why: All configuration moved to /etc/conf.d/net
-
-Who:  Robin H. Johnson <robbat2@gentoo.org>
-
---------------------------
-
-What: Service pause action
-
-When: Removed already, compatbility warning in place.
-
-Why: ...
-
-Who:
-
---------------------------
-
-What: Service --startas, --chuid , --oknodo
-
-When: undecided
-
-Why: Obsolete or replaced by other options.
-	 --startas => use --name or --exec
-	 --chuid => use --user
-	 --oknodo => ignore return code instead
-
-Who:
-
---------------------------
--- a/FEATURE-REMOVAL-SCHEDULE.md
+++ b/FEATURE-REMOVAL-SCHEDULE.md
@@ -0,0 +1,78 @@
+# Features Scheduled for Removal
+
+The following is a list of files and features that are going to be removed in
+the source tree.  Every entry should contain what exactly is going away, why it
+is happening, and who is going to be doing the work.  When the feature is
+removed, it should also be removed from this file.
+
+## Service pause action
+
+When: 1.0
+
+Why: The same affect can be obtained with the --nodeps option to stop.
+
+Who:
+
+## start-stop-daemon options --startas, --chuid , --oknodo
+
+When: 1.0
+
+Why: Obsolete or replaced by other options.
+
+* --startas => use --name or --exec
+* --chuid => use --user
+* --oknodo => ignore return code instead
+
+Who:
+
+## runscript and rc symbolic links
+
+When: 1.0
+
+Why: Deprecated in favor of openrc-run and openrc due to naming
+	 conflicts with other software.
+
+Who:
+
+## support for the opts variable in service scripts
+
+When: 1.0
+
+Why: Deprecated in favor of extra_commands, extra_started_commands
+	 and extra_stopped_commands.
+
+Who:
+
+## support for local_start and local_stop
+
+When: 1.0
+
+Why: Deprecated in favor of executable scripts in @SYSCONFDIR@/local.d
+
+Who:
+
+## the mtab service script
+
+When: force /etc/mtab to link to /proc/self/mounts in 1.0, remove
+	  service in 2.0
+
+Why: /etc/mtab should be a symbolic link to /proc/self/mounts on modern
+	 Linux systems
+
+Who:
+
+## C API Functions in rc.h
+
+If you have a c program that links to librc and uses functions from
+there, this section will list API functions which are deprecated and
+will be removed along with the reason they are being removed.
+
+### rc_getline()
+
+When: 1.0
+
+Why: The getline() function was standardized in POSIX.1-2008, so it
+	 should be available on POSIX systems.
+
+Who:
+
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -0,0 +1,62 @@
+# OpenRC History
+
+This history of OpenRC was written by Daniel Robbins, Roy Marples, William
+Hubbs and others.
+
+The Gentoo modular init scripts were developed by Daniel Robbins for Gentoo
+Linux 1.0_rc6 during most of 2001 and released in September 2001. After their
+development, the dependency-based init script system was maintained by a
+number of senior developers, starting with Azarah (Martin Schlemmer), with
+migration to the new init system assisted by Woodchip (Donnie Davies) who
+converted all ebuild init scripts to work with the new system. As Grant
+Goodyear notes: 
+
+"My recollection is that one of woodchip's more impressive early feats
+was the complete replacement of all of the init scripts in Portage
+for Gentoo Linux 1.0_rc6. Through 1.0_rc5 Gentoo had used fairly
+standard rc scripts modified from Stampede Linux, but for 1.0_rc6 Daniel
+Robbins (drobbins) and Martin Schlemmer (azarah) had created a new
+dependency-based init script system that is still used today. Within a
+span of days Donny rewrote every single init script in the Portage tree
+and committed new masked packages to await the release of 1.0_rc6. Thanks to
+woodchip (and drobbins and azarah, of course) the
+transition to the new init scripts was nearly painless." [1] 
+
+Roy Marples became a Gentoo/Linux developer in 2004 and wrote the modular
+network scripts for the Gentoo baselayout package. Towards the end of 2005,
+he became the primary maintainer for baselayout and the init scripts. 
+
+At the start of 2007, He announced the ongoing development of
+baselayout-2, containing a rewritten core coded in C and allowing POSIX sh
+init scripts instead of forcing the use of bash. By mid 2007, He had
+re-implemented the Gentoo init script design created by Daniel Robbins,
+using an entirely new code base. Alpha and pre-release baselayout-2
+snapshots were added to Gentoo's Portage tree as an optional component.
+
+Toward the end of 2007, Roy retired as a Gentoo developer.
+Baselayout-2 was still in the pre stage, and aside from the gentoo-fbsd
+users, it was masked. However, He desired to keep the baselayout-2
+project moving forward as an independent project. The Gentoo Council
+permitted Him to release OpenRC under the 2-clause BSD license,
+managed by him as an external project. 
+
+Around mid-2010, Roy decided to no longer maintain OpenRC. At this
+point, he transferred development back to Gentoo.
+
+William Hubbs, and several other Gentoo developers,  started working on
+OpenRC around this point and brought OpenRC-0.8.x to Gentoo Linux's stable
+tree in 2011.
+
+In 2013 the OpenRC team became independent from Gentoo again and moved primary
+development to github.
+
+Daniel Robbins continues to maintain an independent, forked
+version of OpenRC for Funtoo Linux, which includes a Funtoo-specific network
+configuration system. 
+
+On 17-Dec-2015 utc, Roy gave the OpenRC developers permission to replace his
+copyrights in all source files with a generic Copyright assertion for
+the OpenRC developers as long as we keep the original copyright in the
+binaries and  LICENSE file.
+
+[1] http://www.gentoo.org/news/en/gwn/20040426-newsletter.xml
--- a/24
+++ b/24
@@ -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.
--- a/25
+++ b/25
@@ -1,16 +1,20 @@
-# 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.

-include Makefile.inc
+TOP:=		${dir ${realpath ${firstword ${MAKEFILE_LIST}}}}
+MK=			${TOP}/mk
+
+include ${TOP}/Makefile.inc

 SUBDIR=		conf.d etc init.d local.d man scripts sh src sysctl.d

-# Build our old net foo or not
-ifeq (${MKNET},oldnet)
-SUBDIR+=	net doc
-endif
-
 # Build pkgconfig or not
 MKPKGCONFIG?=	yes
 ifeq (${MKPKGCONFIG},yes)
@@ -22,12 +26,11 @@ SUBDIR+=	runlevels

 INSTALLAFTER=	_installafter

-MK= 		mk
 include ${MK}/sys.mk
 include ${MK}/os.mk
 include ${MK}/subdir.mk
 include ${MK}/dist.mk
-include ${MK}/git.mk
+include ${MK}/gitver.mk

 _installafter:
 ifeq (${MKPREFIX},yes)
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -1,3 +1,3 @@
 NAME=		openrc
-VERSION=	0.11
+VERSION=	0.22.4
 PKG=		${NAME}-${VERSION}
--- a/NEWS.md
+++ b/NEWS.md
@@ -0,0 +1,149 @@
+# OpenRC NEWS
+
+This file will contain a list of notable changes for each release. Note
+the information in this file is in reverse order.
+
+## OpenRC-0.22
+
+In previous versions of OpenRC, configuration information was processed
+so that service-specific configuration stored in /etc/conf.d/* was
+overridden by global configuration stored in /etc/rc.conf. This release
+reverses that. Global configuration is now overridden by
+service-specific configuration.
+
+The swapfiles service, which was basically a copy of the swap service,
+has been removed. If you are only using swap partitions, this change
+will not affect you. If you are using swap files, please adjust the
+dependencies of the swap service as shown in /etc/conf.d/swap.
+
+## OpenRC-0.21
+
+This version adds a daemon supervisor which can start daemons and
+restart them if they crash. See supervise-daemon-guide.md in the
+distribution for details on its use.
+
+It is now possible to mark certain mount points as critical. If these
+mount points are unable to be mounted, localmount or netmount will fail.
+This is handled in /etc/conf.d/localmount and /etc/conf.d/netmount. See
+these files for the setup.
+
+The deprecation messages in 0.13.x for runscript and rc are now
+made visible in preparation for the removal of these binaries in 1.0.
+
+The steps you should take to get rid of these warnings is to run openrc
+in initialization steps instead of rc and change the shebang lines in
+service scripts to refer to "openrc-run" instead of "runscript".
+
+In 0.21.4, a modules-load service was added. This works like the
+equivalent service in systemd. It looks for files named *.conf first in
+/usr/lib/modules-load.d, then /run/modules-load.d, then
+/etc/modules-load.d. These files contain a list of modules, one per
+line, which should be loaded into the kernel. If a file name appears in
+/run/modules-load.d, it overrides a file of the same name in
+/usr/lib/modules-load.d. A file appearing in /etc/modules-load.d
+overrides a file of the same name in both previous directories.
+
+## OpenRC-0.19
+
+This version adds a net-online service. By default, this
+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
+kernel, has been separated from the procfs service. This service will be
+automatically added to the boot runlevel for new Linux installs. When
+you upgrade, you will need to use rc-update to add it to your boot
+runlevel.
+
+The procfs service no longer automounts the deprecated usbfs and
+usbdevfs file systems. Nothing should be using usbdevfs any longer, and
+if you still need usbfs it can be added to fstab.
+
+Related to the above change, the procfs service no longer attempts to
+modprobe the usbcore module. If your device manager does not load it,
+you will need to configure the modules service to do so.
+
+The override order of binfmt.d and tmpfiles.d directories has been
+changed to match systemd. Files in /run/binfmt.d and /run/tmpfiles.d
+override their /usr/lib counterparts, and files in the /etc counterparts
+override both /usr/lib and /run.
+
+## OpenRC-0.13.2
+
+A chroot variable has been added to the service script variables.
+This fixes the support for running a service in a chroot.
+This is documented in man 8 openrc-run.
+
+The netmount service now mounts nfs file systems.
+This change was made to correct a fix for an earlier bug.
+
+## OpenRC-0.13
+
+/sbin/rc was renamed to /sbin/openrc and /sbin/runscript was renamed to
+/sbin/openrc-run due to naming conflicts with other software.
+
+Backward compatible symbolic links are currently in place so your
+system will keep working if you are using the old names; however, it is
+strongly advised that you migrate to the new names because the symbolic
+links will be removed in the future.
+Warnings have been added to assist with this migration; however, due to the
+level of noise they produce, they only appear in verbose mode in this release.
+
+The devfs script now handles the initial mounting and setup of the
+/dev directory. If /dev has already been mounted by the kernel or an
+initramfs, devfs will remount /dev with the correct mount options
+instead of mounting a second /dev over the existing mount point.
+
+It attempts to mount /dev from fstab first if an entry exists there. If
+it doesn't it attempts to mount devtmpfs if it is configured in the
+kernel. If not, it attempts to mount tmpfs.
+If none of these is available, an error message is displayed and static
+/dev is assumed.
+
+## OpenRC-0.12
+
+The net.* scripts, originally from Gentoo Linux, have
+been removed. If you need these scripts, look for a package called
+netifrc, which is maintained by them.
--- a/88
+++ b/88
@@ -1,88 +0,0 @@
-OpenRC README
-
-
-Installation
------------
-make install
-Yup, that simple. Works with GNU make.
-
-You may wish to tweak the installation with the below arguments
-PROGLDFLAGS=-static
-LIBNAME=lib64
-DESTDIR=/tmp/openrc-image
-MKNET=oldnet
-MKPAM=pam
-MKPREFIX=yes
-MKPKGCONFIG=no
-MKSELINUX=yes
-MKSTATICLIBS=no
-MKTERMCAP=ncurses
-MKTERMCAP=termcap
-PKG_PREFIX=/usr/pkg
-LOCAL_PREFIX=/usr/local
-PREFIX=/usr/local
-
-We don't support building a static OpenRC with PAM.
-You may need to use PROGLDFLAGS=-Wl,-Bstatic on glibc instead of just -static.
-If you debug memory under valgrind, add -DDEBUG_MEMORY to your CPPFLAGS
-so that all malloc memory should be freed at exit.
-If you are building OpenRC for a Gentoo Prefix installation, add
-MKPREFIX=yes.
-
-You can also brand OpenRC if you so wish like so
-BRANDING=\"Gentoo/$(uname -s)\"
-
-PKG_PREFIX should be set to where packages install to by default.
-LOCAL_PREFIX should be set when to where user maintained packages are.
-Only set LOCAL_PREFIX if different from PKG_PREFIX.
-PREFIX should be set when OpenRC is not installed to /.
-
-If any of the following files exist then we do not overwrite them
-/etc/devd.conf
-/etc/rc
-/etc/rc.shutdown
-/etc/conf.d/*
-
-rc and rc.shutdown are the hooks from the BSD init into OpenRC.
-devd.conf is modified from FreeBSD to call /etc/rc.devd which is a generic
-hook into OpenRC.
-inittab is the same, but for SysVInit as used by most Linux distributions.
-This can be found in the support folder.
-Obviously, if you're installing this onto a system that does not use OpenRC
-by default then you may wish to backup the above listed files, remove them
-and then install so that the OS hooks into OpenRC.
-
-init.d.misc is not installed by default as the scripts will need
-tweaking on a per distro basis. They are also non essential to the operation
-of the system.
-
-
-Reporting Bugs
--------------
-Since Gentoo Linux is hosting OpenRC development, Bugs should go to
-the Gentoo Bugzilla:
-	http://bugs.gentoo.org/
-They should be filed under the "Gentoo Hosted Projects" product and
-the "openrc" component.
-
-
-History - by Roy Marples
------------------------
-I became a Gentoo/Linux developer in 2004 and wrote the modular network
-scripts for the Gentoo baselayout package. baselayout is a collection of
-bash scripts to bring up your computer and its services.
-Then towards the end of 2005 I found myself as the primary maintainer
-for baselayout.
-
-At the start of 2007, baselayout-2 is announced to the world, re-writing the
-core of baselayout in C and allowing POSIX sh init scripts instead of
-forcing the use of bash. By Mid 2007 I have re-written everything, including
-init scripts, and alpha and pre baselayout-2 snapshots where put into Gentoo.
-Towards the end of 2007 I retired as a Gentoo developer for reasons I won't
-go into here. baselayout-2 was still in the pre stage, and aside from the
-fbsd users, it was masked everywhere. However, I also desired to keep the
-baselayout-2 project alive, but outside of Gentoo and into other projects
-such as FreeBSD.
-
-As such, the Gentoo Council have allowed the creation of OpenRC under the
-2 clause BSD license, managed by me as an external project.
--- a/README.md
+++ b/README.md
@@ -0,0 +1,96 @@
+# OpenRC README
+
+OpenRC is a dependency-based init system that works with the
+system-provided init program, normally `/sbin/init`. Currently, it does
+not have an init program of its own.
+
+## Installation
+
+OpenRC requires GNU make.
+
+Once you have GNU Make installed, the default OpenRC installation can be
+executed using this command:
+
+make install
+
+## Configuration
+
+You may wish to configure the installation by passing one or more of the
+below arguments to the make command
+
+```
+PROGLDFLAGS=-static
+LIBNAME=lib64
+DESTDIR=/tmp/openrc-image
+MKNET=no
+MKPAM=pam
+MKPREFIX=yes
+MKPKGCONFIG=no
+MKSELINUX=yes
+MKSTATICLIBS=no
+MKTERMCAP=ncurses
+MKTERMCAP=termcap
+MKTOOLS=yes
+PKG_PREFIX=/usr/pkg
+LOCAL_PREFIX=/usr/local
+PREFIX=/usr/local
+BRANDING=\"Gentoo/$(uname -s)\"
+```
+
+## Notes
+
+We don't support building a static OpenRC with PAM.
+
+You may need to use `PROGLDFLAGS=-Wl,-Bstatic` on glibc instead of just `-static`.
+
+If you are building OpenRC for a Gentoo Prefix installation, add `MKPREFIX=yes`.
+
+`PKG_PREFIX` should be set to where packages install to by default.
+
+`LOCAL_PREFIX` should be set when to where user maintained packages are.
+Only set `LOCAL_PREFIX` if different from `PKG_PREFIX`.
+
+`PREFIX` should be set when OpenRC is not installed to /.
+
+If any of the following files exist then we do not overwrite them
+
+```
+/etc/devd.conf
+/etc/rc
+/etc/rc.shutdown
+/etc/conf.d/*
+```
+
+`rc` and `rc.shutdown` are the hooks from the BSD init into OpenRC.
+
+`devd.conf` is modified from FreeBSD to call `/etc/rc.devd` which is a
+generic hook into OpenRC.
+
+`inittab` is the same, but for SysVInit as used by most Linux distributions.
+This can be found in the support folder.
+
+Obviously, if you're installing this onto a system that does not use
+OpenRC by default then you may wish to backup the above listed files,
+remove them and then install so that the OS hooks into OpenRC.
+
+`init.d.misc` is not installed by default as the scripts will need
+tweaking on a per distro basis. They are also non essential to the
+operation of the system.
+
+## Reporting Bugs
+
+If you are using Gentoo Linux, bugs can be filed on their bugzilla under
+the `gentoo hosted projects` product and the `openrc` component [1].
+Otherwise, you can report issues on our github [2].
+
+Better yet, if you can contribute code, please feel free to submit pull
+requests [3].
+
+## IRC Channel
+
+We have an official irc channel, #openrc on freenode, feel free to join
+us there.
+
+[1]	https://bugs.gentoo.org/
+[2]	https://github.com/openrc/openrc/issues
+[3]	https://github.com/openrc/openrc/pulls
--- a/README.newnet
+++ b/README.newnet
@@ -1,7 +1,3 @@
-The following applies only to the newnet stack, which is not presently
-maintained in OpenRC. The oldnet stack is maintained instead.
- Robin H. Johnson <robbat2@gentoo.org>, 2011/02/21
-
 OpenRC Network Ideals
 ---------------------

--- a/STYLE-GUIDE.md
+++ b/STYLE-GUIDE.md
@@ -1,23 +1,23 @@
+# OpenRC Style Guide
+
 This is the openrc style manual.  It governs the coding style of all code
 in this repository.  Follow it.  Contact openrc@gentoo.org for any questions
 or fixes you might notice.

-##########
-# C CODE #
-##########
+## C CODE

-The BSD Kernel Normal Form (KNF) style is used:
-	http://en.wikipedia.org/wiki/Indent_style#BSD_KNF_style
-Basically, it's like K&R/LKML, but wrapped lines that are indented use 4 spaces.
+The BSD Kernel Normal Form (KNF) style is used [1]. Basically, it is like
+K&R/LKML, but wrapped lines that are indented use 4 spaces. Here are the
+highlights.

-Highlights:
-	- no trailing whitespace
-	- indented code use tabs (not line wrapped)
-	- cuddle the braces (except for functions)
-	- space after native statements and before paren (for/if/while/...)
-	- no space between function and paren
-	- pointer asterisk cuddles the variable, not the type
+- no trailing whitespace
+- indented code use tabs (not line wrapped)
+- cuddle the braces (except for functions)
+- space after native statements and before paren (for/if/while/...)
+- no space between function and paren
+- pointer asterisk cuddles the variable, not the type

+```
 void foo(int c)
 {
 	int ret = 0;
@@ -32,16 +32,15 @@ void foo(int c)

 	return ret;
 }
+```

-##################
-# COMMIT MESSAGES #
-##################
+## COMMIT MESSAGES

 The following is an example of a correctly formatted git commit message
 for this repository. Most of this information came from this blog post
-[1], so I would like to thank the author.
+[2], so I would like to thank the author.

-### cut here ###
+```
 Capitalized, short (50 chars or less) summary

 More detailed explanatory text, if necessary.  Wrap it to about 72
@@ -51,7 +50,7 @@ line separating the summary from the body is critical (unless you omit
 the body entirely); tools like rebase can get confused if you run the
 two together.

-Write your commit message in the present tense: "Fix bug" and not "Fixed
+Write your commit message in the imperative: "Fix bug" and not "Fixed
 bug."  This convention matches up with commit messages generated by
 commands like git merge and git revert.

@@ -67,7 +66,7 @@ Further paragraphs come after blank lines.
 Reported-by: User Name <email>
 X-[Distro]-Bug: BugID
 X-[Distro]-Bug-URL: URL for the bug (on the distribution's web site typically)
-### cut here ###
+```

 If you did not write the code and the patch does not include authorship
 information in a format git can use, please use the --author option of the
@@ -81,5 +80,5 @@ different from the author and committer.
  *BSD. Also, [Distro] should be replaced with the name of the
  distribution, e.g. X-Gentoo-Bug.

-[1] http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
-
+[1]	http://en.wikipedia.org/wiki/Indent_style#BSD_KNF_style
+[2] http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
--- a/conf.d/.gitignore
+++ b/conf.d/.gitignore
@@ -1,2 +0,0 @@
-network
-staticroute
--- a/conf.d/Makefile
+++ b/conf.d/Makefile
@@ -1,25 +1,21 @@
-DIR=	${CONFDIR}
-CONF=	bootmisc fsck hostname localmount urandom tmpfilesd ${CONF-${OS}}
+include ../mk/net.mk

-ifeq (${MKNET},)
+DIR=	${CONFDIR}
+CONF=	bootmisc fsck hostname localmount netmount swap urandom tmpfiles \
+		${CONF-${OS}}
+
+ifeq (${MKNET},yes)
 CONF+= network staticroute
-TARGETS+=	network staticroute
-CLEANFILES+=	network staticroute
 endif

 MK=	../mk
 include ${MK}/os.mk

-CONF-FreeBSD=	ipfw moused powerd rarpd savecore syscons
+CONF-FreeBSD=	ipfw modules moused powerd rarpd savecore syscons

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

 CONF-NetBSD=	moused rarpd savecore

 include ${MK}/scripts.mk
-
-network: network.in network${SFX}
-	cat $^ > $@
-
-staticroute: staticroute${SFX}
-	cp $@${SFX} $@
--- a/conf.d/bootmisc
+++ b/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 dmesg.old
+# This may be useful if you need to compare the current boot to the
+# previous one.
+#previous_dmesg=no
--- a/conf.d/devfs
+++ b/conf.d/devfs
@@ -0,0 +1,8 @@
+# OpenRC will attempt each of the following in succession to mount /dev.
+#
+# 1. If there is an entry for /dev in fstab, it will be used.
+# 2. If devtmpfs is defined in the kernel, it will be used.
+# 3. If tmpfs is defined in the kernel, it will be used.
+#
+# Set this to yes if you do not want OpenRC to attempt to mount /dev.
+# skip_mount_dev="NO"
--- a/conf.d/fsck
+++ b/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"
--- a/conf.d/hwclock
+++ b/conf.d/hwclock
@@ -7,8 +7,8 @@ clock="UTC"
 # If you want the hwclock script to set the system time (software clock)
 # to match the current hardware clock during bootup, leave this
 # commented out.
-# However, you can set this to "NO" ifyou are running a modern kernel
-# with CONFIG_RTC_HCTOSYS set to y and your hardware clock set to UTC.
+# However, you can set this to "NO" if you are running a modern kernel
+# and using NTP to synchronize your system clock.
 #clock_hctosys="YES"

 # If you do not want to set the hardware clock to the current system
--- a/conf.d/keymaps
+++ b/conf.d/keymaps
@@ -18,6 +18,6 @@ extended_keymaps=""
 # For a list of valid sets, run `dumpkeys --help`
 dumpkeys_charset=""

-# Some fonts map AltGr-E to the currency symbol ¤ instead of the Euro €
+# Some fonts map AltGr-E to the currency symbol instead of the Euro.
 # To fix this, set to "yes"
 fix_euro="NO"
--- a/conf.d/localmount
+++ b/conf.d/localmount
@@ -1,3 +1,10 @@
 # Stop the unmounting of certain points.
 # This could be useful for some NFS related work.
 #no_umounts="/dir1:/var/dir2"
+#
+# Mark certain mount points as critical.
+# This contains aspace separated list of mount points which should be
+# considered critical. If one of these mount points cannot be mounted,
+# localmount will fail.
+# By default, this is empty.
+#critical_mounts="/home /var"
--- a/conf.d/modules
+++ b/conf.d/modules
@@ -1,18 +1,22 @@
-# You can define a list modules for a specific kernel version,
-# a released kernel version, a main kernel version or just a list.
+# Linux users can define a list of modules for a specific kernel version,
+# a released kernel version, a main kernel version or all kernel versions.
 # The most specific versioned variable will take precedence.
+# FreeBSD users can only use the modules="foo bar" setting.
 #modules_2_6_23_gentoo_r5="ieee1394 ohci1394"
 #modules_2_6_23="tun ieee1394"
 #modules_2_6="tun"
 #modules_2="ipv6"
 #modules="ohci1394"

-# You can give modules a different name when they load - the new name
+# Linux users can give modules a different name when they load - the new name
 # will also be used to pick arguments below.
+# This is not supported on FreeBSD.
 #modules="dummy:dummy1"

-# Give the modules some arguments if needed, per version if necessary.
+# Linux users can give the modules some arguments if needed, per version
+# if necessary.
 # Again, the most specific versioned variable will take precedence.
+# This is not supported on FreeBSD.
 #module_ieee1394_args="debug"
 #module_ieee1394_args_2_6_23_gentoo_r5="debug2"
 #module_ieee1394_args_2_6_23="debug3"
--- a/conf.d/mtab
+++ b/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
--- a/conf.d/net
+++ b/conf.d/net
@@ -1,4 +0,0 @@
-# This blank configuration will automatically use DHCP for any net.*
-# scripts in /etc/init.d.  To create a more complete configuration,
-# please review /usr/share/doc/openrc*/net.example* and save your configuration
-# in /etc/conf.d/net (this file :]!).
--- a/conf.d/net-online
+++ b/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. The
+# default is all interfaces that support ethernet.
+#interfaces=""
+
+# This setting controls whether a ping to the default gateway is
+# included in the test for network connectivity after all interfaces
+# are active.
+#ping_default_gateway=no
+
+# The timeout setting controls how long the net-online service waits
+# for the network to be configured.
+# The default is 120 seconds.
+# if this is set to 0, the wait is infinite.
+#timeout=120
--- a/conf.d/netmount
+++ b/conf.d/netmount
@@ -0,0 +1,47 @@
+# You will need to set the dependencies in the netmount script to match
+# the network configuration tools you are using. This should be done in
+# this file by following the examples below, and not by changing the
+# service script itself.
+#
+# Each of these examples is meant to be used separately. So, for
+# example, do not set rc_need to something like "net.eth0 dhcpcd".
+#
+# If you are using newnet and configuring your interfaces with static
+# addresses with the network script, you  should use this setting.
+#
+#rc_need="network"
+#
+# If you are using oldnet, you must list the specific net.* services you
+# need.
+#
+# This example assumes all of your netmounts can be reached on
+# eth0.
+#
+#rc_need="net.eth0"
+#
+# This example assumes some of your netmounts are on eth1 and some
+# are on eth2.
+#
+#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
+# manage the network interfaces with the routes to your netmounts, you
+# should list that tool.
+#
+#rc_need="NetworkManager"
+#rc_need="dhcpcd"
+#rc_need="wicd"
+#
+# The default setting is designed to be backward compatible with our
+# current setup, but you are highly discouraged from using this. In
+# other words, please change it to be more suited to your system.
+#
+rc_need="net"
+#
+# Mark certain mount points as critical.
+# This contains aspace separated list of mount points which should be
+# considered critical. If one of these mount points cannot be mounted,
+# netmount will fail.
+# By default, this is empty.
+#critical_mounts="/home /var"
--- a/conf.d/network
+++ b/conf.d/network
@@ -0,0 +1,80 @@
+# Assign static IP addresses and run custom scripts per interface.
+# Seperate commands with ;
+# Prefix with ! to run a shell script.
+# Use \$int to represent the interface
+#ifconfig_eth0="192.168.0.10 netmask 255.255.255.0"
+
+# You also have ifup_eth0 and ifdown_eth0 to run other commands when
+# eth0 is started and stopped.
+# You should note that we don't stop the network at system shutdown by default.
+# If you really need this, then set keep_network=NO
+
+# Lastly, the interfaces variable pulls in virtual interfaces that cannot
+# be automatically detected.
+#interfaces="br0 bond0 vlan0"
+
+# You can also use files instead of variables here if you like:
+# /etc/ifconfig.eth0 is equivalent to ifconfig_eth0
+# /etc/ip.eth0 is equivalent to ifconfig_eth0
+# /etc/ifup.eth0 is equivalent to ifup_eth0
+# /etc/ifdown.eth0 is equivalent to ifdown_eth0
+# Any files found will automatically be put into the interfaces variable.
+# You don't need to escape variables in files, so use $int instead of \$int.
+
+# If you require DHCP, you should install dhcpcd and add it to the boot or
+# default runlevel.
+
+# NIS users can set the domain name here
+#domainname="foobar"
+
+# You can add a default route.
+# The way this is done is slightly different depending on the operating system.
+#
+# *BSD:
+#defaultroute="192.168.0.1"
+#defaultroute6="2001:a:b:c"
+#Hurd/Linux (ifconfig):
+#defaultroute="gw 192.168.0.1"
+#defaultroute6="gw 2001:a:b:c"
+
+# The remainder of this file applies to Linux only and shows how
+# iproute2 is supported along with other examples.
+
+# ifconfig under Linux is not that powerful and doesn't easily handle
+# multiple addresses
+# On the other hand, iproute2 is quite powerful and is also supported
+#ip_eth0="192.168.0.10/24; 192.168.10.10/24"
+
+# You can also use iproute2 to add the default route.
+#defaultiproute="via 192.168.0.1"
+#defaultiproute6="via 2001:a:b:c"
+
+# ip doesn't handle MTU like ifconfig, but we can do it like so
+#ifup_eth0="ip link set \$int mtu 1500"
+
+# Create a bonded interface
+#interfaces="bond0"
+#ifup_bond0="modprobe bonding; ifconfig \$int up; ifenslave \$int bge0"
+#ifconfig_bond0="192.168.0.10 netmask 255.255.255.0"
+#ifdown_bond0="rmmod bonding"
+
+# Create tap interface and a bridge interface.
+# We add the tap to the bridge.
+# An external program, like dhcpcd, will configure the IP on the bridge
+#interfaces="tun0 br0"
+#ifup_tun0="tunctl -t \$int"
+#ifdown_tun0="tunctl -d \$int"
+#ifup_br0="brctl addbr \$int; brctl add \$int eth1; brtctl add \$int eth2"
+#ifdown_br0="ifconfig \$int down; btctl delbr \$int"
+
+# Create VLAN
+#interfaces="eth0_2 eth0_3 eth0_4"
+#ifup_eth0="vconfig add \$int 2; vconfig add \$int 3; vconfig add \$int 4"
+#ifconfig_eth0_2="192.168.2.10 netmask 255.255.255.0"
+#ifconfig_eth0_3="192.168.3.10 netmask 255.255.255.0"
+#ifconfig_eth0_4="192.168.4.10 netmask 255.255.255.0"
+#ifdown_eth0="vconfig rem \$int.2; vconfig rem \$int.3; vconfig rem \$int.4"
+
+# Normally you would use wpa_supplicant to configure wireless, but you can
+# use iwconfig also
+#ifup_wlan0="iwconfig \$int key s:secretkey enc open essid foobar"
--- a/conf.d/network.BSD.in
+++ b/conf.d/network.BSD.in
@@ -1,4 +0,0 @@
-
-# You can assign a default route
-#defaultroute="192.168.0.1"
-#defaultroute6="2001:a:b:c"
--- a/conf.d/network.Linux.in
+++ b/conf.d/network.Linux.in
@@ -1,43 +0,0 @@
-
-# You can assign a default route
-#defaultroute="gw 192.168.0.1"
-#defaultroute6="gw 2001:a:b:c"
-
-# ifconfig under Linux is not that powerful and doesn't easily handle
-# multiple addresses
-# On the other hand, ip (iproute2) is quite powerful and is also supported
-#ip_eth0="192.168.0.10/24; 192.168.10.10/24"
-
-# You can also use ip to add the default route.
-#defaultiproute="via 192.168.0.1"
-#defaultiproute6="via 2001:a:b:c"
-
-# ip doesn't handle MTU like ifconfig, but we can do it like so
-#ifup_eth0="ip link set \$int mtu 1500"
-
-# Create a bonded interface
-#interfaces="bond0"
-#ifup_bond0="modprobe bonding; ifconfig \$int up; ifenslave \$int bge0"
-#ifconfig_bond0="192.168.0.10 netmask 255.255.255.0"
-#ifdown_bond0="rmmod bonding"
-
-# Create tap interface and a bridge interface.
-# We add the tap to the bridge.
-# An external program, like dhcpcd, will configure the IP on the bridge
-#interfaces="tun0 br0"
-#ifup_tun0="tunctl -t \$int"
-#ifdown_tun0="tunctl -d \$int"
-#ifup_br0="brctl addbr \$int; brctl add \$int eth1; brtctl add \$int eth2"
-#ifdown_br0="ifconfig \$int down; btctl delbr \$int"
-
-# Create VLAN
-#interfaces="eth0_2 eth0_3 eth0_4"
-#ifup_eth0="vconfig add \$int 2; vconfig add \$int 3; vconfig add \$int 4"
-#ifconfig_eth0_2="192.168.2.10 netmask 255.255.255.0"
-#ifconfig_eth0_3="192.168.3.10 netmask 255.255.255.0"
-#ifconfig_eth0_4="192.168.4.10 netmask 255.255.255.0"
-#ifdown_eth0="vconfig rem \$int.2; vconfig rem \$int.3; vconfig rem \$int.4"
-
-# Normally you would use wpa_supplicant to configure wireless, but you can
-# use iwconfig also
-#ifup_wlan0="iwconfig \$int key s:secretkey enc open essid foobar"
--- a/conf.d/network.in
+++ b/conf.d/network.in
@@ -1,28 +0,0 @@
-# Assign static IP addresses and run custom scripts per interface.
-# Seperate commands with ;
-# Prefix with ! to run a shell script.
-# Use \$int to represent the interface
-#ifconfig_eth0="192.168.0.10 netmask 255.255.255.0"
-
-# You also have ifup_eth0 and ifdown_eth0 to run other commands when
-# eth0 is started and stopped.
-# You should note that we don't stop the network at system shutdown by default.
-# If you really need this, then set shutdown_network=YES
-
-# Lastly, the interfaces variable pulls in virtual interfaces that cannot
-# be automatically detected.
-#interfaces="br0 bond0 vlan0"
-
-# You can also use files instead of variables here if you like:
-# /etc/ifconfig.eth0 is equivalent to ifconfig_eth0
-# /etc/ip.eth0 is equivalent to ifconfig_eth0
-# /etc/ifup.eth0 is equivalent to ifup_eth0
-# /etc/ifdown.eth0 is equivalent to ifdown_eth0
-# Any files found will automatically be put into the interfaces variable.
-# You don't need to escape variables in files, so use $int instead of \$int.
-
-# If you require DHCP, you should install dhcpcd and it to the boot or
-# default runlevel.
-
-# NIS users can set the domain name here
-#domainname="foobar"
--- a/conf.d/staticroute
+++ b/conf.d/staticroute
@@ -0,0 +1,26 @@
+# Static routes are defined differently depending on your operating
+# system, so please be sure to use the correct syntax.
+# Do not use this file to define the default route.
+# In all settings, multiple routes should be separated using ; or new lines.
+
+# Define static routes on Linux using route. See route(8) for syntax.
+#staticroute="net 192.168.0.0 netmask 255.255.255.0 gw 10.73.1.1
+#net 192.168.1.0 netmask 255.255.255.0 gw 10.73.1.1"
+
+# Define static routes on Linux using iproute2. See ip(8) for syntax.
+#staticiproute="192.168.0.0/24 via 10.73.1.1; 192.168.1.0/24 via 10.73.1.1"
+
+# Define static routes on GNU/Hurd. See route(8) for syntax.
+# /etc/route.conf(5) takes precedence over this configuration.
+# FIXME: "net ..." not supported
+#staticroute="net 192.168.0.0 -netmask 255.255.255.0 --address 10.73.1.1
+#net 192.168.1.0 -netmask 255.255.255.0 --address 10.73.1.1"
+
+# Define static routes on GNU/KFreeBSD. See route(8) for syntax.
+#staticroute="net 192.168.0.0 10.73.1.1 netmask 255.255.255.0
+#net 192.168.1.0 10.73.1.1 netmask 255.255.255.0"
+
+# Define static routes on other BSD systems. See route(8) for syntax.
+# /etc/route.conf(5) takes precedence over this configuration.
+#staticroute="net 192.168.0.0 -netmask 255.255.255.0 10.73.1.1
+#net 192.168.1.0 -netmask 255.255.255.0 10.73.1.1"
--- a/conf.d/staticroute.BSD.in
+++ b/conf.d/staticroute.BSD.in
@@ -1,6 +0,0 @@
-# Separate multiple routes using ; or new lines.
-# /etc/route.conf(5) takes precedence over this configuration.
-
-# Example static routes. See route(8) for syntax.
-#staticroute="net 192.168.0.0 -netmask 255.255.255.0 10.73.1.1
-#net 192.168.1.0 -netmask 255.255.255.0 10.73.1.1"
--- a/conf.d/staticroute.Linux.in
+++ b/conf.d/staticroute.Linux.in
@@ -1,8 +0,0 @@
-# Separate multiple routes using ; or new lines.
-
-# Example static routes. See route(8) for syntax.
-#staticroute="net 192.168.0.0 netmask 255.255.255.0 gw 10.73.1.1
-#net 192.168.1.0 netmask 255.255.255.0 gw 10.73.1.1"
-
-# Example static routes using iproute2. See ip(8) for syntax.
-#staticiproute="192.168.0.0/24 via 10.73.1.1; 192.168.1.0/24 via 10.73.1.1"
--- a/conf.d/swap
+++ b/conf.d/swap
@@ -0,0 +1,13 @@
+# If you are only using local swap partitions, you should not change
+# this file. Otherwise, you need to uncomment the below rc_before line
+# followed by the appropriate rc_need line.
+#rc_before="!localmount"
+#
+# If you are using swap files stored on local file systems, uncomment
+# this line.
+#rc_need="localmount"
+#
+# If you are using swap files stored on network file systems or swap
+# partitions stored on network block devices such as iSCSI, uncomment
+# this line.
+#rc_need="netmount"
--- a/conf.d/tmpfilesd
+++ b/conf.d/tmpfilesd
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -1 +0,0 @@
-net.example
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,11 +0,0 @@
-DIR=	${DOCDIR}/openrc
-SRCS=	net.example.in
-INC=	net.example
-
-MK=	../mk
-include ${MK}/os.mk
-
-%.example.in: %.example${SFX}
-	${CP} $< $@
-
-include ${MK}/scripts.mk
--- a/doc/net.example.BSD.in
+++ b/doc/net.example.BSD.in
@@ -1,442 +0,0 @@
-##############################################################################
-# QUICK-START
-#
-# The quickest start is if you want to use DHCP.
-# In that case, everything should work out of the box, no configuration
-# necessary, though the startup script will warn you that you haven't
-# specified anything.
-
-# WARNING :- some examples have a mixture of IPv4 (ie 192.168.0.1) and IPv6
-# (ie 4321:0:1:2:3:4:567:89ab) internet addresses. They only work if you have
-# the relevant kernel option enabled. So if you don't have an IPv6 enabled
-# kernel then remove the IPv6 address from your config.
-
-# If you want to use a static address or use DHCP explicitly, jump
-# down to the section labeled INTERFACE HANDLERS.
-#
-# If you want to do anything more fancy, you should take the time to
-# read through the rest of this file.
-
-##############################################################################
-# MODULES
-#
-# We now support modular networking scripts which means we can easily
-# add support for new interface types and modules while keeping
-# compatibility with existing ones.
-#
-# Modules load by default if the package they need is installed.  If
-# you specify a module here that doesn't have its package installed
-# then you get an error stating which package you need to install.
-# Ideally, you only use the modules setting when you have two or more
-# packages installed that supply the same service.
-#
-# In other words, you probably should DO NOTHING HERE...
-
-##############################################################################
-# INTERFACE HANDLERS
-
-# For a static configuration, use something like this
-#config_eth0="192.168.0.2/24"
-
-# If you need more than one address, you can use something like this
-# NOTE: ifconfig creates an aliased device for each extra IPv4 address
-#       (eth0:1, eth0:2, etc)
-#       iproute2 does not do this as there is no need to
-#config_eth0="192.168.0.2/24 192.168.0.3/24 192.168.0.4/24"
-
-# You can also use IPv6 addresses
-# (you should always specify a prefix length with IPv6 here)
-#config_eth0="192.168.0.2/24 4321:0:1:2:3:4:567:89ab/64 4321:0:1:2:3:4:567:89ac/64"
-
-# If you wish to keep existing addresses + routing and the interface is up,
-# you can specify a noop (no operation). If the interface is down or there
-# are no addresses assigned, then we move onto the next step (default dhcp)
-# This is useful when configuring your interface with a kernel command line
-# or similar
-#config_eth0="noop 192.168.0.2/24"
-
-# If you don't want ANY address (only useful when calling for advanced stuff)
-#config_eth0="null"
-
-# Here's how to do routing if you need it
-# We add an IPv4 default route, IPv4 subnet route and an IPv6 unicast route
-#routes_eth0="default via 192.168.0.1
-#10.0.0.0/8 via 192.168.0.1
-#::/0"
-
-# If a specified module fails (like dhcp - see below), you can specify a
-# fallback like so
-#fallback_eth0="192.168.0.2 netmask 255.255.255.0"
-#fallback_routes_eth0="default via 192.168.0.1"
-
-# NOTE: fallback entry must match the entry location in config_eth0
-# As such you can only have one fallback route.
-# Also, if you do not set a fallback_routes entry for an interface, the
-# routes entry will be used if that is set.
-
-# Some users may need to alter the MTU - here's how
-#mtu_eth0="1500"
-
-# Most drivers that report carrier status function correctly, but some do not
-# One of these faulty drivers is for the Intel e1000 network card, but only
-# at boot time. To get around this you may alter the carrier_timeout value for
-# the interface. -1 is disable, 0 is infinite and any other number of seconds
-# is how long we wait for carrier. The current default is 3 seconds
-#carrier_timeout_eth0=-1
-
-# You may wish to disable the interface being brought down when stopping.
-# This is only of use for WakeOnLan.
-#ifdown_eth0="NO"
-
-##############################################################################
-# OPTIONAL MODULES
-
-#-----------------------------------------------------------------------------
-# WIRELESS (802.11 support)
-# Wireless can be provided by BSDs ifconfig (iwconfig) or wpa_supplicant
-# wpa_supplicant is preferred, use the modules directive to prefer iwconfig.
-#modules="iwconfig"
-
-# ifconfig (iwconig) support is a one shot script - wpa_supplicant is daemon
-# that scans, associates and re-configures if association is lost.
-# We call it iwconfig to separate the wireless setup from ifconfig.
-####################################
-# HINTS
-#
-# Most users will just need to set the following options
-# key_SSID1="s:yourkeyhere enc open" # s: means a text key
-# key_SSID2="aaaa-bbbb-cccc-dd"      # no s: means a hex key
-# preferred_aps="SSID1 SSID2"
-#
-# Clear? Good. Now configure your wireless network below
-
-####################################
-# SETTINGS
-# Hard code an SSID to an interface - leave this unset if you wish the driver
-# to scan for available Access Points
-# I would only set this as a last resort really - use the preferred_aps
-# setting at the bottom of this file
-#essid_eth0='foo'
-
-# Some drivers/hardware don't scan all that well. We have no control over this
-# but we can say how many scans we want to do to try and get a better sweep of
-# the area. The default is 1.
-#scans_eth0="1"
-
-#Channel can be set (1-14), but defaults to 3 if not set.
-#
-# The below is taken verbatim from the BSD wavelan documentation found at
-# http://www.netbsd.org/Documentation/network/wavelan.html
-# There are 14 channels possible; We are told that channels 1-11 are legal for
-# North America, channels 1-13 for most of Europe, channels 10-13 for France,
-# and only channel 14 for Japan. If in doubt, please refer to the documentation
-# that came with your card or access point. Make sure that the channel you
-# select is the same channel your access point (or the other card in an ad-hoc
-# network) is on. The default for cards sold in North America and most of Europe
-# is 3; the default for cards sold in France is 11, and the default for cards
-# sold in Japan is 14.
-#channel_eth0="3"
-
-# Setup any other config commands. This is basically the ifconfig argument
-# without the ifconfig $iface.
-#ifconfig_eth0=""
-# You can do the same per SSID too.
-#ifconfig_SSID=""
-
-# Seconds to wait until associated. The default is to wait 10 seconds.
-# 0 means wait indefinitely. WARNING: this can cause an infinite delay when
-# booting.
-#associate_timeout_eth0="5"
-
-# Define a WEP key per SSID or MAC address (of the AP, not your card)
-# The encryption type (open or restricted) must match the
-# encryption type on the Access Point.
-# To set a hex key, prefix with 0x
-#key_SSID="0x12341234123412341234123456"
-# or you can use strings. Passphrase IS NOT supported
-#key_SSID="foobar"
-#key_SSID="foobar"
-
-# WEP key for the AP with MAC address 001122334455
-#mac_key_001122334455="foobar"
-
-# You can also override the interface settings found in /etc/conf.d/net
-# per SSID - which is very handy if you use different networks a lot
-#config_SSID="dhcp"
-#routes_SSID=
-#fallback_SSID=
-
-# Setting name/domain server causes /etc/resolv.conf to be overwritten
-# Note that if DHCP is used, and you want this to take precedence then
-# please put -R in your dhcpcd options
-#dns_servers_SSID="192.168.0.1 192.168.0.2"
-#dns_domain_SSID="some.domain"
-#dns_search_SSID="search.this.domain search.that.domain"
-# Please check the man page for resolv.conf for more information
-# as domain and search (searchdomains) are mutually exclusive and
-# searchdomains takes precedence
-
-# You can also set any of the /etc/conf.d/net variables per MAC address
-# incase you use Access Points with the same SSID but need different
-# networking configs. Below is an example - of course you use the same
-# method with other variables
-#config_001122334455="dhcp"
-#dns_servers_001122334455="192.168.0.1 192.168.0.2"
-
-# Map a MAC address to an SSID
-# This is used when the Access Point is not broadcasting its SSID
-# WARNING: This will override the SSID being broadcast due to some
-# Access Points sending an SSID even when they have been configured
-# not to!
-# Change 001122334455 to the MAC address and SSID to the SSID
-# it should map to
-#mac_essid_001122334455="SSID"
-
-# This lists the preferred SSIDs to connect to in order
-# SSID's can contain any characters here as they must match the broadcast
-# SSID exactly.
-# Surround each SSID with the " character and separate them with a space
-# If the first SSID isn't found then it moves onto the next
-# If this isn't defined then it connects to the first one found
-#preferred_aps="SSID1 SSID2"
-
-# You can also define a preferred_aps list per interface
-#preferred_aps_eth0="SSID3 SSID4"
-
-# You can also say whether we only connect to preferred APs or not
-# Values are "any", "preferredonly", "forcepreferred", "forcepreferredonly"
-# and "forceany"
-# "any" means it will connect to visible APs in the preferred list and then
-# any other available AP
-# "preferredonly" means it will only connect to visible APs in the preferred
-# list
-# "forcepreferred" means it will forcibly connect to APs in order if it does
-# not find them in a scan
-# "forcepreferredonly" means it forcibly connects to the APs in order and
-# does not bother to scan
-# "forceany" does the same as forcepreferred + connects to any other
-# available AP
-# Default is "any"
-#associate_order="any"
-#associate_order_eth0="any"
-
-# You can define blacklisted Access Points in the same way
-#blacklist_aps="SSID1 SSID2"
-#blacklist_aps_eth0="SSID3 SSID4"
-
-# If you have more than one wireless card, you can say if you want
-# to allow each card to associate with the same Access Point or not
-# Values are "yes" and "no"
-# Default is "yes"
-#unique_ap="yes"
-#unique_ap_eth0="yes"
-
-# IMPORTANT: preferred_only, blacklisted_aps and unique_ap only work when
-# essid_eth0 is not set and your card is capable of scanning
-
-# NOTE: preferred_aps  list ignores blacklisted_aps - so if you have
-# the same SSID in both, well, you're a bit silly :p
-
-##################################################
-# wpa_supplicant
-# emerge net-wireless/wpa_supplicant
-# Wireless options are held in /etc/wpa_supplicant/wpa_supplicant.conf
-# Consult the wpa_supplicant.conf.example that is installed in
-# /usr/share/doc/wpa_supplicant
-
-# By default we don't wait for wpa_supplicant to associate and authenticate.
-# If you would like to, so can specify how long in seconds
-#associate_timeout_eth0=60
-# A value of 0 means wait forever.
-
-# You can also override any settings found here per SSID - which is very
-# handy if you use different networks a lot. See below for using the SSID
-# in our variables
-#config_SSID="dhcp"
-# See the System module below for setting dns/nis/ntp per SSID
-
-# You can also override any settings found here per MAC address of the AP
-# in case you use Access Points with the same SSID but need different
-# networking configs. Below is an example - of course you use the same
-# method with other variables
-#mac_config_001122334455="dhcp"
-#mac_dns_servers_001122334455="192.168.0.1 192.168.0.2"
-
-# When an interface has been associated with an Access Point, a global
-# variable called SSID is set to the Access Point's SSID for use in the
-# pre/post user functions below (although it's not available in preup as you
-# won't have associated then)
-
-# If you're using anything else to configure wireless on your interface AND
-# you have installed wpa_supplicant, you need to disable wpa_supplicant
-#modules="!iwconfig !wpa_supplicant"
-#or
-#modules="!wireless"
-
-##############################################################################
-# WIRELESS SSID IN VARIABLES
-##############################################################################
-# Remember to change SSID to your SSID.
-# Say that your SSID is My NET - the line
-#      #key_SSID="s:passkey"
-# becomes
-#      #key_My_NET="s:passkey"
-# Notice that the space has changed to an underscore - do the same with all
-# characters not in a-z A-Z (English alphabet) 0-9. This only applies to
-# variables and not values.
-#
-# Any SSID's in values like essid_eth0="My NET" may need to be escaped
-# This means placing the character \ before the character
-# \" need to be escaped for example
-# So if your SSID is
-#      My "\ NET
-# it becomes
-#      My \"\\ NET
-# for example
-#      #essid_eth0="My\"\\NET"
-#
-# So using the above we can use
-#      #dns_domain_My____NET="My\"\\NET"
-# which is an invalid dns domain, but shows the how to use the variable
-# structure
-#########################################################
-
-#-----------------------------------------------------------------------------
-# DHCP
-# DHCP can be provided by dhclient.
-#
-# dhcpcd:   emerge net-misc/dhcpcd
-# dhclient: emerge net-misc/dhcp
-
-# Regardless of which DHCP client you prefer, you configure them the
-# same way using one of following depending on which interface modules
-# you're using.
-#config_eth0="dhcp"
-
-# For passing custom options to dhcpcd use something like the following.  This
-# example reduces the timeout for retrieving an address from 60 seconds (the
-# default) to 10 seconds.
-#dhcpcd_eth0="-t 10"
-
-# GENERIC DHCP OPTIONS
-# Set generic DHCP options like so
-#dhcp_eth0="release nodns nontp nonis nogateway nosendhost"
-
-# This tells the dhcp client to release its lease when it stops, not to
-# overwrite dns, ntp and nis settings, not to set a default route and not to
-# send the current hostname to the dhcp server and when it starts.
-# You can use any combination of the above options - the default is not to
-# use any of them.
-
-
-#-----------------------------------------------------------------------------
-# System
-# For configuring system specifics such as domain, dns, ntp and nis servers
-# It's rare that you would need todo this, but you can anyway.
-# This is most benefit to wireless users who don't use DHCP so they can change
-# their configs based on SSID.
-
-# If you omit the _eth0 suffix, then it applies to all interfaces unless
-# overridden by the interface suffix.
-#dns_domain_eth0="your.domain"
-#dns_servers_eth0="192.168.0.2 192.168.0.3"
-#dns_search_eth0="this.domain that.domain"
-#dns_options_eth0="timeout:1 rotate"
-#dns_sortlist_eth0="130.155.160.0/255.255.240.0 130.155.0.0"
-# See the man page for resolv.conf for details about the options and sortlist
-# directives
-
-#ntp_servers_eth0="192.168.0.2 192.168.0.3"
-
-#nis_domain_eth0="domain"
-#nis_servers_eth0="192.168.0.2 192.168.0.3"
-
-# NOTE: Setting any of these will stamp on the files in question. So if you
-# don't specify dns_servers but you do specify dns_domain then no nameservers
-# will be listed in /etc/resolv.conf even if there were any there to start
-# with.
-# If this is an issue for you then maybe you should look into a resolv.conf
-# manager like resolvconf-gentoo to manage this file for you. All packages
-# that baselayout supports use resolvconf-gentoo if installed.
-
-#-----------------------------------------------------------------------------
-# Cable in/out detection
-# Sometimes the cable is in, others it's out. Obviously you don't want to
-# restart net.eth0 every time when you plug it in either.
-# BSD has the Device State Change Daemon - or devd for short
-# To enable this,  simple add devd to the boot runlevel
-#rc-update add devd boot
-#rc
-
-##############################################################################
-# ADVANCED CONFIGURATION
-#
-# Four functions can be defined which will be called surrounding the
-# start/stop operations.  The functions are called with the interface
-# name first so that one function can control multiple adapters. An extra two
-# functions can be defined when an interface fails to start or stop.
-#
-# The return values for the preup and predown functions should be 0
-# (success) to indicate that configuration or deconfiguration of the
-# interface can continue.  If preup returns a non-zero value, then
-# interface configuration will be aborted.  If predown returns a
-# non-zero value, then the interface will not be allowed to continue
-# deconfiguration.
-#
-# The return values for the postup, postdown, failup and faildown functions are
-# ignored since there's nothing to do if they indicate failure.
-#
-# ${IFACE} is set to the interface being brought up/down
-# ${IFVAR} is ${IFACE} converted to variable name bash allows
-#
-# For historical and compatibility reasons, preup is actually normally called
-# in the following sequence: up ; preup ; up.
-# The first up causes the kernel to initialize the device, so
-# that it is available for use in the preup function.  However, for some
-# hardware, e.g. CAN devices, some configuration is needed before trying to up
-# the interface will actually work. For such hardware, the
-# up_before_preup variables will allow skipping the first up call if set
-# to yes.
-#up_before_preup_IFVAR="NO"
-#up_before_preup="NO"
-
-#preup() {
-#	# Remember to return 0 on success
-#	return 0
-#}
-
-#predown() {
-#	# The default in the script is to test for NFS root and disallow
-#	# downing interfaces in that case.  Note that if you specify a
-#	# predown() function you will override that logic.  Here it is, in
-#	# case you still want it...
-#	if is_net_fs /; then
-#		eerror "root filesystem is network mounted -- can't stop ${IFACE}"
-#		return 1
-#	fi
-#
-#	# Remember to return 0 on success
-#	return 0
-#}
-
-#postup() {
-#	# This function could be used, for example, to register with a
-#	# dynamic DNS service.  Another possibility would be to
-#	# send/receive mail once the interface is brought up.
-
-#}
-
-#postdown() {
-#	# Return 0 always
-#	return 0
-#}
-
-#failup() {
-#       # This function is mostly here for completeness... I haven't
-#       # thought of anything nifty to do with it yet ;-)
-#}
-
-#faildown() {
-#       # This function is mostly here for completeness... I haven't
-#       # thought of anything nifty to do with it yet ;-)
-#}
--- a/doc/net.example.Linux.in
+++ b/doc/net.example.Linux.in
--- a/etc/.gitignore
+++ b/etc/.gitignore
@@ -1,3 +1,2 @@
-rc.conf
 rc
 rc.shutdown
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,10 +1,8 @@
 DIR=	${SYSCONFDIR}
-SRCS=	rc.conf.in rc.in rc.shutdown.in
+SRCS=	rc.in rc.shutdown.in
 BIN=	${BIN-${OS}}
 CONF=	rc.conf ${BIN-${OS}}

-CLEANFILES+=	rc.conf
-
 MK=	../mk
 include ${MK}/os.mk

@@ -23,6 +21,3 @@ CONF-NetBSD=
 SED_EXTRA=	${SED_EXTRA-${OS}}

 include ${MK}/scripts.mk
-
-rc.conf: rc.conf.in rc.conf.${OS}
-	${SED} ${SED_REPLACE} ${SED_EXTRA} $^ > $@
--- a/etc/rc.conf
+++ b/etc/rc.conf
@@ -0,0 +1,250 @@
+# Global OpenRC configuration settings
+
+# Set to "YES" if you want the rc system to try and start services
+# in parallel for a slight speed improvement. When running in parallel we
+# prefix the service output with its name as the output will get
+# jumbled up.
+# WARNING: whilst we have improved parallel, it can still potentially lock
+# the boot process. Don't file bugs about this unless you can supply
+# patches that fix it without breaking other things!
+#rc_parallel="NO"
+
+# Set rc_interactive to "YES" and you'll be able to press the I key during
+# boot so you can choose to start specific services. Set to "NO" to disable
+# this feature. This feature is automatically disabled if rc_parallel is
+# set to YES.
+#rc_interactive="YES"
+
+# If we need to drop to a shell, you can specify it here.
+# If not specified we use $SHELL, otherwise the one specified in /etc/passwd,
+# otherwise /bin/sh
+# Linux users could specify /sbin/sulogin
+#rc_shell=/bin/sh
+
+# Do we allow any started service in the runlevel to satisfy the dependency
+# or do we want all of them regardless of state? For example, if net.eth0
+# and net.eth1 are in the default runlevel then with rc_depend_strict="NO"
+# both will be started, but services that depend on 'net' will work if either
+# one comes up. With rc_depend_strict="YES" we would require them both to
+# come up.
+#rc_depend_strict="YES"
+
+# 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.
+# 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 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
+# NOTE: Linux systems require the devfs service to be started before
+# logging can take place and as such cannot log the sysinit runlevel.
+#rc_logger="YES"
+
+# Through rc_log_path you can specify a custom log file.
+# The default value is: /var/log/rc.log
+#rc_log_path="/var/log/rc.log"
+
+# If you want verbose output for OpenRC, set this to yes. If you want
+# verbose output for service foo only, set it to yes in /etc/conf.d/foo.
+#rc_verbose=no
+
+# By default we filter the environment for our running scripts. To allow other
+# variables through, add them here. Use a * to allow all variables through.
+#rc_env_allow="VAR1 VAR2"
+
+# By default we assume that all daemons will start correctly.
+# However, some do not - a classic example is that they fork and return 0 AND
+# then child barfs on a configuration error. Or the daemon has a bug and the
+# child crashes. You can set the number of milliseconds start-stop-daemon
+# waits to check that the daemon is still running after starting here.
+# The default is 0 - no checking.
+#rc_start_wait=100
+
+# rc_nostop is a list of services which will not stop when changing runlevels.
+# This still allows the service itself to be stopped when called directly.
+#rc_nostop=""
+
+# rc will attempt to start crashed services by default.
+# However, it will not stop them by default as that could bring down other
+# critical services.
+#rc_crashed_stop=NO
+#rc_crashed_start=YES
+
+# Set rc_nocolor to yes if you do not want colors displayed in OpenRC
+# output.
+#rc_nocolor=NO
+
+##############################################################################
+# MISC CONFIGURATION VARIABLES
+# There variables are shared between many init scripts
+
+# Set unicode to YES to turn on unicode support for keyboards and screens.
+#unicode="NO"
+
+# This is how long fuser should wait for a remote server to respond. The
+# default is 60 seconds, but  it can be adjusted here.
+#rc_fuser_timeout=60
+
+# Below is the default list of network fstypes.
+#
+# afs ceph cifs coda davfs fuse fuse.sshfs gfs glusterfs lustre ncpfs
+# nfs nfs4 ocfs2 shfs smbfs
+#
+# If you would like to add to this list, you can do so by adding your
+# own fstypes to the following variable.
+#extra_net_fs_list=""
+
+##############################################################################
+# SERVICE CONFIGURATION VARIABLES
+# These variables are documented here, but should be configured in
+# /etc/conf.d/foo for service foo and NOT enabled here unless you
+# really want them to work on a global basis.
+# If your service has characters in its name which are not legal in
+# shell variable names and you configure the variables for it in this
+# file, those characters should be replaced with underscores in the
+# variable names as shown below.
+
+# Some daemons are started and stopped via start-stop-daemon.
+# We can set some things on a per service basis, like the nicelevel.
+#SSD_NICELEVEL="-19"
+# Or the ionice level. The format is class[:data] , just like the
+# --ionice start-stop-daemon parameter.
+#SSD_IONICELEVEL="2:2"
+
+# Pass ulimit parameters
+# If you are using bash in POSIX mode for your shell, note that the
+# ulimit command uses a block size of 512 bytes for the -c and -f
+# options
+#rc_ulimit="-u 30"
+
+# It's possible to define extra dependencies for services like so
+#rc_config="/etc/foo"
+#rc_need="openvpn"
+#rc_use="net.eth0"
+#rc_after="clock"
+#rc_before="local"
+#rc_provide="!net"
+
+# You can also enable the above commands here for each service. Below is an
+# example for service foo.
+#rc_foo_config="/etc/foo"
+#rc_foo_need="openvpn"
+#rc_foo_after="clock"
+
+# Below is an example for service foo-bar. Note that the '-' is illegal
+# in a shell variable name, so we convert it to an underscore.
+# example for service foo-bar.
+#rc_foo_bar_config="/etc/foo-bar"
+#rc_foo_bar_need="openvpn"
+#rc_foo_bar_after="clock"
+
+# You can also remove dependencies.
+# This is mainly used for saying which services do NOT provide net.
+#rc_net_tap0_provide="!net"
+
+# This is the subsystem type.
+# It is used to match against keywords set by the keyword call in the
+# depend function of service scripts.
+#
+# It should be set to the value representing the environment this file is
+# PRESENTLY in, not the virtualization the environment is capable of.
+# If it is commented out, automatic detection will be used.
+#
+# The list below shows all possible settings as well as the host
+# operating systems where they can be used and autodetected.
+#
+# ""               - nothing special
+# "docker"         - Docker container manager (Linux)
+# "jail"           - Jail (DragonflyBSD or FreeBSD)
+# "lxc"            - Linux Containers
+# "openvz"         - Linux OpenVZ
+# "prefix"         - Prefix
+# "rkt"            - CoreOS container management system (Linux)
+# "subhurd"        - Hurd subhurds (to be checked)
+# "systemd-nspawn" - Container created by systemd-nspawn (Linux)
+# "uml"            - Usermode Linux
+# "vserver"        - Linux vserver
+# "xen0"           - Xen0 Domain (Linux and NetBSD)
+# "xenU"           - XenU Domain (Linux and NetBSD)
+#rc_sys=""
+
+# on Linux and Hurd, this is the number of ttys allocated for logins
+# It is used in the consolefont, keymaps, numlock and termencoding
+# service scripts.
+rc_tty_number=12
+
+##############################################################################
+# LINUX CGROUPS RESOURCE MANAGEMENT
+
+# If you have cgroups turned on in your kernel, this switch controls
+# whether or not a group for each controller is mounted under
+# /sys/fs/cgroup.
+# None of the other options in this section work if this is set to "NO".
+#rc_controller_cgroups="YES"
+
+# The following settings allow you to set up values for the cgroup
+# controllers for your services.
+# They can be set in this file;, however, if you do this, the settings
+# will apply to all of your services.
+# If you want different settings for each service, place the settings in
+# /etc/conf.d/foo for service foo.
+# The format is to specify the names of the settings followed by their
+# values. Each variable can hold multiple settings.
+# For example, you would use this to set the cpu.shares setting in the
+# cpu controller to 512 for your service.
+# rc_cgroup_cpu="
+# cpu.shares 512
+# "
+#
+#For more information about the adjustments that can be made with
+#cgroups, see Documentation/cgroups/* in the linux kernel source tree.
+
+# Set the blkio controller settings for this service.
+#rc_cgroup_blkio=""
+
+# Set the cpu controller settings for this service.
+#rc_cgroup_cpu=""
+
+# Add this service to the cpuacct controller (any value means yes).
+#rc_cgroup_cpuacct=""
+
+# Set the cpuset controller settings for this service.
+#rc_cgroup_cpuset=""
+
+# Set the devices controller settings for this service.
+#rc_cgroup_devices=""
+
+# Set the hugetlb controller settings for this service.
+#rc_cgroup_hugetlb=""
+
+# Set the memory controller settings for this service.
+#rc_cgroup_memory=""
+
+# Set the net_cls controller settings for this service.
+#rc_cgroup_net_cls=""
+
+# Set the net_prio controller settings for this service.
+#rc_cgroup_net_prio=""
+
+# Set the pids controller settings for this service.
+#rc_cgroup_pids=""
+
+# Set this to YES if you want all of the processes in a service's cgroup
+# killed when the service is stopped or restarted.
+# This should not be set globally because it kills all of the service's
+# child processes, and most of the time this is undesirable. Please set
+# it in /etc/conf.d/<service>.
+# To perform this cleanup manually for a stopped service, you can
+# execute cgroup_cleanup with /etc/init.d/<service> cgroup_cleanup or
+# rc-service <service> cgroup_cleanup.
+# rc_cgroup_cleanup="NO"
--- a/etc/rc.conf.FreeBSD
+++ b/etc/rc.conf.FreeBSD
@@ -1,13 +0,0 @@
-##############################################################################
-# FreeBSD SPECIFIC OPTIONS
-
-# This is the subsystem type. Valid options on FreeBSD:
-# ""        - nothing special
-# "jail"    - FreeBSD jails
-# "prefix"  - Prefix
-# If this is commented out, automatic detection will be used.
-#
-# This should be set to the value representing the environment this file is
-# PRESENTLY in, not the virtualization the environment is capable of.
-#rc_sys=""
-
--- a/etc/rc.conf.Linux
+++ b/etc/rc.conf.Linux
@@ -1,29 +0,0 @@
-##############################################################################
-# LINUX SPECIFIC OPTIONS
-
-# This is the subsystem type. Valid options on Linux:
-# ""        - nothing special
-# "lxc"     - Linux Containers
-# "openvz"  - Linux OpenVZ
-# "prefix"  - Prefix
-# "uml"     - Usermode Linux
-# "vserver" - Linux vserver
-# "xen0"    - Xen0 Domain
-# "xenU"    - XenU Domain
-# If this is commented out, automatic detection will be used.
-#
-# This should be set to the value representing the environment this file is
-# PRESENTLY in, not the virtualization the environment is capable of.
-#rc_sys=""
-
-# This is the number of tty's used in most of the rc-scripts (like
-# consolefont, numlock, etc ...)
-rc_tty_number=12
-
-# If you have cgroups turned on in your kernel, this switch controls
-# whether or not a group for each controler is mounted under
-# /sys/fs/cgroup.
-# Support for process management by cgroups is planned in the future,
-# so if you turn this off, be aware that you may not be able to use that
-# feature.
-#rc_controller_cgroups="YES"
--- a/etc/rc.conf.NetBSD
+++ b/etc/rc.conf.NetBSD
@@ -1,14 +0,0 @@
-##############################################################################
-# NetBSD SPECIFIC OPTIONS
-
-# This is the subsystem type. Valid options on NetBSD:
-# ""        - nothing special
-# "prefix"  - Prefix
-# "xen0"    - Xen0 Domain
-# "xenU"    - XenU Domain
-# If this is commented out, automatic detection will be used.
-#
-# This should be set to the value representing the environment this file is
-# PRESENTLY in, not the virtualization the environment is capable of.
-#rc_sys=""
-
--- a/etc/rc.conf.in
+++ b/etc/rc.conf.in
@@ -1,122 +0,0 @@
-# Global OpenRC configuration settings
-
-# Set to "YES" if you want the rc system to try and start services
-# in parallel for a slight speed improvement. When running in parallel we
-# prefix the service output with its name as the output will get
-# jumbled up.
-# WARNING: whilst we have improved parallel, it can still potentially lock
-# the boot process. Don't file bugs about this unless you can supply
-# patches that fix it without breaking other things!
-#rc_parallel="NO"
-
-# Set rc_interactive to "YES" and you'll be able to press the I key during
-# boot so you can choose to start specific services. Set to "NO" to disable
-# this feature. This feature is automatically disabled if rc_parallel is
-# set to YES.
-#rc_interactive="YES"
-
-# If we need to drop to a shell, you can specify it here.
-# If not specified we use $SHELL, otherwise the one specified in /etc/passwd,
-# otherwise /bin/sh
-# Linux users could specify /sbin/sulogin
-#rc_shell=/bin/sh
-
-# Do we allow any started service in the runlevel to satisfy the dependency
-# or do we want all of them regardless of state? For example, if net.eth0
-# and net.eth1 are in the default runlevel then with rc_depend_strict="NO"
-# both will be started, but services that depend on 'net' will work if either
-# one comes up. With rc_depend_strict="YES" we would require them both to
-# 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.
-# 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 !
-# 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="*"
-
-# rc_logger launches a logging daemon to log the entire rc process to
-# /var/log/rc.log
-# NOTE: Linux systems require the devfs service to be started before
-# logging can take place and as such cannot log the sysinit runlevel.
-#rc_logger="YES"
-
-# Through rc_log_path you can specify a custom log file.
-# The default value is: /var/log/rc.log
-#rc_log_path="/var/log/rc.log"
-
-# By default we filter the environment for our running scripts. To allow other
-# variables through, add them here. Use a * to allow all variables through.
-#rc_env_allow="VAR1 VAR2"
-
-# By default we assume that all daemons will start correctly.
-# However, some do not - a classic example is that they fork and return 0 AND
-# then child barfs on a configuration error. Or the daemon has a bug and the
-# child crashes. You can set the number of milliseconds start-stop-daemon
-# waits to check that the daemon is still running after starting here.
-# The default is 0 - no checking.
-#rc_start_wait=100
-
-# rc_nostop is a list of services which will not stop when changing runlevels.
-# This still allows the service itself to be stopped when called directly.
-#rc_nostop=""
-
-# rc will attempt to start crashed services by default.
-# However, it will not stop them by default as that could bring down other
-# critical services.
-#rc_crashed_stop=NO
-#rc_crashed_start=YES
-
-##############################################################################
-# MISC CONFIGURATION VARIABLES
-# There variables are shared between many init scripts
-
-# Set unicode to YES to turn on unicode support for keyboards and screens.
-#unicode="NO"
-
-# Below is the default list of network fstypes.
-#
-# afs cifs coda davfs fuse fuse.sshfs gfs glusterfs lustre ncpfs
-# nfs nfs4 ocfs2 shfs smbfs
-#
-# If you would like to add to this list, you can do so by adding your
-# own fstypes to the following variable.
-#extra_net_fs_list=""
-
-##############################################################################
-# SERVICE CONFIGURATION VARIABLES
-# These variables are documented here, but should be configured in
-# /etc/conf.d/foo for service foo and NOT enabled here unless you
-# really want them to work on a global basis.
-
-# Some daemons are started and stopped via start-stop-daemon.
-# We can set some things on a per service basis, like the nicelevel.
-#export SSD_NICELEVEL="-19"
-
-# Pass ulimit parameters
-#rc_ulimit="-u 30"
-
-# It's possible to define extra dependencies for services like so
-#rc_config="/etc/foo"
-#rc_need="openvpn"
-#rc_use="net.eth0"
-#rc_after="clock"
-#rc_before="local"
-#rc_provide="!net"
-
-# You can also enable the above commands here for each service. Below is an
-# example for service foo.
-#rc_foo_config="/etc/foo"
-#rc_foo_need="openvpn"
-#rc_foo_after="clock"
-
-# You can also remove dependencies.
-# This is mainly used for saying which servies do NOT provide net.
-#rc_net_tap0_provide="!net"
-
--- a/etc/rc.devd
+++ b/etc/rc.devd
@@ -1,10 +1,18 @@
 #!/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
-export IN_BACKGROUND=yes
-export IN_HOTPLUG=yes
+IN_BACKGROUND=yes
+IN_HOTPLUG=yes
+export IN_BACKGROUND IN_HOTPLUG

 getmedia() {
 	ifconfig "$1" | while read line; do
--- a/etc/rc.in
+++ b/etc/rc.in
@@ -1,18 +1,25 @@
 #!@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 :)
-[ -z "$TERM" -o "$TERM" = "dumb" ] && export TERM="@TERM@"
+[ -z "$TERM" -o "$TERM" = "dumb" ] && TERM="@TERM@" && export TERM

 # Handle interrupts
 trap : SIGINT
 trap "echo 'Boot interrupted'; exit 1" SIGQUIT

-/sbin/rc sysinit || exit 1
-/sbin/rc boot || exit 1
-/sbin/rc default
+/sbin/openrc sysinit || exit 1
+/sbin/openrc boot || exit 1
+/sbin/openrc default

 # We don't actually care if rc default worked or not, we should exit 0
 # to allow logins
--- a/etc/rc.shutdown.in
+++ b/etc/rc.shutdown.in
@@ -1,17 +1,24 @@
 #!@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

 # Try and use stuff in /lib over anywhere else so we can shutdown
 # local mounts correctly.
-export LD_LIBRARY_PATH="/lib${LD_LIBRARY_PATH:+:}${LDLIBRARY_PATH}"
+LD_LIBRARY_PATH="/lib${LD_LIBRARY_PATH:+:}${LDLIBRARY_PATH}" ; export LD_LIBRARY_PATH

 # If $TERM is not set then assume default of @TERM@
 # This gives us a nice colour boot :)
-[ -z "$TERM" -o "$TERM" = "dumb" ] && export TERM="@TERM@"
+[ -z "$TERM" -o "$TERM" = "dumb" ] && TERM="@TERM@" && export TERM

 action=${1:-shutdown}
-exec /sbin/rc "${action}"
+exec /sbin/openrc "${action}"
--- a/guide.md
+++ b/guide.md
@@ -0,0 +1,269 @@
+# Purpose and description
+
+OpenRC is an init system for Unixoid operating systems. It takes care of 
+startup and shutdown of the whole system, including services.
+
+It evolved out of the Gentoo "Baselayout" package which was a custom pure-shell 
+startup solution. (This was both hard to maintain and debug, and not very 
+performant)
+
+Most of the core parts are written in C99 for performance and flexibility 
+reasons, while everything else is posix sh.
+The License is 2-clause BSD
+
+Current size is about 10k LoC C, and about 4k LoC shell.
+
+OpenRC is known to work on Linux, many BSDs (FreeBSD, OpenBSD, DragonFlyBSD at 
+least) and HURD.
+
+Services are stateful (i.e. `start`; `start` will lead to "it's already started")
+
+# Startup
+
+Usually PID1 (aka. `init`) calls the OpenRC binary (`/sbin/openrc` by default).
+(The default setup assumes sysvinit for this)
+
+openrc scans the runlevels (default: `/etc/runlevels`) and builds a dependency
+graph, then starts the needed service scripts, either serialized (default) or in 
+parallel.
+
+When all the init scripts are started openrc terminates. There is no persistent 
+daemon. (Integration with tools like monit, runit or s6 can be done)
+
+# Shutdown
+
+On change to runlevel 0/6 or running `reboot`, `halt` etc., openrc stops all
+services that are started and runs the services in the `shutdown` runlevel.
+
+# Modifying Service Scripts
+
+Any service can, at any time, be started/stopped/restarted by executing 
+`rc-service someservice start`, `rc-service someservice stop`, etc.
+Another, less preferred method, is to run the service script directly,
+e.g. `/etc/init.d/service start`, `/etc/init.d/service stop`, etc.
+
+OpenRC will take care of dependencies, e.g starting apache will start network 
+first, and stopping network will stop apache first.
+
+There is a special command `zap` that makes OpenRC 'forget' that a service is
+started; this is mostly useful to reset a crashed service to stopped state 
+without invoking the (possibly broken) stop function of the service script.
+
+Calling `openrc` without any arguments will try to reset all services so
+that the current runlevel is satisfied; if you manually started apache it will be 
+stopped, and if squid died but is in the current runlevel it'll be restarted.
+
+There is a `service` helper that emulates the syntax seen on e.g. older Redhat
+and Ubuntu (`service nginx start` etc.)
+
+# Runlevels
+
+OpenRC has a concept of runlevels, similar to what sysvinit historically 
+offered. A runlevel is basically a collection of services that needs to be 
+started. Instead of random numbers they are named, and users can create their 
+own if needed. This allows, for example, to have a default runlevel with 
+"everything" enabled, and a "powersaving" runlevel where some services are 
+disabled.
+
+The `rc-status` helper will print all currently active runlevels and the state
+of init scripts in them:
+
+```
+# rc-status
+ * Caching service dependencies ... [ ok ]
+Runlevel: default
+ modules                     [  started  ]
+ lvm                         [  started  ]
+```
+
+All runlevels are represented as folders in `/etc/runlevels/` with symlinks to 
+the actual init scripts.
+
+Calling openrc with an argument (`openrc default`) will switch to that
+runlevel; this will start and stop services as needed.
+
+Managing runlevels is usually done through the `rc-update` helper, but could of 
+course be done by hand if desired.
+e.g. `rc-update add nginx default` - add nginx to the default runlevel
+Note: This will not auto-start nginx! You'd still have to trigger `rc` or run 
+the initscript by hand.
+
+FIXME: Document stacked runlevels
+
+The default startup uses the runlevels `boot`, `sysinit` and `default`, in that 
+order. Shutdown uses the `shutdown` runlevel.
+
+
+# Syntax of Service Scripts
+
+Service scripts are shell scripts. OpenRC aims at using only the standardized 
+POSIX sh subset for portability reasons. The default interpreter (build-time 
+toggle) is `/bin/sh`, so using for example mksh is not a problem.
+
+OpenRC has been tested with busybox sh, ash, dash, bash, mksh, zsh and possibly 
+others. Using busybox sh has been difficult as it replaces commands with 
+builtins that don't offer the expected features.
+
+The interpreter for initscripts is `#!/sbin/openrc-run`.
+Not using this interpreter will break the use of dependencies and is not 
+supported. (iow: if you insist on using `#!/bin/sh` you're on your own)
+
+A `depend` function declares the dependencies of this service script.
+All scripts must have start/stop/status functions, but defaults are provided.
+Extra functions can be added easily:
+
+```
+extra_commands="checkconfig"
+checkconfig() {
+	doSomething
+}
+```
+
+This exports the checkconfig function so that `/etc/init.d/someservice 
+checkconfig` will be available, and it "just" runs this function.
+
+While commands defined in `extra_commands` are always available, commands
+defined in `extra_started_commands` will only work when the service is started
+and those defined in `extra_stopped_commands` will only work when the service is
+stopped. This can be used for implementing graceful reload and similar
+behaviour.
+
+Adding a restart function will not work, this is a design decision within 
+OpenRC. Since there may be dependencies involved (e.g. network -> apache) a 
+restart function is in general not going to work. 
+restart is internally mapped to `stop()` + `start()` (plus handling dependencies).
+If a service needs to behave differently when it is being restarted vs
+started or stopped, it should test the `$RC_CMD` variable, for example:
+
+```
+[ "$RC_CMD" = restart ] && do_something
+```
+
+# The Depend Function
+
+This function declares the dependencies for a service script. This
+determines the order the service scripts start.
+
+```
+depend() {
+	need net
+	use dns logger netmount
+	want coolservice
+}
+```
+
+`need` declares a hard dependency - net always needs to be started before this 
+	service does
+
+`use` is a soft dependency - if dns, logger or netmount is in this runlevel 
+	start it before, but we don't care if it's not in this runlevel.
+	`want` is between need and use - try to start coolservice if it is
+	installed on the system, regardless of whether it is in the
+	runlevel, but we don't care if it starts.
+
+`before` declares that we need to be started before another service
+
+`after` declares that we need to be started after another service, without 
+	creating a dependency (so on calling stop the two are independent)
+
+`provide` allows multiple implementations to provide one service type, e.g.:
+	`provide cron` is set in all cron-daemons, so any one of them started 
+	satisfies a cron dependency
+
+`keyword` allows platform-specific overrides, e.g. `keyword -lxc` makes this 
+	service script a noop in lxc containers. Useful for things like keymaps, 
+	module loading etc. that are either platform-specific or not available 
+	in containers/virtualization/...
+
+FIXME: Anything missing in this list?
+
+# The Default Functions
+
+All service scripts are assumed to have the following functions:
+
+```
+start()
+stop()
+status()
+```
+
+There are default implementations in `lib/rc/sh/openrc-run.sh` - this allows very 
+compact service scripts. These functions can be overridden per service script as 
+needed.
+
+The default functions assume the following variables to be set in the service 
+script:
+
+```
+command=
+command_args=
+pidfile=
+``
+
+Thus the 'smallest' service scripts can be half a dozen lines long
+
+# The Magic of `conf.d`
+
+Most service scripts need default values. It would be fragile to
+explicitly source some arbitrary files. By convention `openrc-run` will source
+the matching file in `/etc/conf.d/` for any script in `/etc/init.d/`
+
+This allows you to set random startup-related things easily. Example:
+
+```
+conf.d/foo:
+START_OPTS="--extraparameter sausage"
+
+init.d/foo:
+start() {
+	/usr/sbin/foo-daemon ${STARTOPTS}
+}
+```
+
+The big advantage of this split is that most of the time editing of the init 
+script can be avoided.
+
+# Start-Stop-Daemon
+
+OpenRC has its own modified version of s-s-d, which is historically related and 
+mostly syntax-compatible to Debian's s-s-d, but has been rewritten from scratch.
+
+It helps with starting daemons, backgrounding, creating PID files and many 
+other convenience functions related to managing daemons.
+
+# `/etc/rc.conf`
+
+This file manages the default configuration for OpenRC, and it has examples of 
+per-service-script variables.
+
+Among these are `rc_parallel` (for parallelized startup), `rc_log` (logs all boot 
+messages to a file), and a few others.
+
+# ulimit and CGroups
+
+Setting `ulimit` and `nice` values per service can be done through the `rc_ulimit`
+variable.
+
+Under Linux, OpenRC can optionally use CGroups for process management.
+By default each service script's processes are migrated to their own CGroup.
+
+By changing certain values in the `conf.d` file limits can be enforced per 
+service. It is easy to find orphan processes of a service that persist after 
+`stop()`, but by default these will NOT be terminated.
+To change this add `rc_cgroup_cleanup="yes"` in the `conf.d` files for services 
+where you desire this functionality.
+
+# Caching
+
+For performance reasons OpenRC keeps a cache of pre-parsed initscript metadata
+(e.g. `depend`). The default location for this is `/${RC_SVCDIR}/cache`.
+
+The cache uses `mtime` to check for file staleness. Should any service script
+change it'll re-source the relevant files and update the cache
+
+# Convenience functions
+
+OpenRC has wrappers for many common output tasks in libeinfo.
+This allows to print colour-coded status notices and other things.
+To make the output consistent the bundled initscripts all use ebegin/eend to 
+print nice messages.
--- a/init.d.misc/avahi-dnsconfd.in
+++ b/init.d.misc/avahi-dnsconfd.in
@@ -1,6 +1,13 @@
-#!@PREFIX@/sbin/runscript
-# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+#!@SBINDIR@/openrc-run
+# Copyright (c) 2007-2015 The OpenRC Authors.
+# See the Authors file at the top-level directory of this distribution and
+# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+#
+# This file is part of OpenRC. It is subject to the license terms in
+# the LICENSE file found in the top-level directory of this
+# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# This file may not be copied, modified, propagated, or distributed
+# except according to the terms contained in the LICENSE file.

 command=@PKG_PREFIX@/sbin/avahi-dnsconfd
 command_args="$avahi_dnsconfd_args -D"
--- a/init.d.misc/avahid.in
+++ b/init.d.misc/avahid.in
@@ -1,6 +1,13 @@
-#!@PREFIX@/sbin/runscript
-# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+#!@SBINDIR@/openrc-run
+# Copyright (c) 2007-2015 The OpenRC Authors.
+# See the Authors file at the top-level directory of this distribution and
+# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+#
+# This file is part of OpenRC. It is subject to the license terms in
+# the LICENSE file found in the top-level directory of this
+# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# This file may not be copied, modified, propagated, or distributed
+# except according to the terms contained in the LICENSE file.

 command=@PKG_PREFIX@/sbin/avahi-daemon
 command_args="$avahid_args -D"
--- a/init.d.misc/dbus.in
+++ b/init.d.misc/dbus.in
@@ -1,6 +1,13 @@
-#!@PREFIX@/sbin/runscript
-# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+#!@SBINDIR@/openrc-run
+# Copyright (c) 2007-2015 The OpenRC Authors.
+# See the Authors file at the top-level directory of this distribution and
+# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+#
+# This file is part of OpenRC. It is subject to the license terms in
+# the LICENSE file found in the top-level directory of this
+# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# This file may not be copied, modified, propagated, or distributed
+# except according to the terms contained in the LICENSE file.

 command=@PKG_PREFIX@/bin/dbus-daemon
 pidfile=@VARBASE@/run/dbus/pid
--- a/init.d.misc/dhcpcd.in
+++ b/init.d.misc/dhcpcd.in
@@ -1,6 +1,13 @@
-#!@PREFIX@/sbin/runscript
-# Copyright (c) 2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+#!@SBINDIR@/openrc-run
+# Copyright (c) 2007-2015 The OpenRC Authors.
+# See the Authors file at the top-level directory of this distribution and
+# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+#
+# This file is part of OpenRC. It is subject to the license terms in
+# the LICENSE file found in the top-level directory of this
+# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# This file may not be copied, modified, propagated, or distributed
+# except according to the terms contained in the LICENSE file.

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

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

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

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

 : ${ntpd_config:=/etc/ntp.conf}
 : ${ntpd_drift:=/var/db/ntpd.drift}
--- a/init.d.misc/openvpn.in
+++ b/init.d.misc/openvpn.in
@@ -1,6 +1,13 @@
-#!@PREFIX@/sbin/runscript
-# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+#!@SBINDIR@/openrc-run
+# Copyright (c) 2007-2015 The OpenRC Authors.
+# See the Authors file at the top-level directory of this distribution and
+# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+#
+# This file is part of OpenRC. It is subject to the license terms in
+# the LICENSE file found in the top-level directory of this
+# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# This file may not be copied, modified, propagated, or distributed
+# except according to the terms contained in the LICENSE file.

 vpn=${RC_SVCNAME#*.}
 name="OpenVPN"
@@ -53,7 +60,7 @@ start_pre()
 			eend $?
 		fi
 	else
-		if type kldload >/dev/null 2>&1; then
+		if command -v kldload >/dev/null 2>&1; then
 			# Hammer the modules home by default
 			sysctl -a | grep -q '\.tun\.' || kldload if_tun
 			sysctl -a | grep -q '\.tap\.' || kldload if_tap
--- a/init.d.misc/polkitd.in
+++ b/init.d.misc/polkitd.in
@@ -1,6 +1,13 @@
-#!@PREFIX@/sbin/runscript
-# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+#!@SBINDIR@/openrc-run
+# Copyright (c) 2007-2015 The OpenRC Authors.
+# See the Authors file at the top-level directory of this distribution and
+# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+#
+# This file is part of OpenRC. It is subject to the license terms in
+# the LICENSE file found in the top-level directory of this
+# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# This file may not be copied, modified, propagated, or distributed
+# except according to the terms contained in the LICENSE file.

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

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

 command=/usr/sbin/wpa_supplicant
 : ${wpa_supplicant_conf:=/etc/wpa_supplicant.conf}
--- a/init.d/.gitignore
+++ b/init.d/.gitignore
@@ -1,17 +1,17 @@
+binfmt
+modules-load
 bootmisc
 fsck
 hostname
 local
 localmount
+loopback
 moused
-net.lo
-net.lo0
 netmount
 network
 root
 savecache
 swap
-swapfiles
 sysctl
 urandom
 devfs
@@ -23,8 +23,11 @@ killprocs
 modules
 mount-ro
 mtab
+net-online
 numlock
+osclock
 procfs
+s6-svscan
 staticroute
 sysfs
 devdb
@@ -34,6 +37,7 @@ pf
 rarpd
 rc-enabled
 rpcbind
+runsvdir
 savecore
 swap-blk
 swclock
@@ -41,5 +45,5 @@ syslogd
 termencoding
 ttys
 wscons
-tmpfilesd.boot
-tmpfilesd.sysinit
+tmpfiles.dev
+tmpfiles.setup
--- a/init.d/Makefile
+++ b/init.d/Makefile
@@ -1,49 +1,36 @@
+include ../mk/net.mk
+
 DIR=	${INITDIR}
-SRCS=	bootmisc.in fsck.in hostname.in local.in localmount.in netmount.in \
-	root.in savecache.in swap.in swapfiles.in \
-	tmpfilesd.boot.in tmpfilesd.sysinit.in \
-	swclock.in sysctl.in urandom.in ${SRCS-${OS}}
+SRCS=	bootmisc.in fsck.in hostname.in local.in localmount.in loopback.in \
+	netmount.in osclock.in root.in savecache.in swap.in tmpfiles.setup.in  \
+	swclock.in sysctl.in runsvdir.in urandom.in s6-svscan.in ${SRCS-${OS}}
 BIN=	${OBJS}

-# Build our old net foo or not
-ifeq (${MKNET},)
+# Are we installing our network scripts?
+ifeq (${MKNET},yes)
 SRCS+= network.in staticroute.in
 endif

-ifeq (${MKNET},oldnet)
-INSTALLAFTER=	_installafter_net.lo
-SRCS+= net.lo.in
-endif
-
 MK=	../mk
 include ${MK}/os.mk

-NET_LO-FreeBSD=	net.lo0
 # Generic BSD scripts
-SRCS-FreeBSD=	hostid.in moused.in newsyslog.in pf.in rarpd.in rc-enabled.in \
-		rpcbind.in savecore.in syslogd.in
+SRCS-FreeBSD=	hostid.in modules.in moused.in newsyslog.in pf.in rarpd.in \
+		rc-enabled.in rpcbind.in savecore.in syslogd.in
 # These are FreeBSD specific
 SRCS-FreeBSD+=	adjkerntz.in devd.in dumpon.in encswap.in ipfw.in \
-		mixer.in nscd.in powerd.in syscons.in
+		modules.in modules-load.in mixer.in nscd.in powerd.in syscons.in

-NET_LO-Linux=	net.lo
-SRCS-Linux=	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
+SRCS-Linux=	binfmt.in devfs.in dmesg.in hwclock.in consolefont.in keymaps.in \
+		killprocs.in modules.in modules-load.in mount-ro.in mtab.in numlock.in \
+		procfs.in net-online.in sysfs.in termencoding.in tmpfiles.dev.in

-NET_LO-NetBSD=	net.lo0
 # Generic BSD scripts
 SRCS-NetBSD=	hostid.in moused.in newsyslog.in pf.in rarpd.in rc-enabled.in \
 		rpcbind.in savecore.in syslogd.in
 # These are NetBSD specific
 SRCS-NetBSD+=	devdb.in swap-blk.in ttys.in wscons.in

-%.in: %${SFX}
-	sed ${SED_REPLACE} ${SED_EXTRA} $< > $@
-
 include ${MK}/scripts.mk

 _installafter_: realinstall
-
-_installafter_net.lo: realinstall
-	${INSTALL} -m ${BINMODE} net.lo ${DESTDIR}/${INITDIR}/${NET_LO-${OS}}
--- a/init.d/adjkerntz.in
+++ b/init.d/adjkerntz.in
@@ -1,6 +1,13 @@
-#!@PREFIX@/sbin/runscript
-# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+#!@SBINDIR@/openrc-run
+# Copyright (c) 2007-2015 The OpenRC Authors.
+# See the Authors file at the top-level directory of this distribution and
+# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+#
+# This file is part of OpenRC. It is subject to the license terms in
+# the LICENSE file found in the top-level directory of this
+# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# This file may not be copied, modified, propagated, or distributed
+# except according to the terms contained in the LICENSE file.

 extra_commands="save"

--- a/init.d/binfmt.in
+++ b/init.d/binfmt.in
@@ -0,0 +1,27 @@
+#!@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="Register misc binary format handlers"
+
+depend()
+{
+	after procfs
+	use modules devfs
+	keyword -docker -lxc -openvz -prefix -systemd-nspawn -vserver
+}
+
+start()
+{
+	ebegin "Loading custom binary format handlers"
+	"$RC_LIBEXECDIR"/sh/binfmt.sh
+	eend $?
+	return 0
+}
--- a/init.d/bootmisc.in
+++ b/init.d/bootmisc.in
@@ -1,12 +1,19 @@
-#!@PREFIX@/sbin/runscript
-# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+#!@SBINDIR@/openrc-run
+# Copyright (c) 2007-2015 The OpenRC Authors.
+# See the Authors file at the top-level directory of this distribution and
+# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+#
+# This file is part of OpenRC. It is subject to the license terms in
+# the LICENSE file found in the top-level directory of this
+# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# This file may not be copied, modified, propagated, or distributed
+# except according to the terms contained in the LICENSE file.

 depend()
 {
 	need localmount
 	before logger
-	after clock sysctl
+	after clock root sysctl
 	keyword -prefix -timeout
 }

@@ -27,9 +34,9 @@ cleanup_tmp_dir()
 		ebegin "Wiping $dir directory"

 		# Faster than raw find
-		if ! rm -rf -- [^ajlq\.]* 2>/dev/null ; then
+		if ! rm -rf -- [!ajlq\.]* 2>/dev/null ; then
 			# Blah, too many files
-			find . -maxdepth 1 -name '[^ajlq\.]*' -exec rm -rf -- {} +
+			find . -maxdepth 1 -name '[!ajlq\.]*' -exec rm -rf -- {} +
 		fi

 		# pam_mktemp creates a .private directory within which
@@ -59,6 +66,34 @@ cleanup_tmp_dir()
 	fi
 }

+cleanup_var_run_dir()
+{
+	ebegin "Cleaning /var/run"
+	for x in $(find /var/run ! -type d ! -name utmp \
+		! -name random-seed ! -name dev.db \
+		! -name ld-elf.so.hints ! -name ld.so.hints);
+	do
+		# Clean stale sockets
+		if [ -S "$x" ]; then
+			if command -v fuser >/dev/null 2>&1; then
+				fuser "$x" >/dev/null 2>&1 || rm -- "$x"
+			else
+				rm -- "$x"
+			fi
+		fi
+		[ ! -f "$x" ] && continue
+		# Do not remove pidfiles of already running daemons
+		case "$x" in
+			*.pid)
+				start-stop-daemon --test --quiet \
+				--stop --pidfile "$x" && continue
+			;;
+		esac
+		rm -f -- "$x"
+	done
+	eend 0
+}
+
 mkutmp()
 {
 	: >"$1"
@@ -87,10 +122,43 @@ migrate_to_run()
 	fi
 }

+clean_run()
+{
+	[ "$RC_SYS" = VSERVER -o "$RC_SYS" = LXC ] && return 0
+	local dir
+	# If / is still read-only due to a problem, this will fail!
+	if ! checkpath -W /; then
+		ewarn "/ is not writable; unable to clean up underlying /run"
+		return 1
+	fi
+	if ! checkpath -W /tmp; then
+		ewarn "/tmp is not writable; unable to clean up underlying /run"
+		return 1
+	fi
+	# Now we know that we can modify /tmp and /
+	# if mktemp -d fails, it returns an EMPTY string
+	# STDERR: mktemp: failed to create directory via template ‘/tmp/tmp.XXXXXXXXXX’: Read-only file system
+	# STDOUT: ''
+	rc=0
+	dir=$(mktemp -d)
+	if [ -n "$dir" -a -d $dir -a -w $dir ]; then
+		mount --bind / $dir && rm -rf $dir/run/* || rc=1
+		umount $dir && rmdir $dir
+	else
+		rc=1
+	fi
+	if [ $rc -ne 0 ]; then
+		ewarn "Could not clean up underlying /run on /"
+		return 1
+	fi
+}
+
 start()
 {
 	# Remove any added console dirs
-	rm -rf "$RC_LIBEXECDIR"/console/*
+	if checkpath -W "$RC_LIBEXECDIR"; then
+		rm -rf "$RC_LIBEXECDIR"/console/*
+	fi

 	local logw=false runw=false extra=
 	# Ensure that our basic dirs exist
@@ -115,6 +183,7 @@ start()
 	if [ "$RC_UNAME" = Linux -a -d /run ]; then
 		migrate_to_run	/var/lock /run/lock
 		migrate_to_run	/var/run /run
+		clean_run
 	fi

 	if checkpath -W /var/run; then
@@ -127,36 +196,13 @@ start()
 		[ -e /var/log/wtmp ] || mkutmp /var/log/wtmp
 		eend 0

-		ebegin "Cleaning /var/run"
-		for x in $(find /var/run ! -type d ! -name utmp \
-			! -name random-seed ! -name dev.db \
-			! -name ld-elf.so.hints ! -name ld.so.hints);
-		do
-			# Clean stale sockets
-			if [ -S "$x" ]; then
-				if type fuser >/dev/null 2>&1; then
-					fuser "$x" >/dev/null 2>&1 || rm -- "$x"
-				else
-					rm -- "$x"
-				fi
-			fi
-			[ ! -f "$x" ] && continue
-			# Do not remove pidfiles of already running daemons
-			case "$x" in
-				*.pid)
-					start-stop-daemon --test --quiet \
-					--stop --pidfile "$x" && continue
-				;;
-			esac
-			rm -f -- "$x"
-		done
-		eend 0
+		mountinfo -q -f tmpfs /var/run || cleanup_var_run_dir
 	fi

 	# Clean up /tmp directories
 	local tmp=
 	for tmp in ${clean_tmp_dirs:-${wipe_tmp_dirs-/tmp}}; do
-		cleanup_tmp_dir "$tmp"
+		mountinfo -q -f tmpfs "$tmp" || cleanup_tmp_dir "$tmp"
 	done

 	if checkpath -W /tmp; then
@@ -174,10 +220,16 @@ start()
 	if yesno $log_dmesg; then
 		if $logw || checkpath -W /var/log; then
 			# Create an 'after-boot' dmesg log
-			if [ "$RC_SYS" != VSERVER -a "$RC_SYS" != OPENVZ ]; then
-				dmesg > /var/log/dmesg
-				chmod 640 /var/log/dmesg
-			fi
+			case "$RC_SYS" in
+				VSERVER|OPENVZ|LXC|SYSTEMD-NSPAWN) ;;
+				*)
+					if yesno ${previous_dmesg:-no}; then
+						mv /var/log/dmesg /var/log/dmesg.old
+					fi
+					dmesg > /var/log/dmesg
+					chmod 640 /var/log/dmesg
+					;;
+			esac
 		fi
 	fi

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

 description="Sets a font for the consoles."

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

 start()
@@ -53,14 +60,10 @@ start()
 	done
 	eend $retval

-	# Store the last font so we can use it ASAP on boot
+	# Store the font so we can use it ASAP on boot
 	if [ $retval -eq 0 ] && checkpath -W "$RC_LIBEXECDIR"; then
 		mkdir -p "$RC_LIBEXECDIR"/console
-		for font in /usr/share/consolefonts/"$consolefont".*; do
-			:
-		done
-		cp "$font" "$RC_LIBEXECDIR"/console
-		echo "${font##*/}" >"$RC_LIBEXECDIR"/console/font
+		setfont -O "$RC_LIBEXECDIR"/console/font
 	fi

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

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

 description="Creates the dev database"

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

-description="Mount system critical filesystems in /dev."
+description="Set up the /dev directory"

-depend() {
-	use dev-mount udev-mount
-	before udev mdev
-	keyword -prefix -vserver
+depend()
+{
+	provide dev-mount
+	before dev
+	keyword -docker -lxc -prefix -systemd-nspawn -vserver
 }

-start() {
-	# Mount required stuff as user may not have then in /etc/fstab
+mount_dev()
+{
+	local action=--mount devfstype msg=Mounting
+	# Some devices require exec, Bug #92921
+	local mountopts="exec,nosuid,mode=0755"
+	if yesno ${skip_mount_dev:-no} ; then
+		einfo "/dev will not be mounted due to user request"
+		return 0
+	fi
+	if mountinfo -q /dev; then
+		action=--remount
+		mountopts="remount,$mountopts"
+		msg=Remounting
+	fi
+	if fstabinfo -q /dev; then
+		ebegin "$msg /dev according to @SYSCONFDIR@/fstab"
+		fstabinfo -q $action /dev
+		eend $?
+		return 0
+	fi
+	if grep -q devtmpfs /proc/filesystems; then
+		devfstype=devtmpfs
+		mountopts="$mountopts,size=10M"
+	elif grep -q tmpfs /proc/filesystems; then
+		devfstype=tmpfs
+		mountopts="$mountopts,size=10M"
+	fi
+	if [ -n "$devfstype" ]; then
+		ebegin "$msg $devfstype on /dev"
+		mount -n -t $devfstype -o $mountopts dev /dev
+		eend $?
+	else
+		ewarn "This kernel does not have devtmpfs or tmpfs support, and there"
+		ewarn "is no entry for /dev in fstab."
+		ewarn "This means /dev will not be mounted."
+		ewarn "To avoid this message, set CONFIG_DEVTMPFS or CONFIG_TMPFS to y"
+		ewarn "in your kernel configuration or see @SYSCONFDIR@/conf.d/devfs"
+	fi
+	return 0
+}
+
+seed_dev()
+{
+	# Seed /dev with some things that we know we need
+
+	# creating /dev/console, /dev/tty and /dev/tty1 to be able to write
+	# to $CONSOLE with/without bootsplash before udevd creates it
+	[ -c /dev/console ] || mknod -m 600 /dev/console c 5 1
+	[ -c /dev/tty1 ] || mknod -m 620 /dev/tty1 c 4 1
+	[ -c /dev/tty ] || mknod -m 666 /dev/tty c 5 0
+
+	# udevd will dup its stdin/stdout/stderr to /dev/null
+	# and we do not want a file which gets buffered in ram
+	[ -c /dev/null ] || mknod -m 666 /dev/null c 1 3
+
+	# so udev can add its start-message to dmesg
+	[ -c /dev/kmsg ] || mknod -m 660 /dev/kmsg c 1 11
+
+	# extra symbolic links not provided by default
+	[ -e /dev/fd ] || ln -snf /proc/self/fd /dev/fd
+	[ -e /dev/stdin ] || ln -snf /proc/self/fd/0 /dev/stdin
+	[ -e /dev/stdout ] || ln -snf /proc/self/fd/1 /dev/stdout
+	[ -e /dev/stderr ] || ln -snf /proc/self/fd/2 /dev/stderr
+	[ -e /proc/kcore ] && ln -snf /proc/kcore /dev/core
+
+	# Mount required directories as user may not have them in /etc/fstab
 	for x in \
+		"mqueue /dev/mqueue 1777 ,nodev mqueue" \
 		"devpts /dev/pts 0755 ,gid=5,mode=0620 devpts" \
-		"tmpfs /dev/shm 1777 ,nodev shm" \
+		"tmpfs /dev/shm 1777 ,nodev,mode=1777 shm" \
 	; do
 		set -- $x
 		grep -Eq "[[:space:]]+$1$" /proc/filesystems || continue
@@ -33,5 +106,23 @@ start() {
 			eend $?
 		fi
 	done
+}
+
+restorecon_dev()
+{
+	if [ -x /sbin/restorecon ]; then
+		ebegin "Restoring SELinux contexts in /dev"
+		restorecon -rF /dev >/dev/null 2>&1
+		eend $?
+	fi
+
+	return 0
+}
+
+start()
+{
+	mount_dev
+	seed_dev
+	restorecon_dev
 	return 0
 }
--- a/init.d/dmesg.in
+++ b/init.d/dmesg.in
@@ -1,13 +1,20 @@
-#!@PREFIX@/sbin/runscript
-# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+#!@SBINDIR@/openrc-run
+# Copyright (c) 2007-2015 The OpenRC Authors.
+# See the Authors file at the top-level directory of this distribution and
+# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+#
+# This file is part of OpenRC. It is subject to the license terms in
+# the LICENSE file found in the top-level directory of this
+# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# This file may not be copied, modified, propagated, or distributed
+# except according to the terms contained in the LICENSE file.

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

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

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

 description="Configures a specific kernel dump device."

--- a/init.d/encswap.in
+++ b/init.d/encswap.in
@@ -1,4 +1,4 @@
-#!@PREFIX@/sbin/runscript
+#!@SBINDIR@/openrc-run
 # Copyright 1992-2012 FreeBSD Project
 # Released under the 2-clause BSD license

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

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

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

@@ -71,14 +78,12 @@ start()
 	done

 	if [ "$RC_UNAME" = Linux ]; then
-		local skiptypes x
-		for x in $net_fs_list $extra_net_fs_list; do
-			skiptypes="${skiptypes}no${x},"
-		done
-		skiptypes="${skiptypes}noopts=_netdev"
-		fsck_opts="$fsck_opts -C0 -T -t $skiptypes"
+		local skiptypes
+		skiptypes=$(printf 'no%s,' ${net_fs_list} ${extra_net_fs_list})
+		[ "${skiptypes}" = "no," ] && skiptypes=""
+		fsck_opts="$fsck_opts -C0 -T -t ${skiptypes}noopts=_netdev"
 		if [ -z "$fsck_passno" -a -z "$fsck_mnt" ]; then
-			fsck_args=${fsck_args--A -p}
+			fsck_args=${fsck_args:--A -p}
 			if echo 2>/dev/null >/.test.$$; then
 				rm -f /.test.$$
 				fsck_opts="$fsck_opts -R"
@@ -87,7 +92,7 @@ start()
 	fi

 	trap : INT QUIT
-	fsck ${fsck_args--p} $fsck_opts "$@"
+	fsck ${fsck_args:--p} $fsck_opts "$@"
 	case $? in
 	0)	eend 0; return 0;;
 	1)	ewend 1 "Filesystems repaired"; return 0;;
--- a/init.d/hostid.in
+++ b/init.d/hostid.in
@@ -1,6 +1,13 @@
-#!@PREFIX@/sbin/runscript
-# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+#!@SBINDIR@/openrc-run
+# Copyright (c) 2007-2015 The OpenRC Authors.
+# See the Authors file at the top-level directory of this distribution and
+# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+#
+# This file is part of OpenRC. It is subject to the license terms in
+# the LICENSE file found in the top-level directory of this
+# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# This file may not be copied, modified, propagated, or distributed
+# except according to the terms contained in the LICENSE file.

 extra_commands="reset"
 : ${hostid_file:=/etc/hostid}
@@ -40,7 +47,7 @@ reset()
 {
 	local uuid= x="[0-9a-f]" y="$x$x$x$x"

-	if type kenv >/dev/null 2>&1; then
+	if command -v kenv >/dev/null 2>&1; then
 		uuid=$(kenv smbios.system.uuid 2>/dev/null)
 	fi
 	case "$uuid" in
--- a/init.d/hostname.in
+++ b/init.d/hostname.in
@@ -1,17 +1,36 @@
-#!@PREFIX@/sbin/runscript
-# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+#!@SBINDIR@/openrc-run
+# Copyright (c) 2007-2015 The OpenRC Authors.
+# See the Authors file at the top-level directory of this distribution and
+# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+#
+# This file is part of OpenRC. It is subject to the license terms in
+# the LICENSE file found in the top-level directory of this
+# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# This file may not be copied, modified, propagated, or distributed
+# except according to the terms contained in the LICENSE file.

 description="Sets the hostname of the machine."

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

 start()
 {
-	hostname=${hostname-${HOSTNAME-localhost}}
-	ebegin "Setting hostname to $hostname"
-	hostname "$hostname"
+	local h source x
+	if [ -s @SYSCONFDIR@/hostname ] && [ -r @SYSCONFDIR@/hostname ]; then
+	read h x <@SYSCONFDIR@/hostname
+	source=" from @SYSCONFDIR@/hostname"
+	else
+		# HOSTNAME variable used to be defined in caps in conf.d/hostname.
+		# It is also a magic variable in bash.
+		h=${hostname-${HOSTNAME}} # checkbashisms: false positive
+	fi
+	if [ -z "$h" ]; then
+		einfo "Using default system hostname"
+		return 0
+	fi
+	ebegin "Setting hostname to $h $source"
+	hostname "$h"
 	eend $? "Failed to set the hostname"
 }
--- a/init.d/hwclock.in
+++ b/init.d/hwclock.in
@@ -1,6 +1,13 @@
-#!@PREFIX@/sbin/runscript
-# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+#!@SBINDIR@/openrc-run
+# Copyright (c) 2007-2015 The OpenRC Authors.
+# See the Authors file at the top-level directory of this distribution and
+# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+#
+# This file is part of OpenRC. It is subject to the license terms in
+# the LICENSE file found in the top-level directory of this
+# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# This file may not be copied, modified, propagated, or distributed
+# except according to the terms contained in the LICENSE file.

 extra_commands="save show"

@@ -23,12 +30,13 @@ fi
 depend()
 {
 	provide clock
+	want modules
 	if yesno $clock_adjfile; then
 		use root
 	else
 		before *
 	fi
-	keyword -openvz -prefix -uml -vserver -xenu -lxc
+	keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu
 }

 setupopts()
@@ -62,9 +70,28 @@ _hwclock()
 	return 1
 }

+get_noadjfile()
+{
+	if ! yesno $clock_adjfile; then
+		# Some implementations don't handle adjustments
+		if LC_ALL=C hwclock --help 2>&1 | grep -q "\-\-noadjfile"; then
+			echo --noadjfile
+		fi
+	fi
+}
+
+rtc_exists()
+{
+	local rtc=
+	for rtc in /dev/rtc /dev/rtc[0-9]*; do
+		[ -e "$rtc" ] && break
+	done
+	[ -e "$rtc" ]
+}
+
 start()
 {
-	local retval=0 errstr=""
+	local retval=0 errstr="" modname
 	setupopts

 	if [ -z "$utc_cmd" ]; then
@@ -74,31 +101,27 @@ start()

 	ebegin "Setting system clock using the hardware clock [$utc]"
 	if [ -e /proc/modules ]; then
-		local rtc=
-		for rtc in /dev/rtc /dev/rtc[0-9]*; do
-			[ -e "$rtc" ] && break
-		done
-		if [ ! -e "${rtc}" ]; then
-			modprobe -q rtc-cmos || modprobe -q rtc || modprobe -q genrtc
+		if ! rtc_exists; then
+			for x in rtc-cmos rtc genrtc; do
+				modprobe -q $x && rtc_exists && modname="$x" && break
+			done
+			[ -n "$modname" ] &&
+				ewarn "The $modname module needs to be configured in" \
+					"@SYSCONFDIR@/conf.d/modules or built in."
 		fi
 	fi

+	# Always set the kernel's time zone.
+	_hwclock --systz $utc_cmd $(get_noadjfile) $clock_args
+	: $(( retval += $? ))
+
 	if [ -e /etc/adjtime ] && yesno $clock_adjfile; then
-		_hwclock --adjust $utc_cmd
+		_hwclock --adjust $utc_cmd $(get_noadjfile)
 		: $(( retval += $? ))
 	fi

-	# If setting UTC, don't bother to run hwclock when first booting
-	# as that's the default
-	if [ "$PREVLEVEL" != N -o \
-		"$utc_cmd" != --utc -o \
-		-n "$clock_args" ];
-	then
-		if yesno ${clock_hctosys:-YES}; then
-			_hwclock --hctosys $utc_cmd $clock_args
-		else
-			_hwclock --systz $utc_cmd $clock_args
-		fi
+	if yesno ${clock_hctosys:-YES}; then
+		_hwclock --hctosys $utc_cmd $(get_noadjfile) $clock_args
 		: $(( retval += $? ))
 	fi

@@ -120,14 +143,7 @@ stop()

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

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

 	eend $retval "Failed to sync clocks"
@@ -142,5 +158,5 @@ save()
 show()
 {
 	setupopts
-	hwclock --show "$utc_cmd" $clock_args
+	hwclock --show "$utc_cmd" $(get_noadjfile) $clock_args
 }
--- a/init.d/ipfw.in
+++ b/init.d/ipfw.in
@@ -1,6 +1,13 @@
-#!@PREFIX@/sbin/runscript
-# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+#!@SBINDIR@/openrc-run
+# Copyright (c) 2007-2015 The OpenRC Authors.
+# See the Authors file at the top-level directory of this distribution and
+# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+#
+# This file is part of OpenRC. It is subject to the license terms in
+# the LICENSE file found in the top-level directory of this
+# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# This file may not be copied, modified, propagated, or distributed
+# except according to the terms contained in the LICENSE file.

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

@@ -8,7 +15,7 @@ ipfw_ip_in=${ipfw_ip_in-any}
 ipfw_ports_in=${ipfw_ports_in-auth ssh}
 ipfw_ports_nolog=${ipfw_ports_nolog-135-139,445 1026,1027 1433,1434}

-opts="panic showstatus"
+extra_commands="panic showstatus"

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

 description="Applies a keymap for the consoles."

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

 start()
@@ -58,7 +65,7 @@ start()
 	if yesno $fix_euro; then
 		ebegin "Fixing font for euro symbol"
 		# Fix some fonts displaying the Euro, #173528.
-		echo "altgr keycode 18 = U+20AC" | loadkeys -q
+		echo "altgr keycode 18 = U+20AC" | loadkeys -q -
 		eend $?
 	fi

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

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

@@ -13,10 +20,8 @@ start()
 {
 	ebegin "Terminating remaining processes"
 	killall5 -15 ${killall5_opts}
-	sleep 1
 	eend 0
 	ebegin "Killing remaining processes"
 	killall5 -9 ${killall5_opts}
-	sleep 1
 	eend 0
 }
--- a/init.d/local.in
+++ b/init.d/local.in
@@ -1,6 +1,13 @@
-#!@PREFIX@/sbin/runscript
-# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+#!@SBINDIR@/openrc-run
+# Copyright (c) 2007-2015 The OpenRC Authors.
+# See the Authors file at the top-level directory of this distribution and
+# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+#
+# This file is part of OpenRC. It is subject to the license terms in
+# the LICENSE file found in the top-level directory of this
+# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# This file may not be copied, modified, propagated, or distributed
+# except according to the terms contained in the LICENSE file.

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

@@ -12,40 +19,75 @@ depend()

 start()
 {
-	einfo "Starting local"
+	ebegin "Starting local"

-	local file
-	for file in @SYSCONFDIR@/local.d/*.start ; do
-		[ -x "$file" ] && "$file"
+	local file has_errors=0 redirect retval
+	yesno $rc_verbose || redirect='> /dev/null 2>&1'
+	eindent
+	for file in @SYSCONFDIR@/local.d/*.start; do
+		if [ -x "${file}" ]; then
+			vebegin "Executing \"${file}\""
+			eval "${file}" $redirect
+			retval=$?
+			if [ ${retval} -ne 0 ]; then
+				has_errors=1
+			fi
+			veend ${retval} "Execution of \"${file}\" failed."
+		fi
 	done
+	eoutdent

-	if type local_start >/dev/null 2>&1; then
-		ewarn "@SYSCONFDIR@/conf.d/local should be removed."
+	if command -v local_start >/dev/null 2>&1; then
+		ewarn "\"@SYSCONFDIR@/conf.d/local\" should be removed."
 		ewarn "Please move the code from the local_start function"
-		ewarn "to scripts with an .start extension"
-		ewarn "in @SYSCONFDIR@/local.d"
+		ewarn "to executable scripts with an .start extension"
+		ewarn "in \"@SYSCONFDIR@/local.d\""
 		local_start
 	fi

-	eend 0
+	eend ${has_errors}
+
+	# We have to end with a zero exit code, because a failed execution
+	# of an executable @SYSCONFDIR@/local.d/*.start file shouldn't result in
+	# marking the local service as failed. Otherwise we are unable to
+	# execute any executable @SYSCONFDIR@/local.d/*.stop file, because a failed
+	# marked service cannot be stopped (and the stop function would
+	# actually call the executable @SYSCONFDIR@/local.d/*.stop file(s)).
+	return 0
 }

 stop()
 {
-	einfo "Stopping local"
+	ebegin "Stopping local"

-	local file
+	local file has_errors=0 redirect retval
+	yesno $rc_verbose || redirect='> /dev/null 2>&1'
+	eindent
 	for file in @SYSCONFDIR@/local.d/*.stop; do
-		[ -x "$file" ] && "$file"
+		if [ -x "${file}" ]; then
+			vebegin "Executing \"${file}\""
+			eval "${file}" $redirect
+			retval=$?
+			if [ ${retval} -ne 0 ]; then
+				has_errors=1
+			fi
+			veend ${retval} "Execution of \"${file}\" failed."
+		fi
 	done
+	eoutdent

-	if type local_start >/dev/null 2>&1; then
-		ewarn "@SYSCONFDIR@/conf.d/local should be removed."
+	if command -v local_stop >/dev/null 2>&1; then
+		ewarn "\"@SYSCONFDIR@/conf.d/local\" should be removed."
 		ewarn "Please move the code from the local_stop function"
-		ewarn "to scripts with an .stop extension"
-		ewarn "in @SYSCONFDIR@/local.d"
+		ewarn "to executable scripts with an .stop extension"
+		ewarn "in \"@SYSCONFDIR@/local.d\""
 		local_stop
 	fi

-	eend 0
+	eend ${has_errors}
+
+	# An executable @SYSCONFDIR@/local.d/*.stop file which failed with a
+	# non-zero exit status is not a reason to mark this service
+	# as failed, therefore we have to end with a zero exit code.
+	return 0
 }
--- a/init.d/localmount.in
+++ b/init.d/localmount.in
@@ -1,6 +1,13 @@
-#!@PREFIX@/sbin/runscript
-# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+#!@SBINDIR@/openrc-run
+# Copyright (c) 2007-2015 The OpenRC Authors.
+# See the Authors file at the top-level directory of this distribution and
+# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+#
+# This file is part of OpenRC. It is subject to the license terms in
+# the LICENSE file found in the top-level directory of this
+# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# This file may not be copied, modified, propagated, or distributed
+# except according to the terms contained in the LICENSE file.

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

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

 start()
 {
 	# Mount local filesystems in /etc/fstab.
-	local types="noproc" x= no_netdev=
+	local critical= types="noproc" x= no_netdev= rc=
 	for x in $net_fs_list $extra_net_fs_list; do
-		types="${types},${x}"
+		types="${types},no${x}"
 	done

 	if [ "$RC_UNAME" = Linux ]; then
 		no_netdev="-O no_netdev"
+		if mountinfo -q /usr; then
+			touch "$RC_SVCDIR"/usr_premounted
+		fi
 	fi
 	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 [ -z "$critical_mounts" ]; then
+		rc=0
+	else
+		for x in ${critical_mounts}; do
+		fstabinfo -q $x || continue
+		if ! mountinfo -q $x; then
+			critical=x
+			eerror "Failed to mount $x"
+		fi
+		done
+		[ -z "$critical" ] && rc=0
+	fi
+	return $rc
 }

 stop()
@@ -37,7 +58,7 @@ stop()
 	# We never unmount / or /dev or $RC_SVCDIR

 	# Bug 381783
-	local rc_svcdir=$(echo $RC_SVCDIR | sed 's:/lib\(32\|64\)\?/:/lib(32|64)?/:g')
+	local rc_svcdir=$(printf '%s\n' "$RC_SVCDIR" | sed 's:/lib\(32\|64\)\?/:/lib(32|64)?/:g')

 	local x= no_umounts_r="/|/dev|/dev/.*|${rc_svcdir}"
 	no_umounts_r="${no_umounts_r}|/bin|/sbin|/lib(32|64)?|/libexec"
@@ -48,15 +69,45 @@ stop()
 	done

 	if [ "$RC_UNAME" = Linux ]; then
-		no_umounts_r="$no_umounts_r|/proc|/proc/.*|/run|/sys|/sys/.*|/usr"
+		no_umounts_r="$no_umounts_r|/proc|/proc/.*|/run|/sys|/sys/.*"
+		if [ -e "$rc_svcdir"/usr_premounted ]; then
+			no_umounts_r="$no_umounts_r|/usr"
+		fi
 	fi
 	no_umounts_r="^($no_umounts_r)$"

 	# Flush all pending disk writes now
-	sync; sync
+	sync

 	. "$RC_LIBEXECDIR"/sh/rc-mount.sh

+	if [ "$RC_UNAME" = Linux ] && [ -d /sys/fs/aufs ] ; then
+		#if / is aufs we remount it noxino during shutdown
+		if mountinfo -q -f '^aufs$' / ; then
+			mount -o remount,noxino,rw /
+			sync
+		fi
+
+		local aufs_branch aufs_mount_point aufs_si_id aufs_br_id branches
+		for aufs_si_dir in /sys/fs/aufs/si*; do
+			[ -d "${aufs_si_dir}" ] || continue
+			aufs_si_id="si=${aufs_si_dir#/sys/fs/aufs/si_}"
+			aufs_mount_point="$(mountinfo -o ${aufs_si_id})"
+			branches="$aufs_si_dir/br[0-9] $aufs_si_dir/br[0-9][0-9] $aufs_si_dir/br[0-9][0-9][0-9]"
+			for x in $branches; do
+				[ -e "${x}" ] || continue
+				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"
+				fi
+				eoutdent
+				sync
+			done
+		done
+	fi
+
 	# Umount loop devices
 	einfo "Unmounting loop devices"
 	eindent
--- a/init.d/loopback.in
+++ b/init.d/loopback.in
@@ -0,0 +1,35 @@
+#!@SBINDIR@/openrc-run
+# Copyright (c) 2013-2015 The OpenRC Authors.
+# See the Authors file at the top-level directory of this distribution and
+# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+#
+# This file is part of OpenRC. It is subject to the license terms in
+# the LICENSE file found in the top-level directory of this
+# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# This file may not be copied, modified, propagated, or distributed
+# except according to the terms contained in the LICENSE file.
+
+description="Configures the loopback interface."
+
+depend()
+{
+	keyword -jail -prefix -systemd-nspawn -vserver
+}
+
+start()
+{
+	if [ "$RC_UNAME" = Linux ]; then
+		ebegin "Bringing up network interface lo"
+		if command -v ip > /dev/null 2>&1; then
+			ip addr add 127.0.0.1/8 dev lo brd +
+			ip link set lo up
+		else
+			ifconfig lo 127.0.0.1 netmask 255.0.0.0
+		fi
+	else
+		ebegin "Bringing up network interface lo0"
+		ifconfig lo0 127.0.0.1 netmask 255.0.0.0
+		route -q add -inet 127.0.0.0 -netmask 255.0.0.0 127.0.0.1
+	fi
+	eend $?
+}
--- a/init.d/mixer.in
+++ b/init.d/mixer.in
@@ -1,6 +1,13 @@
-#!@PREFIX@/sbin/runscript
-# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+#!@SBINDIR@/openrc-run
+# Copyright (c) 2007-2015 The OpenRC Authors.
+# See the Authors file at the top-level directory of this distribution and
+# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+#
+# This file is part of OpenRC. It is subject to the license terms in
+# the LICENSE file found in the top-level directory of this
+# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# This file may not be copied, modified, propagated, or distributed
+# except according to the terms contained in the LICENSE file.

 extra_commands="restore"

--- a/init.d/modules-load.in
+++ b/init.d/modules-load.in
@@ -0,0 +1,72 @@
+#!@SBINDIR@/openrc-run
+# Copyright (c) 2016 The OpenRC Authors.
+# See the Authors file at the top-level directory of this distribution and
+# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+#
+# This file is part of OpenRC. It is subject to the license terms in
+# the LICENSE file found in the top-level directory of this
+# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# This file may not be copied, modified, propagated, or distributed
+# except according to the terms contained in the LICENSE file.
+
+description="Loads a list of modules from systemd-compatible locations."
+
+depend()
+{
+	keyword -docker -lxc -openvz -prefix -systemd-nspawn -vserver
+}
+
+find_modfiles()
+{
+	local dirs="/usr/lib/modules-load.d /run/modules-load.d /etc/modules-load.d"
+	local basenames files fn x y
+	for x in $dirs; do
+		[ ! -d $x ] && continue
+		for y in $x/*.conf; do
+			[ -f $y ] && basenames="${basenames}\n${y##*/}"
+		done
+	done
+	basenames=$(printf "$basenames" | sort -u)
+	for x in $basenames; do
+		for y in $dirs; do
+			[ -r $y/$x ] &&
+				fn=$y/$x
+		done
+		files="$files $fn"
+	done
+	echo $files
+}
+
+load_modules()
+{
+	local file m modules rc x
+	file=$1
+	[ -z "$file" ] && return 0
+	while read m x; do
+		case $m in
+			\;*) continue ;;
+			\#*) continue ;;
+			*) modules="$modules $m"
+			;;
+		esac
+	done < $file
+	for x in $modules; do
+		ebegin "Loading module $x"
+		case "$RC_UNAME" in
+			FreeBSD) kldload "$x"; rc=$? ;;
+			Linux) modprobe --use-blacklist -q "$x"; rc=$? ;;
+			*) ;;
+		esac
+		eend $rc "Failed to load $x"
+	done
+}
+
+start()
+{
+	local x
+	files=$(find_modfiles)
+	for x in $files; do
+		load_modules $x
+	done
+	return 0
+}
--- a/init.d/modules.in
+++ b/init.d/modules.in
@@ -1,16 +1,35 @@
-#!@PREFIX@/sbin/runscript
-# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+#!@SBINDIR@/openrc-run
+# Copyright (c) 2007-2015 The OpenRC Authors.
+# See the Authors file at the top-level directory of this distribution and
+# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+#
+# This file is part of OpenRC. It is subject to the license terms in
+# the LICENSE file found in the top-level directory of this
+# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# This file may not be copied, modified, propagated, or distributed
+# except according to the terms contained in the LICENSE file.

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

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

-start()
+FreeBSD_modules()
+{
+	local cnt=0 x
+	for x in $modules; do
+		ebegin "Loading module $x"
+		kldload "$x"
+		eend $? "Failed to load $x" && : $(( cnt += 1 ))
+	done
+	einfo "Autoloaded $cnt module(s)"
+}
+
+Linux_modules()
 {
 	# Should not fail if kernel do not have module
 	# support compiled in ...
@@ -56,8 +75,17 @@ start()
 		done
 		[ -z "$args" ] && eval args=\$module_${aa}_args
 		[ -z "$args" ] && eval args=\$module_${xx}_args
-		eval modprobe -q "$mpargs" "$x" "$args"
+		eval modprobe --use-blacklist -q "$mpargs" "$x" "$args"
 		eend $? "Failed to load $x" && : $(( cnt += 1 ))
 	done
 	einfo "Autoloaded $cnt module(s)"
 }
+
+start()
+{
+	case "$RC_UNAME" in
+		FreeBSD|Linux) ${RC_UNAME}_modules ;;
+		*) ;;
+	esac
+	return 0
+}
--- a/init.d/mount-ro.in
+++ b/init.d/mount-ro.in
@@ -1,13 +1,20 @@
-#!@PREFIX@/sbin/runscript
-# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+#!@SBINDIR@/openrc-run
+# Copyright (c) 2007-2015 The OpenRC Authors.
+# See the Authors file at the top-level directory of this distribution and
+# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+#
+# This file is part of OpenRC. It is subject to the license terms in
+# the LICENSE file found in the top-level directory of this
+# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# This file may not be copied, modified, propagated, or distributed
+# except according to the terms contained in the LICENSE file.

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

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

 start()
@@ -15,7 +22,7 @@ start()
 	local ret=0

 	# Flush all pending disk writes now
-	sync; sync
+	sync

 	ebegin "Remounting remaining filesystems read-only"
 	# We need the do_unmount function
@@ -27,6 +34,9 @@ start()

 	local m="/dev|/dev/.*|/proc|/proc.*|/sys|/sys/.*|/run|${rc_svcdir}" x= fs=
 	m="$m|/bin|/sbin|/lib(32|64)?|/libexec"
+	if [ -e "$rc_svcdir"/usr_premounted ]; then
+		m="$m|/usr"
+	fi
 	# RC_NO_UMOUNTS is an env var that can be set by plugins
 	local IFS="$IFS:"
 	for x in $no_umounts $RC_NO_UMOUNTS; do
--- a/init.d/moused.in
+++ b/init.d/moused.in
@@ -1,6 +1,13 @@
-#!@PREFIX@/sbin/runscript
-# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+#!@SBINDIR@/openrc-run
+# Copyright (c) 2007-2015 The OpenRC Authors.
+# See the Authors file at the top-level directory of this distribution and
+# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+#
+# This file is part of OpenRC. It is subject to the license terms in
+# the LICENSE file found in the top-level directory of this
+# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# This file may not be copied, modified, propagated, or distributed
+# except according to the terms contained in the LICENSE file.

 mouse=${RC_SVCNAME##*.}
 if [ -n "$mouse" -a "$mouse" != "moused" ]; then
--- a/init.d/mtab.in
+++ b/init.d/mtab.in
@@ -1,36 +1,46 @@
-#!@PREFIX@/sbin/runscript
-# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+#!@SBINDIR@/openrc-run
+# Copyright (c) 2007-2015 The OpenRC Authors.
+# See the Authors file at the top-level directory of this distribution and
+# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+#
+# This file is part of OpenRC. It is subject to the license terms in
+# the LICENSE file found in the top-level directory of this
+# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# This file may not be copied, modified, propagated, or distributed
+# except according to the terms contained in the LICENSE file.

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

 depend()
 {
 	need root
-	keyword -prefix
+	keyword -prefix -systemd-nspawn
 }

 start()
 {
-	if [ -L /etc/mtab ]
-	then
-		einfo "Skipping mtab update (mtab is a symbolic link)"
-		return 0
-	fi
-
+	local rc=0
 	ebegin "Updating /etc/mtab"
-	if ! echo 2>/dev/null >/etc/mtab; then
-		ewend 1 "/etc/mtab is not updateable"
-		return 0
+	if ! checkpath -W /etc; then
+		rc=1
+	elif ! yesno ${mtab_is_file:-no}; then
+		[ ! -L /etc/mtab ] && [ -f /etc/mtab ] &&
+			ewarn "Removing /etc/mtab file"
+		einfo "Creating mtab symbolic link"
+		ln -snf /proc/self/mounts /etc/mtab
+	else
+		[ -L /etc/mtab ] && ewarn "Removing /etc/mtab symbolic link"
+		rm -f /etc/mtab
+		einfo "Creating mtab file"
+		# 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
+		# which allows this hack to work.
+		grep -v "^[! ]* / tmpfs " /proc/mounts > /etc/mtab
+
+		# Remove stale backups
+		rm -f /etc/mtab~ /etc/mtab~~
 	fi
-
-	# 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
-	# which allows this hack to work.
-	grep -v "^[^ ]* / tmpfs " /proc/mounts > /etc/mtab
-
-	# Remove stale backups
-	rm -f /etc/mtab~ /etc/mtab~~
-	eend 0
+	eend $rc "/etc is not writable; unable to create /etc/mtab"
+	return 0
 }
--- a/init.d/net-online.in
+++ b/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 -docker -jail -lxc -openvz -prefix -systemd-nspawn -uml -vserver
+}
+
+get_interfaces()
+{
+	local ifname iftype
+	for ifname in /sys/class/net/*; do
+		read iftype < ${ifname}/type
+		[ "$iftype" = "1" ] && printf "%s " ${ifname##*/}
+	done
+}
+
+get_default_gateway()
+{
+	local cmd gateway
+	if command -v ip > /dev/null 2>&1; then
+		cmd="ip route show"
+	else
+		cmd=route
+	fi
+	set -- $($cmd | grep default)
+	[ "$2" != via ] && gateway="$2" || gateway="$3"
+	printf "%s" $gateway
+}
+
+start ()
+{
+	local carriers configured dev gateway ifcount infinite
+	local rc state x
+
+	ebegin "Checking to see if the network is online"
+	rc=0
+	interfaces=${interfaces:-$(get_interfaces)}
+	timeout=${timeout:-120}
+ [ $timeout -eq 0 ] && infinite=true || infinite=false
+ while $infinite || [ $timeout -gt 0 ]; do
+	carriers=0
+	configured=0
+	ifcount=0
+ 	for dev in ${interfaces}; do
+		: $((ifcount += 1))
+		read x < /sys/class/net/$dev/carrier
+		[ $x -eq 1 ] && : $((carriers += 1))
+		read x < /sys/class/net/$dev/operstate
+		[ "$x" = up ] && : $((configured += 1))
+	done
+	[ $configured -eq $ifcount ] && [ $carriers -ge 1 ] && break
+	sleep 1
+	: $((timeout -= 1))
+ done
+ ! $infinite && [ $timeout -eq 0 ] && rc=1
+ if [ $rc -eq 0 ] && yesno ${ping_default_gateway:-no}; then
+ 	gateway="$(get_default_gateway)"
+ 	if [ -n "$gateway" ] && ! ping -c 1 $gateway > /dev/null 2>&1; then
+		rc=1
+	fi
+ fi
+ eend $rc "The network is offline"
+}
--- a/init.d/net.lo.in
+++ b/init.d/net.lo.in
@@ -1,772 +0,0 @@
-#!@PREFIX@/sbin/runscript
-# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
-
-MODULESDIR="${RC_LIBEXECDIR}/net"
-MODULESLIST="${RC_SVCDIR}/nettree"
-_config_vars="config routes"
-
-[ -z "${IN_BACKGROUND}" ] && IN_BACKGROUND="NO"
-
-description="Configures network interfaces."
-
-# Handy var so we don't have to embed new lines everywhere for array splitting
-__IFS="
-"
-depend()
-{
-	local IFACE=${RC_SVCNAME#*.}
-	local IFVAR=$(shell_var "${IFACE}")
-
-	need localmount
-	if [ "$RC_UNAME" = Linux -a "$IFACE" != lo ]; then
-		need sysfs
-	fi
-	after bootmisc
-	keyword -jail -prefix -vserver
-
-	case "${IFACE}" in
-		lo|lo0) ;;
-		*)
-			after net.lo net.lo0 dbus
-			provide net
-			;;
-	esac
-
-	if [ "$(command -v "depend_${IFVAR}")" = "depend_${IFVAR}" ]; then
-		depend_${IFVAR}
-	fi
-
-	local dep= prov=
-	for dep in need use before after provide keyword; do
-		eval prov=\$rc_${dep}_${IFVAR}
-		if [ -n "${prov}" ]; then
-			${dep} ${prov}
-			ewarn "rc_${dep}_${IFVAR} is deprecated."
-			ewarn "Please use rc_net_${IFVAR}_${dep} instead."
-		fi
-	done
-}
-
-# Support bash arrays - sigh
-_array_helper()
-{
-	local _a=
-
-	eval _a=\$$1
-	_a=$(echo "${_a}" | sed -e 's:^[[:space:]]*::' -e 's:[[:space:]]*$::' -e '/^$/d' -e 's:[[:space:]]\{1,\}: :g')
-
-	[ -n "${_a}" ] && printf "%s\n" "${_a}"
-}
-
-_get_array()
-{
-	local _a=
-	if [ -n "${BASH}" ]; then
-		case "$(declare -p "$1" 2>/dev/null)" in
-			"declare -a "*)
-				ewarn "You are using a bash array for $1."
-				ewarn "This feature will be removed in the future."
-				ewarn "Please see net.example for the correct format for $1."
-				eval "set -- \"\${$1[@]}\""
-				for _a; do
-					printf "%s\n" "${_a}"
-				done
-				return 0
-				;;
-		esac
-	fi
-
-	_array_helper $1
-}
-
-# Flatten bash arrays to simple strings
-_flatten_array()
-{
-	if [ -n "${BASH}" ]; then
-		case "$(declare -p "$1" 2>/dev/null)" in
-			"declare -a "*)
-				ewarn "You are using a bash array for $1."
-				ewarn "This feature will be removed in the future."
-				ewarn "Please see net.example for the correct format for $1."
-				eval "set -- \"\${$1[@]}\""
-				for x; do
-					printf "'%s' " "$(printf "$x" | sed "s:':'\\\'':g")"
-				done
-				return 0
-				;;
-		esac
-	fi
-
-	_array_helper $1
-}
-
-_wait_for_carrier()
-{
-	local timeout= efunc=einfon
-
-	_has_carrier  && return 0
-
-	eval timeout=\$carrier_timeout_${IFVAR}
-	timeout=${timeout:-${carrier_timeout:-5}}
-
-	# Incase users don't want this nice feature ...
-	[ ${timeout} -le 0 ] && return 0
-
-	yesno ${RC_PARALLEL} && efunc=einfo
-	${efunc} "Waiting for carrier (${timeout} seconds) "
-	while [ ${timeout} -gt 0 ]; do
-		sleep 1
-		if _has_carrier; then
-			[ "${efunc}" = "einfon" ] && echo
-			eend 0
-			return 0
-		fi
-		: $(( timeout -= 1 ))
-		[ "${efunc}" = "einfon" ] && printf "."
-	done
-
-	[ "${efunc}" = "einfon" ] && echo
-	eend 1
-	return 1
-}
-
-_netmask2cidr()
-{
-	# Some shells cannot handle hex arithmetic, so we massage it slightly
-	# Buggy shells include FreeBSD sh, dash and busybox.
-	# bash and NetBSD sh don't need this.
-	case $1 in
-		0x*)
-		local hex=${1#0x*} quad=
-		while [ -n "${hex}" ]; do
-			local lastbut2=${hex#??*}
-			quad=${quad}${quad:+.}0x${hex%${lastbut2}*}
-			hex=${lastbut2}
-		done
-		set -- ${quad}
-		;;
-	esac
-
-	local i= len=
-	local IFS=.
-	for i in $1; do
-		while [ ${i} -ne 0 ]; do
-			: $(( len += i % 2 ))
-			: $(( i >>= 1 ))
-		done
-	done
-
-	echo "${len}"
-}
-
-_configure_variables()
-{
-	local var= v= t=
-
-	for var in ${_config_vars}; do
-		local v=
-		for t; do
-			eval v=\$${var}_${t}
-			if [ -n "${v}" ]; then
-				eval ${var}_${IFVAR}=\$${var}_${t}
-				continue 2
-			fi
-		done
-	done
-}
-
-_which()
-{
-	local i OIFS
-	# Empty
-	[ -z "$1" ] && return
-	# check paths
-	OIFS="$IFS"
-	IFS=:
-	for i in $PATH ; do
-		[ -x $i/$1 ] && echo $i/$1 && break
-	done
-	IFS=$OIFS
-}
-
-# Like _which, but also consider shell builtins, and multiple alternatives
-_program_available()
-{
-	[ -z "$1" ] && return 0
-	local x=
-	for x; do
-		case "${x}" in
-			/*) [ -x "${x}" ] && break;;
-			*) type "${x}" >/dev/null 2>&1 && break;;
-		esac
-		unset x
-	done
-	[ -n "${x}" ] && echo $x && return 0
-	return 1
-}
-
-_show_address()
-{
-	einfo "received address $(_get_inet_address "${IFACE}")"
-}
-
-# Basically sorts our modules into order and saves the list
-_gen_module_list()
-{
-	local x= f= force=$1
-	if ! ${force} && [ -s "${MODULESLIST}" -a "${MODULESLIST}" -nt "${MODULESDIR}" ]; then
-		local update=false
-		for x in "${MODULESDIR}"/*.sh; do
-			[ -e "${x}" ] || continue
-			if [ "${x}" -nt "${MODULESLIST}" ]; then
-				update=true
-				break
-			fi
-		done
-		${update} || return 0
-	fi
-
-	einfo "Caching network module dependencies"
-	# Run in a subshell to protect the main script
-	(
-	after() {
-		eval ${MODULE}_after="\"\${${MODULE}_after}\${${MODULE}_after:+ }$*\""
-	}
-
-	before() {
-		local mod=${MODULE}
-		local MODULE=
-		for MODULE; do
-			after "${mod}"
-		done
-	}
-
-	program() {
-		if [ "$1" = "start" -o "$1" = "stop" ]; then
-			local s="$1"
-			shift
-			eval ${MODULE}_program_${s}="\"\${${MODULE}_program_${s}}\${${MODULE}_program_${s}:+ }$*\""
-		else
-			eval ${MODULE}_program="\"\${${MODULE}_program}\${${MODULE}_program:+ }$*\""
-		fi
-	}
-
-	provide() {
-		eval ${MODULE}_provide="\"\${${MODULE}_provide}\${${MODULE}_provide:+ }$*\""
-		local x
-		for x in $*; do
-			eval ${x}_providedby="\"\${${MODULE}_providedby}\${${MODULE}_providedby:+ }${MODULE}\""
-		done
-	}
-
-	for MODULE in "${MODULESDIR}"/*.sh; do
-		sh -n "${MODULE}" || continue
-		. "${MODULE}" || continue
-		MODULE=${MODULE#${MODULESDIR}/}
-		MODULE=${MODULE%.sh}
-		eval ${MODULE}_depend
-		MODULES="${MODULES} ${MODULE}"
-	done
-
-	VISITED=
-	SORTED=
-	visit() {
-		case " ${VISITED} " in
-			*" $1 "*) return;;
-		esac
-		VISITED="${VISITED} $1"
-
-		eval AFTER=\$${1}_after
-		for MODULE in ${AFTER}; do
-			eval PROVIDEDBY=\$${MODULE}_providedby
-			if [ -n "${PROVIDEDBY}" ]; then
-				for MODULE in ${PROVIDEDBY}; do
-					visit "${MODULE}"
-				done
-			else
-				visit "${MODULE}"
-			fi
-		done
-
-		eval PROVIDE=\$${1}_provide
-		for MODULE in ${PROVIDE}; do
-			visit "${MODULE}"
-		done
-
-		eval PROVIDEDBY=\$${1}_providedby
-		[ -z "${PROVIDEDBY}" ] && SORTED="${SORTED} $1"
-	}
-
-	for MODULE in ${MODULES}; do
-		visit "${MODULE}"
-	done
-
-	printf "" > "${MODULESLIST}"
-	i=0
-	for MODULE in ${SORTED}; do
-		eval PROGRAM=\$${MODULE}_program
-		eval PROGRAM_START=\$${MODULE}_program_start
-		eval PROGRAM_STOP=\$${MODULE}_program_stop
-		eval PROVIDE=\$${MODULE}_provide
-		echo "module_${i}='${MODULE}'" >> "${MODULESLIST}"
-		echo "module_${i}_program='${PROGRAM}'" >> "${MODULESLIST}"
-		echo "module_${i}_program_start='${PROGRAM_START}'" >> "${MODULESLIST}"
-		echo "module_${i}_program_stop='${PROGRAM_STOP}'" >> "${MODULESLIST}"
-		echo "module_${i}_provide='${PROVIDE}'" >> "${MODULESLIST}"
-		: $(( i += 1 ))
-	done
-	echo "module_${i}=" >> "${MODULESLIST}"
-	)
-
-	return 0
-}
-
-_load_modules()
-{
-	local starting=$1 mymods=
-
-	# Ensure our list is up to date
-	_gen_module_list false
-	if ! . "${MODULESLIST}"; then
-		_gen_module_list true
-		. "${MODULESLIST}"
-	fi
-
-	MODULES=
-	if [ "${IFACE}" != "lo" -a "${IFACE}" != "lo0" ]; then
-		eval mymods=\$modules_${IFVAR}
-		[ -z "${mymods}" ] && mymods=${modules}
-	fi
-
-	local i=-1 x= mod= f= provides=
-	while true; do
-		: $(( i += 1 ))
-		eval mod=\$module_${i}
-		[ -z "${mod}" ] && break
-		[ -e "${MODULESDIR}/${mod}.sh" ] || continue
-
-		eval set -- \$module_${i}_program
-		if [ -n "$1" ]; then
-			if ! _program_available "$@" >/dev/null; then
-				vewarn "Skipping module $mod due to missing program: $@"
-				continue
-			fi
-		fi
-		if ${starting}; then
-			eval set -- \$module_${i}_program_start
-		else
-			eval set -- \$module_${i}_program_stop
-		fi
-		if [ -n "$1" ]; then
-			if ! _program_available "$@" >/dev/null; then
-				vewarn "Skipping module $mod due to missing program: $@"
-				continue
-			fi
-		fi
-
-		eval provides=\$module_${i}_provide
-		if ${starting}; then
-			case " ${mymods} " in
-				*" !${mod} "*) continue;;
-				*" !${provides} "*) [ -n "${provides}" ] && continue;;
-			esac
-		fi
-		MODULES="${MODULES}${MODULES:+ }${mod}"
-
-		# Now load and wrap our functions
-		if ! . "${MODULESDIR}/${mod}.sh"; then
-			eend 1 "${RC_SVCNAME}: error loading module \`${mod}'"
-			exit 1
-		fi
-
-		[ -z "${provides}" ] && continue
-
-		# Wrap our provides
-		local f=
-		for f in pre_start start post_start; do
-			eval "${provides}_${f}() { [ "$(command -v "${mod}_${f}")" = "${mod}_${f}" ] || return 0; ${mod}_${f} \"\$@\"; }"
-		done
-
-		eval module_${mod}_provides="${provides}"
-		eval module_${provides}_providedby="${mod}"
-	done
-
-	# Wrap our preferred modules
-	for mod in ${mymods}; do
-		case " ${MODULES} " in
-			*" ${mod} "*)
-			eval x=\$module_${mod}_provides
-			[ -z "${x}" ] && continue
-			for f in pre_start start post_start; do
-				eval "${x}_${f}() { [ "$(command -v "${mod}_${f}")" = "${mod}_${f}" ] || return 0; ${mod}_${f} \"\$@\"; }"
-			done
-			eval module_${x}_providedby="${mod}"
-			;;
-		esac
-	done
-
-	# Finally remove any duplicated provides from our list if we're starting
-	# Otherwise reverse the list
-	local LIST="${MODULES}" p=
-	MODULES=
-	if ${starting}; then
-		for mod in ${LIST}; do
-			eval x=\$module_${mod}_provides
-			if [ -n "${x}" ]; then
-				eval p=\$module_${x}_providedby
-				[ "${mod}" != "${p}" ] && continue
-			fi
-			MODULES="${MODULES}${MODULES:+ }${mod}"
-		done
-	else
-		for mod in ${LIST}; do
-			MODULES="${mod}${MODULES:+ }${MODULES}"
-		done
-	fi
-
-	veinfo "Loaded modules: ${MODULES}"
-}
-
-_load_config()
-{
-	local config="$(_get_array "config_${IFVAR}")"
-	local fallback="$(_get_array fallback_${IFVAR})"
-
-	config_index=0
-	local IFS="$__IFS"
-	set -- ${config}
-
-	# We should support a space separated array for cidr configs
-	# But only as long as they do not contain other parameters for the address
-	if [ $# = 1 ]; then
-		unset IFS
-		set -- ${config}
-		# Of course, we may have a single address added old style.
-		# If the NEXT argument is a v4 or v6 address, it's the next config.
-		# Otherwise, it's arguments to the first config...
-		if [ "${2#*.*}" = "${2}" -a "${2#*:*}" = "${2}" ]; then
-			# Not an IPv4/IPv6
-			local IFS="$__IFS"
-			set -- ${config}
-		fi
-	fi
-
-	# Ensure that loopback has the correct address
-	if [ "${IFACE}" = "lo" -o "${IFACE}" = "lo0" ]; then
-		if [ "$1" != "null" ]; then
-		   	config_0="127.0.0.1/8"
-			config_index=1
-		fi
-	else
-		if [ -z "$1" ]; then
-			ewarn "No configuration specified; defaulting to DHCP"
-			config_0="dhcp"
-			config_index=1
-		fi
-	fi
-
-
-	# We store our config in an array like vars
-	# so modules can influence it
-	for cmd; do
-		eval config_${config_index}="'${cmd}'"
-		: $(( config_index += 1 ))
-	done
-	# Terminate the list
-	eval config_${config_index}=
-
-	config_index=0
-	for cmd in ${fallback}; do
-		eval fallback_${config_index}="'${cmd}'"
-		: $(( config_index += 1 ))
-	done
-	# Terminate the list
-	eval fallback_${config_index}=
-
-	# Don't set to zero, so any net modules don't have to do anything extra
-	config_index=-1
-}
-
-# Support functions
-_run_if()
-{
-	local cmd=$1 iface=$2 ifr=${IFACE} ifv=${IFVAR}
-	# Ensure that we don't stamp on real values
-	local IFACE= IFVAR=
-	shift
-	if [ -n "${iface}" ]; then
-		IFACE="${iface}"
-		[ "${iface}" != "${ifr}" ] && IFVAR=$(shell_var "${IFACE}")
-	else
-		IFACE=${ifr}
-		IFVAR=${ifv}
-	fi
-	${cmd}
-}
-interface_exists()
-{
-	_run_if _exists "$@"
-}
-interface_up()
-{
-	_run_if _up "$@"
-}
-interface_down()
-{
-	_run_if _down "$@"
-}
-
-start()
-{
-	local IFACE=${RC_SVCNAME#*.} oneworked=false fallback=false module=
-	local IFVAR=$(shell_var "${IFACE}") cmd= our_metric=
-	local metric=0 _up_before_preup
-	eval _up_before_preup="\$up_before_preup_${IFVAR}"
-	[ -z "${_up_before_preup}" ] && _up_before_preup=$up_before_preup
-
-	einfo "Bringing up interface ${IFACE}"
-	eindent
-
-	if [ -z "${MODULES}" ]; then
-		local MODULES=
-		_load_modules true
-	fi
-
-	# We up the iface twice if we have a preup to ensure it's up if
-	# available in preup and afterwards incase the user inadvertently
-	# brings it down
-	if [ "$(command -v preup)" = "preup" ]; then
-		yesno "${_up_before_preup:-yes}" && _up 2>/dev/null
-		ebegin "Running preup"
-		eindent
-		preup || return 1
-		eoutdent
-	fi
-
-	_up 2>/dev/null
-
-	for module in ${MODULES}; do
-		if [ "$(command -v "${module}_pre_start")" = "${module}_pre_start" ]; then
-			${module}_pre_start || exit $?
-		fi
-	done
-
-	if ! _exists; then
-		eerror "ERROR: interface ${IFACE} does not exist"
-		eerror "Ensure that you have loaded the correct kernel module for your hardware"
-		return 1
-	fi
-
-	if ! _wait_for_carrier; then
-		if service_started devd; then
-			ewarn "no carrier, but devd will start us when we have one"
-			mark_service_inactive "${RC_SVCNAME}"
-		else
-			eerror "no carrier"
-		fi
-		return 1
-	fi
-
-	local config= config_index=
-	_load_config
-	config_index=0
-
-	eval our_metric=\$metric_${IFVAR}
-	if [ -n "${our_metric}" ]; then
-		metric=${our_metric}
-	elif [ "${IFACE}" != "lo" -a "${IFACE}" != "lo0" ]; then
-		: $(( metric += $(_ifindex) ))
-	fi
-
-	while true; do
-		eval config=\$config_${config_index}
-		[ -z "${config}" ] && break
-
-		set -- ${config}
-		if [ "$1" != "null" -a "$1" != "noop" ]; then
-			ebegin "$1"
-		fi
-		eindent
-		case "$1" in
-			noop)
-				if [ -n "$(_get_inet_address)" ]; then
-					oneworked=true
-					break
-				fi
-				;;
-			null) :;;
-			[0-9]*|*:*) _add_address ${config};;
-			*)
-				if [ "$(command -v "${config}_start")" = "${config}_start" ]; then
-					"${config}"_start
-				else
-					eerror "nothing provides \`${config}'"
-				fi
-				;;
-		esac
-		if eend $?; then
-			oneworked=true
-		else
-			eval config=\$fallback_${config_index}
-			if [ -n "${config}" ]; then
-				fallback=true
-				eoutdent
-				ewarn "Trying fallback configuration ${config}"
-				eindent
-				eval config_${config_index}=\$config
-				unset fallback_${config_index}
-				: $(( config_index -= 1 ))
-			fi
-		fi
-		eoutdent
-		: $(( config_index += 1 ))
-	done
-
-	if ! ${oneworked}; then
-		if [ "$(command -v failup)" = "failup" ]; then
-			ebegin "Running failup"
-			eindent
-			failup
-			eoutdent
-		fi
-		return 1
-	fi
-
-	local hidefirstroute=false first=true routes=
-	if ${fallback}; then
-		routes="$(_get_array "fallback_routes_${IFVAR}")"
-	fi
-	if [ -z "${routes}" ]; then
-		routes="$(_get_array "routes_${IFVAR}")"
-	fi
-	if [ "${IFACE}" = "lo" -o "${IFACE}" = "lo0" ]; then
-		if [ "${config_0}" != "null" ]; then
-			routes="127.0.0.0/8 via 127.0.0.1
-${routes}"
-			hidefirstroute=true
-		fi
-	fi
-
-	local OIFS="${IFS}" SIFS="${IFS-y}"
-	local IFS="$__IFS"
-	for cmd in ${routes}; do
-		unset IFS
-		if ${first}; then
-			first=false
-			einfo "Adding routes"
-		fi
-		eindent
-		ebegin ${cmd}
-		# Work out if we're a host or a net if not told
-		case ${cmd} in
-			-net" "*|-host" "*);;
-			*" "netmask" "*)                   cmd="-net ${cmd}";;
-			*.*.*.*/32*)                       cmd="-host ${cmd}";;
-			*.*.*.*/*|0.0.0.0|0.0.0.0" "*)     cmd="-net ${cmd}";;
-			default|default" "*)               cmd="-net ${cmd}";;
-			*)                                 cmd="-host ${cmd}";;
-		esac
-		if ${hidefirstroute}; then
-			_add_route ${cmd} >/dev/null 2>&1
-			hidefirstroute=false
-		else
-			_add_route ${cmd} >/dev/null
-		fi
-		eend $?
-		eoutdent
-	done
-	if [ "${SIFS}" = "y" ]; then
-		unset IFS
-	else
-		IFS="${OIFS}"
-	fi
-
-	for module in ${MODULES}; do
-		if [ "$(command -v "${module}_post_start")" = "${module}_post_start" ]; then
-			${module}_post_start || exit $?
-		fi
-	done
-
-	if [ "$(command -v postup)" = "postup" ]; then
-		ebegin "Running postup"
-		eindent
-		postup
-		eoutdent
-	fi
-
-	return 0
-}
-
-stop()
-{
-	local IFACE=${RC_SVCNAME#*.} module=
-	local IFVAR=$(shell_var "${IFACE}") opts=
-
-	einfo "Bringing down interface ${IFACE}"
-	eindent
-
-	if [ -z "${MODULES}" ]; then
-		local MODULES=
-		_load_modules false
-	fi
-
-	if [ "$(command -v predown)" = "predown" ]; then
-		ebegin "Running predown"
-		eindent
-		predown || return 1
-		eoutdent
-	else
-		if is_net_fs /; then
-			eerror "root filesystem is network mounted -- can't stop ${IFACE}"
-			return 1
-		fi
-	fi
-
-	for module in ${MODULES}; do
-		if [ "$(command -v "${module}_pre_stop")" = "${module}_pre_stop" ]; then
-			${module}_pre_stop || exit $?
-		fi
-	done
-
-	for module in ${MODULES}; do
-		if [ "$(command -v "${module}_stop")" = "${module}_stop" ]; then
-			${module}_stop
-		fi
-	done
-
-	# Only delete addresses for interfaces that exist
-	if _exists; then
-		# PPP can manage it's own addresses when IN_BACKGROUND
-		# Important in case "demand" set on the ppp link
-		if ! (yesno ${IN_BACKGROUND} && is_ppp) ; then
-			_delete_addresses "${IFACE}"
-		fi
-	fi
-
-	for module in ${MODULES}; do
-		if [ "$(command -v "${module}_post_stop")" = "${module}_post_stop" ]; then
-			${module}_post_stop
-		fi
-	done
-
-	# If not in background, and not loopback then bring the interface down
-	# unless overridden.
-	if ! yesno ${IN_BACKGROUND} && \
-	[ "${IFACE}" != "lo" -a "${IFACE}" != "lo0" ]; then
-		eval module=\$ifdown_${IFVAR}
-		module=${module:-${ifdown:-YES}}
-		yesno ${module} && _down 2>/dev/null
-	fi
-
-	type resolvconf >/dev/null 2>&1 && resolvconf -d "${IFACE}" 2>/dev/null
-
-	if [ "$(command -v "postdown")" = "postdown" ]; then
-		ebegin "Running postdown"
-		eindent
-		postdown
-		eoutdent
-	fi
-
-	return 0
-}
--- a/init.d/netmount.in
+++ b/init.d/netmount.in
@@ -1,42 +1,60 @@
-#!@PREFIX@/sbin/runscript
-# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+#!@SBINDIR@/openrc-run
+# Copyright (c) 2007-2015 The OpenRC Authors.
+# See the Authors file at the top-level directory of this distribution and
+# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+#
+# This file is part of OpenRC. It is subject to the license terms in
+# the LICENSE file found in the top-level directory of this
+# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# This file may not be copied, modified, propagated, or distributed
+# except according to the terms contained in the LICENSE file.

-description="Mounts network shares, other than NFS, according to /etc/fstab."
-# We skip all NFS shares in this script because they require extra
-# daemons to be running on the client in order to work correctly.
-# It is best to allow nfs-utils to handle all nfs shares.
+description="Mounts network shares according to /etc/fstab."

 depend()
 {
-	config /etc/fstab
-	need net
-	use afc-client amd 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 -vserver
+	keyword -docker -jail -lxc -prefix -systemd-nspawn -vserver
 }

 start()
 {
 	local x= fs= rc=
 	for x in $net_fs_list $extra_net_fs_list; do
-		case "$x" in
-			nfs|nfs4)
-			continue
-			;;
-		esac
 		fs="$fs${fs:+,}$x"
 	done

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

 stop()
@@ -47,14 +65,7 @@ stop()
 	. "$RC_LIBEXECDIR"/sh/rc-mount.sh

 	for x in $net_fs_list $extra_net_fs_list; do
-		case "$x" in
-			nfs|nfs4)
-				continue
-				;;
-			*)
-				fs="$fs${fs:+,}$x"
-				;;
-		esac
+		fs="$fs${fs:+,}$x"
 	done
 	if [ -n "$fs" ]; then
 		umount -at $fs || eerror "Failed to simply unmount filesystems"
@@ -63,21 +74,14 @@ stop()
 	eindent
 	fs=
 	for x in $net_fs_list $extra_net_fs_list; do
-		case "$x" in
-			nfs|nfs4)
-				continue
-				;;
-			*)
-				fs="$fs${fs:+|}$x"
-				;;
-		esac
+		fs="$fs${fs:+|}$x"
 	done
 	[ -n "$fs" ] && fs="^($fs)$"
 	do_unmount umount ${fs:+--fstype-regex} $fs --netdev
 	retval=$?

 	eoutdent
-	if [ "$RC_UNAME" = Linux ]; then
+	if [ "$RC_UNAME" = Linux ] && [ $retval = 0 ]; then
 		umount -a -O _netdev
 		retval=$?
 	fi
--- a/init.d/network.in
+++ b/init.d/network.in
@@ -1,6 +1,13 @@
-#!@PREFIX@/sbin/runscript
-# Copyright (c) 2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+#!@SBINDIR@/openrc-run
+# Copyright (c) 2009-2015 The OpenRC Authors.
+# See the Authors file at the top-level directory of this distribution and
+# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+#
+# This file is part of OpenRC. It is subject to the license terms in
+# the LICENSE file found in the top-level directory of this
+# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# This file may not be copied, modified, propagated, or distributed
+# except according to the terms contained in the LICENSE file.

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

@@ -46,7 +53,11 @@ sys_interfaces()
 		local w= rest= i= cmd=$1
 		while read w rest; do
 			i=${w%%:*}
-			[ "$i" != "$w" ] || continue
+			case "$i" in
+				"$w") continue ;;
+				lo|lo0) continue ;;
+				*) ;;
+			esac
 			if [ "$cmd" = u ]; then
 				ifconfig "$i" | grep -q "[ ]*UP" || continue
 			fi
@@ -223,15 +234,6 @@ start()

 	einfo "Starting network"
 	routeflush
-	if [ "$RC_UNAME" = "Linux" ]; then
-		ifconfig lo 127.0.0.1 netmask 255.0.0.0 || cr=1
-		route add -net 127.0.0.0 netmask 255.0.0.0 \
-			gw 127.0.0.1 reject 2>/dev/null
-	else
-		ifconfig lo0 127.0.0.1 netmask 255.0.0.0 || cr=1
-		route -q add -inet 127.0.0.0 -netmask 255.0.0.0 \
-			127.0.0.1 -reject || cr=1
-	fi
 	eindent
 	for int in $(interfaces); do
 		local func= cf=
@@ -323,13 +325,17 @@ stop()
 	# Don't stop the network at shutdown.
 	# We don't use the noshutdown keyword so that we are started again
 	# correctly if we go back to multiuser.
-	yesno ${shutdown_network:-YES} && yesno $RC_GOINGDOWN && return 0
+	yesno ${keep_network:-YES} && yesno $RC_GOINGDOWN && return 0

 	local int= intv= cmd= downcmd= r=
 	einfo "Stopping network"
 	routeflush
 	eindent
 	for int in $(reverse $(interfaces u)); do
+		case "$int" in
+			lo|lo0) continue ;;
+			*) ;;
+		esac
 		intv=$(shell_var "$int")
 		eval downcmd=\$ifdown_$intv
 		eval cmd=\$ip_$intv
--- a/init.d/newsyslog.in
+++ b/init.d/newsyslog.in
@@ -1,6 +1,13 @@
-#!@PREFIX@/sbin/runscript
-# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+#!@SBINDIR@/openrc-run
+# Copyright (c) 2007-2015 The OpenRC Authors.
+# See the Authors file at the top-level directory of this distribution and
+# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+#
+# This file is part of OpenRC. It is subject to the license terms in
+# the LICENSE file found in the top-level directory of this
+# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# This file may not be copied, modified, propagated, or distributed
+# except according to the terms contained in the LICENSE file.

 required_files="/etc/newsyslog.conf"

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

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

 description="Turns numlock on for the consoles."

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

 _setleds()
--- a/init.d/osclock.in
+++ b/init.d/osclock.in
@@ -0,0 +1,19 @@
+#!@SBINDIR@/openrc-run
+# Copyright (c) 2014-2015 The OpenRC Authors.
+# See the Authors file at the top-level directory of this distribution and
+# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+#
+# This file is part of OpenRC. It is subject to the license terms in
+# the LICENSE file found in the top-level directory of this
+# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# This file may not be copied, modified, propagated, or distributed
+# except according to the terms contained in the LICENSE file.
+
+# Can be used on OSs that take care of the clock.
+
+description="Provides clock"
+
+depend()
+{
+	provide clock
+}
--- a/Show More
+++ b/Show More