Begin port to GNU/kFreeBSD

This is just a minimal port to get Debian up and running; the rest will be done later.
bootmisc: do not run clean_run on VSERVER systems
2013-10-30 15:00:40 -05:00 · 2013-10-28 15:40:47 -05:00 · 2013-10-28 15:40:16 -05:00 · 2013-10-28 15:39:19 -05:00 · 2013-10-18 15:22:24 -05:00 · 2013-10-18 15:19:52 -05:00
223 changed files with 3476 additions and 8409 deletions
--- a/99
+++ b/99
@@ -1,99 +0,0 @@
-Alessio Ababilov <ilovedevlinux@gmail.com>
-Alexander Berntsen <alexander@plaimi.net>
-Alexander Mezin <mezin.alexander@gmail.com>
-Alexander Tsoy <alexander@tsoy.me>
-Alexander Vershilov <alexander.vershilov@gmail.com>
-Alexander Vershilov <qnikst@gentoo.org>
-Alexander V Vershilov <qnikst@gentoo.org>
-Alexey Shvetsov <alexxy@gentoo.org>
-Alon Bar-Lev <alon.barlev@gmail.com>
-Amadeusz Żołnowski <aidecoe@aidecoe.name>
-Andrew Gregory <andrew.gregory.8@gmail.com>
-Anthony Donnelly <Amzo@archbsd.com>
-Anthony G. Basile <basile@opensource.dyc.edu>
-Anthony G. Basile <blueness@gentoo.org>
-Austin S. Hemmelgarn <ahferroin7@gmail.com>
-Benda Xu <heroxbd@gentoo.org>
-Björn Baumbach <bb@sernet.de>
-Charlie <root@uberlaptop.development.ltl>
-Chris Richards <gizmo@giz-works.com>
-Christian <christian@ch-sc.de>
-Christian Ruppert <idl0r@gentoo.org>
-Christian Wetzig <gentoo@wetzig.de>
-Christopher Head <chead@telus.net>
-Consus <consus@gmx.com>
-Daniel Mierswa <impulze@impulze.org>
-Daniel Robbins <drobbins@funtoo.org>
-Diego Elio Pettenò <flameeyes@flameeyes.eu>
-Diego Elio Pettenò <flameeyes@gmail.com>
-Diego <flameeyes@gentoo.org>
-Dirk Sondermann <ds-gentoo@dyximaq.de>
-Doug Freed <dwfreed@mtu.edu>
-Doug Goldstein <cardoe@cardoe.com>
-Ed Wildgoose <gentoo@wildgooses.com>
-Eray Aslan <eras@gentoo.org>
-Eugeny Shkrigunov <eshkrig@gmail.com>
-Fedja Beader <specing@contact.me.on.irc.freenode.net>
-Flex <frostynova@gmail.com>
-Gabriele Giacone <1o5g4r8o@gmail.com>
-Gary <admin@garyshood.com>
-Gilles Oivier <g.olivier@wanadoo.fr>
-Hank Leininger <hlein@korelogic.com>
-Ian Stakenvicius <axs@gentoo.org>
-Jakob Drexel <jake42@rommel.stw.uni-erlangen.de>
-James Le Cuirot <chewi@aura-online.co.uk>
-Jan Psota <jasiu@belsznica.pl>
-Jason Zaman <jason@perfinion.com>
-Joe Harvell <jharvell@dogpad.net>
-Joe M <joe9mail@gmail.com>
-Johan Bergström <bugs@bergstroem.nu>
-Jory A. Pratt <anarchy@gentoo.org>
-Juan RP <xtraeme@gmail.com>
-Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
-Kfir Lavi <lavi.kfir@gmail.com>
-Kirill Elagin <kirelagin@gmail.com>
-Lars Wendler <polynomial-c@gentoo.org>
-Lorand Kelemen <lorand.kelemen@indgroup.eu>
-Marc Joliet <marcec@gmx.de>
-Marien Zwart <marienz@gentoo.org>
-Michal Gorny <gentoo@mgorny.alt.pl>
-Mihai Moldovan <ionic@ionic.de>
-Mike Frysinger <vapier@gentoo.org>
-Mike Gilbert <floppym@gentoo.org>
-Nao Nakashima <nao.nakashima@gmail.com>
-Natanael Copa <natanael.copa@gmail.com>
-Nathan Phillip Brink <ohnobinki@ohnopublishing.net>
-Ned Ludd <solar@gentoo.org>
-Olivier Huber <oli.huber@gmail.com>
-Patrick Lauer <patrick@gentoo.org>
-Petre Rodan <petre.rodan@simplex.ro>
-Piotr Karbowski <piotr.karbowski@gmail.com>
-Ralph Sennhauser <sera@gentoo.org>
-Richard Yao <ryao@cs.stonybrook.edu>
-Rick Farina (ZeroChaos) <sidhayn@gmail.com>
-Rick Farina (Zero_Chaos) <zerochaos@gentoo.org>
-Robin H. Johnson <robbat2@gentoo.org>
-Robin H. Johnson <robbat2@orbis-terrarum.net>
-Robin Johnson <robbat2@gentoo.org>
-Roy Marples <roy@marples.name>
-Salah Coronya <salah.coronya@gmail.com>
-Sebastian Thorarensen <indigo176@blinkenshell.org>
-Semen Maryasin <marsoft@ya.ru>
-Sergei Trofimovich <slyfox@gentoo.org>
-Seth Robertson <in-gentoo@baka.org>
-S. Gilles <sgilles@umd.edu>
-Stefan Knoblich <s.knoblich@axsentis.de>
-Stef Simoens <stef.simoens@scarlet.be>
-Steve L <slong@rathaus.eclipse.co.uk>
-Steven Chamberlain <steven@pyro.eu.org>
-Svante Signell <svante.signell@gmail.com>
-Sven Vermeulen <sven.vermeulen@siphos.be>
-Thomas D <whissi@whissi.de>
-Thomas Pfaff <tpfaff@gmx.net>
-Trevor Summers Smith <trevorsummerssmith@gmail.com>
-Walter <walter@pratyeka.org>
-William Hubbs <w.d.hubbs@gmail.com>
-William Hubbs <williamh@gentoo.org>
-Will Miles <wmiles@sgl.com>
-Yun Zheng Hu <hu@fox-it.com>
-Yuta SATOH <nigoro.gentoo@0x100.com>
--- a/BUSYBOX.md
+++ b/BUSYBOX.md
@@ -1,32 +0,0 @@
-# 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_IP -- The ip applet  doesn't support the "scope" modifier for
-"ip route add" and "ip address add".
-
-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/1457
+++ b/1457
--- a/49
+++ b/49
@@ -0,0 +1,49 @@
+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
@@ -1,78 +0,0 @@
-# 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: Depprecated in favor of extra_commands, extra_started_commands
-	 and extra_stopped_commands.
-
-Who:
-
-## support for local_start and local_stop
-
-When: 1.0
-
-Why: Depprecated in favor of executable scripts in @SYSCONFDIR@/local.d
-
-Who:
-
-## the mtab service script
-
-When: force /etc/mtab to link to /proc/self/mounts in 1.0, remove
-	  service in 2.0
-
-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
@@ -1,62 +0,0 @@
-# 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
@@ -1,24 +0,0 @@
-Copyright (c) 2007-2008, Roy Marples <roy@marples.name>
-Copyright (c) 2007-2015, the OpenRC authors
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
--- a/20
+++ b/20
@@ -1,17 +1,8 @@
-# Copyright (c) 2007-2015 The OpenRC Authors.
-# See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
-#
-# This file is part of OpenRC. It is subject to the license terms in
-# the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
-# This file may not be copied, modified, propagated, or distributed
-# except according to the terms contained in the LICENSE file.
+# OpenRC Makefile
+# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

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

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

@@ -26,11 +17,12 @@ SUBDIR+=	runlevels

 INSTALLAFTER=	_installafter

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

 _installafter:
 ifeq (${MKPREFIX},yes)
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -1,3 +1,3 @@
 NAME=		openrc
-VERSION=	0.20.3
+VERSION=	0.12.4
 PKG=		${NAME}-${VERSION}
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,109 +0,0 @@
-# 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.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/92
+++ b/92
@@ -0,0 +1,92 @@
+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=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
+
+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.
+
+As of 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.
+
+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.busybox
+++ b/README.busybox
@@ -0,0 +1,28 @@
+Using Busybox as your Default Shell
+-----------------------------------
+
+
+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.
+
+All of these apply to busybox 1.20.2, which is the current version of
+busybox as of this writing.
+
+1. The start-stop-daemon applet is not compatible with start-stop-daemon
+in OpenRC. Please make sure CONFIG_START_STOP_DAEMON is not set to y in
+the configuration file you use to build busybox.
+
+2. The -O option for the mount applet does not support the [no]_netdev
+options from util-linux for handling network file systems.
+
+3. The umount applet does not support the -O option from util-linux.
+
+4. The swapon applet does not support the -e option from util-linux.
+
+5. the setfont applet does not support the -u option from kbd.
+
+There is work to get most of these supported by busybox, so this file
+will be updated as things change.
--- a/README.md
+++ b/README.md
@@ -1,99 +0,0 @@
-# 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 debug memory under valgrind, add `-DDEBUG_MEMORY`
-to your `CPPFLAGS` so that all malloc memory should be freed at exit.
-
-If you are building OpenRC for a Gentoo Prefix installation, add `MKPREFIX=yes`.
-
-`PKG_PREFIX` should be set to where packages install to by default.
-
-`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/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 [1]. Basically, it is like
-K&R/LKML, but wrapped lines that are indented use 4 spaces. Here are the
-highlights.
+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.

- 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
+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

-```
 void foo(int c)
 {
 	int ret = 0;
@@ -32,15 +32,16 @@ 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
-[2], so I would like to thank the author.
+[1], 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
@@ -66,7 +67,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
@@ -80,5 +81,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://en.wikipedia.org/wiki/Indent_style#BSD_KNF_style
-[2] http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
+[1] http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
+
--- a/conf.d/Makefile
+++ b/conf.d/Makefile
@@ -15,8 +15,7 @@ include ${MK}/os.mk

 CONF-FreeBSD=	ipfw moused powerd rarpd savecore syscons

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

 CONF-NetBSD=	moused rarpd savecore

--- a/conf.d/bootmisc
+++ b/conf.d/bootmisc
@@ -8,8 +8,3 @@ wipe_tmp="YES"
 # Write the initial dmesg log into /var/log/dmesg after boot
 # This may be useful if you need the kernel boot log afterwards
 log_dmesg="YES"
-
-# Save the previous dmesg log to dmesc.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
@@ -1,8 +0,0 @@
-# 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,9 +32,3 @@ fsck_on_battery="YES"
 # This is useful when periodic filesystem checks are causing undesirable
 # delays at startup, but such delays at shutdown are acceptable.
 fsck_shutdown="NO"
-
-# fsck_abort_on_errors can be set to no to cause fsck to not abort on
-# errors.
-# This is useful when periodic filesystem checks are causing undesirable
-# aborts.
-fsck_abort_on_errors="YES"
--- a/conf.d/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" if you are running a modern kernel
-# and using NTP to synchronize your system clock.
+# 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.
 #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,9 +1,3 @@
 # Stop the unmounting of certain points.
 # This could be useful for some NFS related work.
 #no_umounts="/dir1:/var/dir2"
-#
-# Ignore errors when mounting local file systems.
-# This should be left alone unless you know what you are doing. If it is
-# set to yes, not only will we allow mount failures, but we will ignore
-# syntax errors in fstab.
-#ignore_mount_errors="NO"
--- a/conf.d/mtab
+++ b/conf.d/mtab
@@ -1,5 +0,0 @@
-# This setting controls whether /etc/mtab is a file or symbolic link.
-# Most of the time, you shouldn't touch this. However, if the default
-# breaks your system in some way, please see the NEWS.md file that comes
-# with OpenRC for the actions to take.
-# mtab_is_file=no
--- a/conf.d/net-online
+++ b/conf.d/net-online
@@ -1,15 +0,0 @@
-# The interfaces setting controls which interfaces the net-online
-# service considers in deciding whether the network is active. By
-# default, it is all ethernet or wireless LAN interfaces.
-#interfaces=""
-
-# This setting controls whether a ping to the default gateway is
-# included in the test for network connectivity after all interfaces
-# are active.
-#ping_default_gateway=no
-
-# The timeout setting controls how long the net-online service waits
-# for the network to be configured.
-# The default is 120 seconds.
-# if this is set to 0, the wait is infinite.
-#timeout=120
--- a/conf.d/netmount
+++ b/conf.d/netmount
@@ -25,11 +25,11 @@
 #rc_need="net.eth1 net.eth2"
 #
 # If you are using a dynamic network management tool like
-# NetworkManager, dhcpcd in standalone mode, wicd, badvpn-ncd, etc, to
+# networkmanager, dhcpcd in standalone mode, wicd, badvpn-ncd, etc, to
 # manage the network interfaces with the routes to your netmounts, you
 # should list that tool.
 #
-#rc_need="NetworkManager"
+#rc_need="networkmanager"
 #rc_need="dhcpcd"
 #rc_need="wicd"
 #
--- a/conf.d/network.GNU-kFreeBSD.in
+++ b/conf.d/network.GNU-kFreeBSD.in
@@ -1,4 +0,0 @@
-
-# You can assign a default route
-#defaultroute="192.168.0.1"
-#defaultroute6="2001:a:b:c"
--- a/conf.d/network.GNU.in
+++ b/conf.d/network.GNU.in
@@ -1,4 +0,0 @@
-
-# You can assign a default route
-#defaultroute="gw 192.168.0.1"
-#defaultroute6="gw 2001:a:b:c"
--- a/conf.d/staticroute.GNU-kFreeBSD.in
+++ b/conf.d/staticroute.GNU-kFreeBSD.in
@@ -1,5 +0,0 @@
-# Separate multiple routes using ; or new lines.
-
-# Example static routes. See route(8) for syntax.
-#staticroute="net 192.168.0.0 10.73.1.1 netmask 255.255.255.0
-#net 192.168.1.0 10.73.1.1 netmask 255.255.255.0"
--- a/conf.d/staticroute.GNU.in
+++ b/conf.d/staticroute.GNU.in
@@ -1,7 +0,0 @@
-# Separate multiple routes using ; or new lines.
-# /etc/route.conf(5) takes precedence over this configuration.
-
-# Example static routes. See route(8) for syntax.
-# FIXME: "net ..." not supported
-#staticroute="net 192.168.0.0 -netmask 255.255.255.0 --address 10.73.1.1
-#net 192.168.1.0 -netmask 255.255.255.0 --address 10.73.1.1"
--- a/etc/rc.conf.GNU
+++ b/etc/rc.conf.GNU
@@ -1,14 +0,0 @@
-##############################################################################
-# GNU/Hurd SPECIFIC OPTIONS
-
-# This is the subsystem type. Valid options on GNU/Hurd:
-# ""        - nothing special
-# "subhurd" - Hurd subhurds (to be checked)
-# If this is commented out, automatic detection will be used.
-#
-# This should be set to the value representing the environment this file is
-# PRESENTLY in, not the virtualization the environment is capable of.
-#rc_sys=""
-# This is the number of tty's used in most of the rc-scripts (like
-# consolefont, numlock, etc ...)
-#rc_tty_number=6?
--- a/etc/rc.conf.Linux
+++ b/etc/rc.conf.Linux
@@ -2,17 +2,14 @@
 # LINUX SPECIFIC OPTIONS

 # This is the subsystem type. Valid options on Linux:
-# ""               - nothing special
-# "docker"         - Docker container manager
-# "lxc"            - Linux Containers
-# "openvz"         - Linux OpenVZ
-# "prefix"         - Prefix
-# "rkt"            - CoreOS container management system
-# "uml"            - Usermode Linux
-# "vserver"        - Linux vserver
-# "systemd-nspawn" - Container created by the systemd-nspawn utility
-# "xen0"           - Xen0 Domain
-# "xenU"           - XenU Domain
+# ""        - 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
@@ -64,21 +61,12 @@ rc_tty_number=12
 # Set the devices controller settings for this service.
 #rc_cgroup_devices=""

-# Set the hugetlb controller settings for this service.
-#rc_cgroup_hugetlb=""
-
 # Set the memory controller settings for this service.
 #rc_cgroup_memory=""

-# Set the net_cls controller settings for this service.
-#rc_cgroup_net_cls=""
-
 # Set the net_prio controller settings for this service.
 #rc_cgroup_net_prio=""

-# Set the pids controller settings for this service.
-#rc_cgroup_pids=""
-
 # Set this to YES if yu want all of the processes in a service's cgroup
 # killed when the service is stopped or restarted.
 # This should not be set globally because it kills all of the service's
--- a/etc/rc.conf.in
+++ b/etc/rc.conf.in
@@ -29,20 +29,17 @@
 # come up.
 #rc_depend_strict="YES"

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

 # rc_logger launches a logging daemon to log the entire rc process to
 # /var/log/rc.log
@@ -54,10 +51,6 @@
 # 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"
@@ -80,10 +73,6 @@
 #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
@@ -97,7 +86,7 @@

 # Below is the default list of network fstypes.
 #
-# afs ceph cifs coda davfs fuse fuse.sshfs gfs glusterfs lustre ncpfs
+# 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
@@ -119,9 +108,6 @@
 #SSD_NICELEVEL="-19"

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

 # It's possible to define extra dependencies for services like so
--- a/etc/rc.devd
+++ b/etc/rc.devd
@@ -1,13 +1,6 @@
 #!/bin/sh
-# Copyright (c) 2007-2015 The OpenRC Authors.
-# See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
-#
-# This file is part of OpenRC. It is subject to the license terms in
-# the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
-# This file may not be copied, modified, propagated, or distributed
-#    except according to the terms contained in the LICENSE file.
+# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 # Inform RC that we are in the background and hotplugged
 IN_BACKGROUND=yes
--- a/etc/rc.in
+++ b/etc/rc.in
@@ -1,13 +1,6 @@
 #!@SHELL@
-# Copyright (c) 2007-2015 The OpenRC Authors.
-# See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
-#
-# This file is part of OpenRC. It is subject to the license terms in
-# the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
-# This file may not be copied, modified, propagated, or distributed
-#    except according to the terms contained in the LICENSE file.
+# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 # If $TERM is not set then assume default of @TERM@
 # This gives us a nice colour boot :)
@@ -17,9 +10,9 @@
 trap : SIGINT
 trap "echo 'Boot interrupted'; exit 1" SIGQUIT

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

 # Handle interrupts
 trap : SIGINT SIGQUIT
@@ -21,4 +14,4 @@ LD_LIBRARY_PATH="/lib${LD_LIBRARY_PATH:+:}${LDLIBRARY_PATH}" ; export LD_LIBRARY
 [ -z "$TERM" -o "$TERM" = "dumb" ] && TERM="@TERM@" && export TERM

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

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

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

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

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

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

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

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

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

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

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

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

 command=/usr/sbin/wpa_supplicant
 : ${wpa_supplicant_conf:=/etc/wpa_supplicant.conf}
--- a/init.d/.gitignore
+++ b/init.d/.gitignore
@@ -1,11 +1,11 @@
-binfmt
 bootmisc
 fsck
 hostname
 local
 localmount
-loopback
 moused
+net.lo
+net.lo0
 netmount
 network
 root
@@ -23,11 +23,8 @@ killprocs
 modules
 mount-ro
 mtab
-net-online
 numlock
-osclock
 procfs
-s6-svscan
 staticroute
 sysfs
 devdb
@@ -44,5 +41,4 @@ syslogd
 termencoding
 ttys
 wscons
-tmpfiles.dev
 tmpfiles.setup
--- a/init.d/Makefile
+++ b/init.d/Makefile
@@ -2,8 +2,8 @@ include ../mk/net.mk

 DIR=	${INITDIR}
 SRCS=	bootmisc.in fsck.in hostname.in local.in localmount.in loopback.in \
-	netmount.in osclock.in root.in savecache.in swap.in swapfiles.in \
-	tmpfiles.setup.in swclock.in sysctl.in urandom.in s6-svscan.in ${SRCS-${OS}}
+	netmount.in root.in savecache.in swap.in swapfiles.in \
+	tmpfiles.setup.in swclock.in sysctl.in urandom.in ${SRCS-${OS}}
 BIN=	${OBJS}

 # Are we installing our network scripts?
@@ -21,9 +21,9 @@ SRCS-FreeBSD=	hostid.in moused.in newsyslog.in pf.in rarpd.in rc-enabled.in \
 SRCS-FreeBSD+=	adjkerntz.in devd.in dumpon.in encswap.in ipfw.in \
 		mixer.in nscd.in powerd.in syscons.in

-SRCS-Linux=	binfmt.in devfs.in dmesg.in hwclock.in consolefont.in keymaps.in \
+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 net-online.in sysfs.in termencoding.in tmpfiles.dev.in
+		procfs.in sysfs.in termencoding.in tmpfiles.dev.in

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

 extra_commands="save"

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

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

@@ -75,7 +68,7 @@ cleanup_var_run_dir()
 	do
 		# Clean stale sockets
 		if [ -S "$x" ]; then
-			if command -v fuser >/dev/null 2>&1; then
+			if type fuser >/dev/null 2>&1; then
 				fuser "$x" >/dev/null 2>&1 || rm -- "$x"
 			else
 				rm -- "$x"
@@ -124,41 +117,19 @@ migrate_to_run()

 clean_run()
 {
-	[ "$RC_SYS" = VSERVER -o "$RC_SYS" = LXC ] && return 0
+	[ "$RC_SYS" = VSERVER ] && 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
+	mount --bind / $dir
+	rm -rf $dir/run/*
+	umount $dir
+	rm -rf $dir
 }

 start()
 {
 	# Remove any added console dirs
-	if checkpath -W "$RC_LIBEXECDIR"; then
-		rm -rf "$RC_LIBEXECDIR"/console/*
-	fi
+	rm -rf "$RC_LIBEXECDIR"/console/*

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

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

 description="Sets a font for the consoles."

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

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

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

 description="Creates the dev database"

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

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

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

-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
+start() {
+	# Mount required stuff as user may not have then 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,mode=1777 shm" \
+		"tmpfs /dev/shm 1777 ,nodev shm" \
 	; do
 		set -- $x
 		grep -Eq "[[:space:]]+$1$" /proc/filesystems || continue
@@ -106,23 +34,5 @@ seed_dev()
 			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,20 +1,13 @@
-#!@SBINDIR@/openrc-run
-# Copyright (c) 2007-2015 The OpenRC Authors.
-# See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
-#
-# This file is part of OpenRC. It is subject to the license terms in
-# the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
-# This file may not be copied, modified, propagated, or distributed
-# except according to the terms contained in the LICENSE file.
+#!@SBINDIR@/runscript
+# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

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

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

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

 description="Configures a specific kernel dump device."

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

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

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

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

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

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

-	if command -v kenv >/dev/null 2>&1; then
+	if type 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,18 +1,11 @@
-#!@SBINDIR@/openrc-run
-# Copyright (c) 2007-2015 The OpenRC Authors.
-# See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
-#
-# This file is part of OpenRC. It is subject to the license terms in
-# the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
-# This file may not be copied, modified, propagated, or distributed
-# except according to the terms contained in the LICENSE file.
+#!@SBINDIR@/runscript
+# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 description="Sets the hostname of the machine."

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

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

 extra_commands="save show"

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

 setupopts()
@@ -90,17 +83,22 @@ start()
 		fi
 	fi

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

-	if yesno ${clock_hctosys:-YES}; then
-		_hwclock --hctosys $utc_cmd $clock_args
+	# 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
 		: $(( retval += $? ))
 	fi

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

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

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

 description="Applies a keymap for the consoles."

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

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

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

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

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

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

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

-	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
+	local file
+	for file in @SYSCONFDIR@/local.d/*.start ; do
+		[ -x "$file" ] && "$file"
 	done
-	eoutdent

-	if command -v local_start >/dev/null 2>&1; then
-		ewarn "\"@SYSCONFDIR@/conf.d/local\" should be removed."
+	if type 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 executable scripts with an .start extension"
-		ewarn "in \"@SYSCONFDIR@/local.d\""
+		ewarn "to scripts with an .start extension"
+		ewarn "in @SYSCONFDIR@/local.d"
 		local_start
 	fi

-	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
+	eend 0
 }

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

-	local file has_errors=0 redirect retval
-	yesno $rc_verbose || redirect='> /dev/null 2>&1'
-	eindent
+	local file
 	for file in @SYSCONFDIR@/local.d/*.stop; 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
+		[ -x "$file" ] && "$file"
 	done
-	eoutdent

-	if command -v local_stop >/dev/null 2>&1; then
-		ewarn "\"@SYSCONFDIR@/conf.d/local\" should be removed."
+	if type local_start >/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 executable scripts with an .stop extension"
-		ewarn "in \"@SYSCONFDIR@/local.d\""
+		ewarn "to scripts with an .stop extension"
+		ewarn "in @SYSCONFDIR@/local.d"
 		local_stop
 	fi

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

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

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

 start()
 {
 	# Mount local filesystems in /etc/fstab.
-	local types="noproc" x= no_netdev= rc=
+	local types="noproc" x= no_netdev=
 	for x in $net_fs_list $extra_net_fs_list; do
 		types="${types},no${x}"
 	done
@@ -36,16 +29,9 @@ start()
 	ebegin "Mounting local filesystems"
 	mount -at "$types" $no_netdev
 	eend $? "Some local filesystem failed to mount"
-	rc=$?
-	if [ "$RC_UNAME" != Linux ]; then
-		rc=0
-	elif yesno "${ignore_mount_errors:-NO}"; then
-		if [ $rc -ne 0 ]; then
-			ewarn "localmount: errors detected, but ignored"
-		fi
-		rc=0
-	fi
-	return $rc
+
+	# Always return 0 - some local mounts may not be critical for boot
+	return 0
 }

 stop()
@@ -73,37 +59,10 @@ stop()
 	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
@@ -1,26 +1,19 @@
-#!@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.
+#!@SBINDIR@/runscript
+# Copyright (c) 2013 William Hubbs <w.d.hubbs@gmail.com>
+# Released under the 2-clause BSD license.

 description="Configures the loopback interface."

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

 start()
 {
 	if [ "$RC_UNAME" = Linux ]; then
 		ebegin "Bringing up network interface lo"
-		if command -v ip > /dev/null 2>&1; then
+		if type ip > /dev/null 2>&1; then
 			ip addr add 127.0.0.1/8 dev lo brd + scope host
 			ip route add 127.0.0.0/8 dev lo scope host
 			ip link set lo up
--- a/init.d/mixer.in
+++ b/init.d/mixer.in
@@ -1,13 +1,6 @@
-#!@SBINDIR@/openrc-run
-# Copyright (c) 2007-2015 The OpenRC Authors.
-# See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
-#
-# This file is part of OpenRC. It is subject to the license terms in
-# the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
-# This file may not be copied, modified, propagated, or distributed
-# except according to the terms contained in the LICENSE file.
+#!@SBINDIR@/runscript
+# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 extra_commands="restore"

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

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

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

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

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

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

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

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

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

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

 start()
 {
-	local rc=0
-	ebegin "Updating /etc/mtab"
-	if ! checkpath -W /etc; then
-		rc=1
-	elif ! yesno ${mtab_is_file:-no}; then
-		[ ! -L /etc/mtab ] && [ -f /etc/mtab ] &&
-			ewarn "Removing /etc/mtab file"
-		einfo "Creating mtab symbolic link"
-		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~~
+	if [ -L /etc/mtab ]
+	then
+		einfo "Skipping mtab update (mtab is a symbolic link)"
+		return 0
 	fi
-	eend $rc "/etc is not writable; unable to create /etc/mtab"
-	return 0
+
+	ebegin "Updating /etc/mtab"
+	if ! echo 2>/dev/null >/etc/mtab; then
+		ewend 1 "/etc/mtab is not updateable"
+		return 0
+	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
 }
--- a/init.d/net-online.in
+++ b/init.d/net-online.in
@@ -1,76 +0,0 @@
-#!@SBINDIR@/openrc-run
-# Copyright (c) 2015 The OpenRC Authors.
-# See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
-#
-# This file is part of OpenRC. It is subject to the license terms in
-# the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
-# This file may not be copied, modified, propagated, or distributed
-# except according to the terms contained in the LICENSE file.
-
-description="Delays until the network is online or a specific timeout"
-
-depend()
-{
-	after modules
-	need sysfs
-	keyword -jail -lxc -openvz -prefix -systemd-nspawn -uml -vserver
-}
-
-get_interfaces()
-{
-	local ifname iftype
-	for ifname in /sys/class/net/*; do
-		read iftype < ${ifname}/type
-		[ "$iftype" = "1" ] && printf "%s " ${ifname##*/}
-	done
-}
-
-get_default_gateway()
-{
-	local cmd gateway
-	if command -v ip > /dev/null 2>&1; then
-		cmd="ip route show"
-	else
-		cmd=route
-	fi
-	set -- $($cmd | grep default)
-	[ "$2" != via ] && gateway="$2" || gateway="$3"
-	printf "%s" $gateway
-}
-
-start ()
-{
-	local carriers configured dev gateway ifcount infinite interfaces
-	local rc state timeout x
-
-	ebegin "Checking to see if the network is online"
-	rc=0
-	interfaces=${interfaces:-$(get_interfaces)}
-	timeout=${timeout:-120}
- [ $timeout -eq 0 ] && infinite=true || infinite=false
- while $infinite || [ $timeout -gt 0 ]; do
-	carriers=0
-	configured=0
-	ifcount=0
- 	for dev in ${interfaces}; do
-		: $((ifcount += 1))
-		read x < /sys/class/net/$dev/carrier
-		[ $x -eq 1 ] && : $((carriers += 1))
-		read x < /sys/class/net/$dev/operstate
-		[ "$x" = up ] && : $((configured += 1))
-	done
-	[ $configured -eq $ifcount ] && [ $carriers -ge 1 ] && break
-	sleep 1
-	: $((timeout -= 1))
- done
- ! $infinite && [ $timeout -eq 0 ] && rc=1
- if [ $rc -eq 0 ] && yesno ${ping_default_gateway:-no}; then
- 	gateway="$(get_default_gateway)"
- 	if [ -n "$gateway" ] && ! ping -c 1 $gateway > /dev/null 2>&1; then
-		rc=1
-	fi
- fi
- eend $rc "The network is offline"
-}
--- a/init.d/netmount.in
+++ b/init.d/netmount.in
@@ -1,36 +1,29 @@
-#!@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.
+#!@SBINDIR@/runscript
+# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

-description="Mounts network shares according to /etc/fstab."
+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.

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

 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

@@ -42,10 +35,7 @@ start()
 		rc=$?
 	fi
 	ewend $rc "Could not mount all network filesystems"
-	if [ "$RC_UNAME" != Linux ]; then
-		rc=0
-	fi
-	return $rc
+	return 0
 }

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

 	for x in $net_fs_list $extra_net_fs_list; do
-		fs="$fs${fs:+,}$x"
+		case "$x" in
+			nfs|nfs4)
+				continue
+				;;
+			*)
+				fs="$fs${fs:+,}$x"
+				;;
+		esac
 	done
 	if [ -n "$fs" ]; then
 		umount -at $fs || eerror "Failed to simply unmount filesystems"
@@ -65,7 +62,14 @@ stop()
 	eindent
 	fs=
 	for x in $net_fs_list $extra_net_fs_list; do
-		fs="$fs${fs:+|}$x"
+		case "$x" in
+			nfs|nfs4)
+				continue
+				;;
+			*)
+				fs="$fs${fs:+|}$x"
+				;;
+		esac
 	done
 	[ -n "$fs" ] && fs="^($fs)$"
 	do_unmount umount ${fs:+--fstype-regex} $fs --netdev
--- a/init.d/network.in
+++ b/init.d/network.in
@@ -1,13 +1,6 @@
-#!@SBINDIR@/openrc-run
-# Copyright (c) 2009-2015 The OpenRC Authors.
-# See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
-#
-# This file is part of OpenRC. It is subject to the license terms in
-# the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
-# This file may not be copied, modified, propagated, or distributed
-# except according to the terms contained in the LICENSE file.
+#!@SBINDIR@/runscript
+# Copyright (c) 2009 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

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

@@ -53,11 +46,7 @@ sys_interfaces()
 		local w= rest= i= cmd=$1
 		while read w rest; do
 			i=${w%%:*}
-			case "$i" in
-				"$w") continue ;;
-				lo|lo0) continue ;;
-				*) ;;
-			esac
+			[ "$i" != "$w" ] || continue
 			if [ "$cmd" = u ]; then
 				ifconfig "$i" | grep -q "[ ]*UP" || continue
 			fi
--- a/init.d/newsyslog.in
+++ b/init.d/newsyslog.in
@@ -1,13 +1,6 @@
-#!@SBINDIR@/openrc-run
-# Copyright (c) 2007-2015 The OpenRC Authors.
-# See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
-#
-# This file is part of OpenRC. It is subject to the license terms in
-# the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
-# This file may not be copied, modified, propagated, or distributed
-# except according to the terms contained in the LICENSE file.
+#!@SBINDIR@/runscript
+# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 required_files="/etc/newsyslog.conf"

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

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

 description="Turns numlock on for the consoles."

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

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

 name="Packet Filter"
 : ${pf_conf:=${pf_rules:-/etc/pf.conf}}
@@ -24,7 +17,7 @@ depend() {
 start()
 {
 	ebegin "Starting $name"
-	if command -v kldload >/dev/null 2>&1; then
+	if type kldload >/dev/null 2>&1; then
 		kldload pf 2>/dev/null
 	fi
 	pfctl -q -F all
--- a/init.d/powerd.in
+++ b/init.d/powerd.in
@@ -1,13 +1,6 @@
-#!@SBINDIR@/openrc-run
-# Copyright (c) 2007-2015 The OpenRC Authors.
-# See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
-#
-# This file is part of OpenRC. It is subject to the license terms in
-# the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
-# This file may not be copied, modified, propagated, or distributed
-# except according to the terms contained in the LICENSE file.
+#!@SBINDIR@/runscript
+# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

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

 description="Mounts misc filesystems in /proc."

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

 start()
 {
+	# Make sure we insert usbcore if it's a module
+	if [ -f /proc/modules -a ! -d /sys/module/usbcore -a ! -d /proc/bus/usb ]; then
+		modprobe -q usbcore
+	fi
+
+	[ -e /proc/filesystems ] || return 0
+
 	# Setup Kernel Support for miscellaneous Binary Formats
 	if [ -d /proc/sys/fs/binfmt_misc -a ! -e /proc/sys/fs/binfmt_misc/register ]; then
-		modprobe -q binfmt-misc
 		if grep -qs binfmt_misc /proc/filesystems; then
 			ebegin "Mounting misc binary format filesystem"
 			mount -t binfmt_misc -o nodev,noexec,nosuid \
 				binfmt_misc /proc/sys/fs/binfmt_misc
+			if eend $? ; then
+				local fmts
+				ebegin "Loading custom binary format handlers"
+				fmts=$(grep -hsv -e '^[#;]' -e '^[[:space:]]*$' \
+					/run/binfmt.d/*.conf \
+					/etc/binfmt.d/*.conf \
+					""/usr/lib/binfmt.d/*.conf)
+				if [ -n "${fmts}" ]; then
+					echo "${fmts}" > /proc/sys/fs/binfmt_misc/register
+				fi
 				eend $?
+			fi
 		fi
 	fi
+
+	[ "$RC_SYS" = "OPENVZ" ] && return 0
+
+	# Check what USB fs the kernel support.  Currently
+	# 2.5+ kernels, and later 2.4 kernels have 'usbfs',
+	# while older kernels have 'usbdevfs'.
+	if [ -d /proc/bus/usb -a ! -e /proc/bus/usb/devices ]; then
+		local usbfs=$(grep -Fow usbfs /proc/filesystems ||
+			grep -Fow usbdevfs /proc/filesystems)
+		if [ -n "$usbfs" ]; then
+			ebegin "Mounting USB device filesystem [$usbfs]"
+			local usbgid="$(getent group usb | \
+				sed -e 's/.*:.*:\(.*\):.*/\1/')"
+			mount -t $usbfs \
+				-o ${usbgid:+devmode=0664,devgid=$usbgid,}noexec,nosuid \
+				usbfs /proc/bus/usb
+			eend $?
+		fi
+	fi
+
+	# Setup Kernel Support for SELinux
+	if [ -d /selinux ] && ! mountinfo -q /selinux; then
+		if grep -qs selinuxfs /proc/filesystems; then
+			ebegin "Mounting SELinux filesystem"
+			mount -t selinuxfs selinuxfs /selinux
+			eend $?
+		fi
+	fi
+
 	return 0
 }
--- a/init.d/rarpd.in
+++ b/init.d/rarpd.in
@@ -1,13 +1,6 @@
-#!@SBINDIR@/openrc-run
-# Copyright (c) 2007-2015 The OpenRC Authors.
-# See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
-#
-# This file is part of OpenRC. It is subject to the license terms in
-# the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
-# This file may not be copied, modified, propagated, or distributed
-# except according to the terms contained in the LICENSE file.
+#!@SBINDIR@/runscript
+# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

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

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

 description="Mount the root fs read/write"

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

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

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

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

 start()
 {
 	if [ -e "$RC_SVCDIR"/clock-skewed ]; then
-		ewarn "Clock skew detected!"
+		ewarn "WARNING: clock skew detected!"
 		if ! yesno "${RC_GOINGDOWN}"; then
 			eerror "Not saving deptree cache"
 			return 1
 		fi
 	fi
-	if [ ! -d "$RC_LIBEXECDIR"/cache ]; then
-		if ! checkpath -W "$RC_LIBEXECDIR"; then
-			eerror "${RC_LIBEXECDIR} is not writable!"
-			eerror "Unable to save dependency cache"
-			if yesno "${RC_GOINGDOWN}"; then
-				return 0
-			fi
+	if ! checkpath -W "$RC_LIBEXECDIR"; then
+		ewarn "WARNING: ${RC_LIBEXECDIR} is not writable!"
+		if ! yesno "${RC_GOINGDOWN}"; then
+			ewarn "Unable to save deptree cache"
 			return 1
 		fi
-		rm -rf "$RC_LIBEXECDIR"/cache
-		if ! mkdir -p "$RC_LIBEXECDIR"/cache; then
-			eerror "Unable to create $RC_LIBEXECDIR/cache"
-			eerror "Unable to save dependency cache"
-			if yesno "${RC_GOINGDOWN}"; then
-				return 0
-			fi
-			return 1
-		fi
-	fi
-	if ! checkpath -W "$RC_LIBEXECDIR"/cache; then
-		eerror "${RC_LIBEXECDIR}/cache is not writable!"
-		eerror "Unable to save dependency cache"
-		if yesno "${RC_GOINGDOWN}"; then
-			return 0
-		fi
-		return 1
+		return 0
 	fi
 	ebegin "Saving dependency cache"
-	local rc=0 save=
+	local rc=
+	if [ ! -d "$RC_LIBEXECDIR"/cache ]; then
+		rm -rf "$RC_LIBEXECDIR"/cache
+		if ! mkdir "$RC_LIBEXECDIR"/cache; then
+			rc=$?
+			if yesno "${RC_GOINGDOWN}"; then
+				rc=0
+			fi
+			eend $rc
+			return $rc
+		fi
+	fi
+	local save=
 	for x in deptree depconfig shutdowntime softlevel nettree rc.log; do
 		[ -e "$RC_SVCDIR/$x" ] && save="$save $RC_SVCDIR/$x"
 	done
 	if [ -n "$save" ]; then
-		cp -p $save "$RC_LIBEXECDIR"/cache
-		rc=$?
+		cp -p $save "$RC_LIBEXECDIR"/cache 2>/dev/null
 	fi
+	rc=$?
 	if yesno "${RC_GOINGDOWN}"; then
-		if [ $rc -ne 0 ]; then
-			eerror "Unable to save dependency cache"
-		fi
-		eend 0
+		rc=0
 	fi
-	eend $rc "Unable to save dependency cache"
+	eend $rc
 }
--- a/init.d/savecore.in
+++ b/init.d/savecore.in
@@ -1,13 +1,6 @@
-#!@SBINDIR@/openrc-run
-# Copyright (c) 2007-2015 The OpenRC Authors.
-# See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
-#
-# This file is part of OpenRC. It is subject to the license terms in
-# the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
-# This file may not be copied, modified, propagated, or distributed
-# except according to the terms contained in the LICENSE file.
+#!@SBINDIR@/runscript
+# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 description="Saves a kernel dump."

@@ -30,7 +23,7 @@ start()
 		# Don't quote ${dump_device}, so that if it's unset,
 		# savecore will check on the partitions listed in fstab
 		# without errors in the output
-		savecore -C $dump_device >/dev/null
+		savecore -C "$dump_dir" $dump_device >/dev/null
 	else
 		ls "$dump_dir"/bsd* > /dev/null 2>&1
 	fi
--- a/init.d/staticroute.in
+++ b/init.d/staticroute.in
@@ -1,13 +1,6 @@
-#!@SBINDIR@/openrc-run
-# Copyright (c) 2009-2015 The OpenRC Authors.
-# See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
-#
-# This file is part of OpenRC. It is subject to the license terms in
-# the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
-# This file may not be copied, modified, propagated, or distributed
-# except according to the terms contained in the LICENSE file.
+#!@SBINDIR@/runscript
+# Copyright (c) 2009 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

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

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

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

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

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

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

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

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

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

 # swclock is an OpenRC built in
@@ -24,7 +17,7 @@ start()
 {
 	ebegin "Setting the local clock based on last shutdown time"
 	if ! swclock 2> /dev/null; then
-	swclock --warn @SBINDIR@/openrc-run
+	swclock --warn @SBINDIR@/runscript
 	fi
 	eend $?
 }
--- a/init.d/syscons.in
+++ b/init.d/syscons.in
@@ -1,13 +1,6 @@
-#!@SBINDIR@/openrc-run
-# Copyright (c) 2007-2015 The OpenRC Authors.
-# See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
-#
-# This file is part of OpenRC. It is subject to the license terms in
-# the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
-# This file may not be copied, modified, propagated, or distributed
-# except according to the terms contained in the LICENSE file.
+#!@SBINDIR@/runscript
+# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

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

 depend()
 {
--- a/init.d/sysctl.GNU-kFreeBSD.in
+++ b/init.d/sysctl.GNU-kFreeBSD.in
@@ -1,38 +0,0 @@
-#!@SBINDIR@/openrc-run
-# Copyright (c) 2007-2015 The OpenRC Authors.
-# See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
-#
-# This file is part of OpenRC. It is subject to the license terms in
-# the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
-# This file may not be copied, modified, propagated, or distributed
-# except according to the terms contained in the LICENSE file.
-
-depend()
-{
-	before bootmisc logger
-	keyword -prefix
-}
-
-start()
-{
-	[ -e /etc/sysctl.conf ] || return 0
-	local retval=0 var= comments= conf=
-	ebegin "Configuring kernel parameters"
-	eindent
-	for conf in @SYSCONFDIR@/sysctl.conf @SYSCONFDIR@/sysctl.d/*.conf; do
-		if [ -r "$conf" ]; then
-			vebegin "applying $conf"
-			while read var comments; do
-				case "$var" in
-				""|"#"*) continue;;
-				esac
-				sysctl -w "$var" >/dev/null || retval=1
-			done < "$conf"
-			veend $retval
-		fi
-	done
-	eoutdent
-	eend $retval "Some errors were encountered"
-}
--- a/init.d/sysctl.GNU.in
+++ b/init.d/sysctl.GNU.in
@@ -1,39 +0,0 @@
-#!@PREFIX@/sbin/openrc-run
-# Copyright (c) 2007-2015 The OpenRC Authors.
-# See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
-#
-# This file is part of OpenRC. It is subject to the license terms in
-# the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
-# This file may not be copied, modified, propagated, or distributed
-# except according to the terms contained in the LICENSE file.
-#FIXME: Modify for GNU/Hurd
-
-depend()
-{
-	before bootmisc logger
-	keyword -prefix
-}
-
-start()
-{
-	[ -e /etc/sysctl.conf ] || return 0
-	local retval=0 var= comments= conf=
-	ebegin "Configuring kernel parameters"
-	eindent
-	for conf in @SYSCONFDIR@/sysctl.conf @SYSCONFDIR@/sysctl.d/*.conf; do
-		if [ -r "$conf" ]; then
-			vebegin "applying $conf"
-			while read var comments; do
-				case "$var" in
-				""|"#"*) continue;;
-				esac
-				sysctl -w "$var" >/dev/null || retval=1
-			done < "$conf"
-			veend $retval
-		fi
-	done
-	eoutdent
-	eend $retval "Some errors were encountered"
-}
--- a/init.d/sysctl.Linux.in
+++ b/init.d/sysctl.Linux.in
@@ -1,26 +1,34 @@
-#!@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.
+#!@SBINDIR@/runscript
+# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.

 depend()
 {
 	before bootmisc logger
-	keyword -prefix -systemd-nspawn -vserver
+	keyword -lxc -prefix -vserver
 }

 start()
 {
-	local quiet
-	yesno $rc_verbose || quiet=-q
+	local conf= retval=0 err errs

 	ebegin "Configuring kernel parameters"
-	sysctl ${quiet} --system
-	eend $? "Unable to configure some kernel parameters"
+	eindent
+
+	for conf in @SYSCONFDIR@/sysctl.conf @SYSCONFDIR@/sysctl.d/*.conf; do
+		if [ -r "$conf" ]; then
+			vebegin "applying $conf"
+			if ! err=$(sysctl -p "$conf" 2>&1 >/dev/null) ; then
+				errs="${errs} ${err}"
+				sysctl -e -p "${conf}" >/dev/null
+			fi
+			veend $? || retval=1
+		fi
+	done
+
+	eoutdent
+	if [ ${retval} -eq 0 ] && [ -n "${errs}" ] ; then
+		ewarn "Unknown keys:${errs}"
+	fi
+	eend $retval "Some errors were encountered: ${errs}"
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Steven Chamberlain	0853c110e5	Begin port to GNU/kFreeBSD This is just a minimal port to get Debian up and running; the rest will be done later.	2013-10-30 15:00:40 -05:00
William Hubbs	1a43ce11d0	bootmisc: do not run clean_run on VSERVER systems X-Gentoo-Bug: 489370 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=489370	2013-10-28 15:40:47 -05:00
William Hubbs	46e504b403	loopback: do not run in a prefix or vserver X-Gentoo-Bug: 489370 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=489370	2013-10-28 15:40:16 -05:00
William Hubbs	fc1f3d14f4	start 0.12.4	2013-10-28 15:39:19 -05:00
Alexander V Vershilov	b8a016aaba	Add uml keyword to fsck service. Fix relevant an issue mentioned by Toralf Förster. X-Gentoo-Bug: 481096. X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=481096	2013-10-18 15:22:24 -05:00
William Hubbs	63f5256b59	start work on OpenRC-0.12.3	2013-10-18 15:19:52 -05:00
Daniel Robbins	c420f56856	FL-786: localmount: support filesystem mounting on openvz	2013-10-08 12:06:09 -05:00
Natanael Copa	5b0f323da9	librc: fix off-by-one bug We need allocate space for both the added leading '-' and the trailing '\0'. Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>	2013-10-08 12:06:09 -05:00
Natanael Copa	d86853538a	librc: fix a read off-by-one bug We should first check if we are within bounds and then read rather than the opposite. This makes valgrind happy. Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>	2013-10-08 12:06:09 -05:00
William Hubbs	f2c0e700c6	netmount: add -lxc keyword Netmount should not run on lxc, thanks to Mark van Dijk <funtoo@internecto.net>.	2013-10-08 12:06:09 -05:00
William Hubbs	b1de9d7324	start-stop-daemon: fix do_stop calls Several calls to do_stop were forcing the test parameter to be true, which was causing extra output to the terminal, such as: * Would send signal 0 to pid xxxxx This should only happen if the --test command line option was used. Conflicts: src/rc/start-stop-daemon.c	2013-10-08 12:06:09 -05:00
William Hubbs	5b4886d23e	start-stop-daemon: fix eerorr calls in get_pid The eerror calls in this function make it too verbose, so change them to ewarnv() calls instead. This means that they will only print if the --verbose option is used or EINFO_VERBOSE=yes is set in the environment.	2013-10-08 12:06:09 -05:00
William Hubbs	2a53efbc07	start work on OpenRC-0.12.2	2013-10-08 12:03:47 -05:00
William Hubbs	a530722f65	fix cgroup_cleanup function The yesno test for rc_cgroup_cleanup belongs at the point where this function is called from runscript, not in the function itself. X-Gentoo-Bug: 486210 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=486210	2013-10-02 05:43:51 -05:00
William Hubbs	661e9cf002	start work on OpenRC 0.12.1	2013-10-02 05:40:18 -05:00