migrate-to-run: do not require a reboot

The script that migrates the @libexecdir@/rc/init.d directory to
/run/openrc should not require a reboot.

Reported-by: chainsaw@gentoo.org

FEATURE-REMOVAL-SCHEDULE

@@ -5,9 +5,29 @@ 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: 1.0
+When: Removed already, compatbility warning in place.
 
 Why: ...
 
@@ -15,9 +35,9 @@ Who:
 
 ---------------------------
 
-What: start-stop-daemon options --startas, --chuid , --oknodo
+What: Service --startas, --chuid , --oknodo
 
-When: 1.0
+When: undecided
 
 Why: Obsolete or replaced by other options.
 	 --startas => use --name or --exec
@@ -27,46 +47,3 @@ Why: Obsolete or replaced by other options.
 Who:
 
 ---------------------------
-
-What: 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:
-
----------------------------
-
-What: 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:
-
----------------------------
-
-What: support for local_start and local_stop
-
-When: 1.0
-
-Why: Depprecated in favor of executable scripts in @SYSCONFDIR@/local.d
-
-Who:
-
----------------------------
-
-What: the mtab service script
-
-When: make warnings more visible in 1.0, remove in 2.0
-
-Why: /etc/mtab should be a symbolic link to /proc/self/mounts on modern
-	 Linux systems
-
-Who:
-
----------------------------

Makefile

@@ -6,6 +6,11 @@ include Makefile.inc
 
 SUBDIR=		conf.d etc init.d local.d man scripts sh src sysctl.d
 
+# Build our old net foo or not
+ifeq (${MKNET},oldnet)
+SUBDIR+=	net doc
+endif
+
 # Build pkgconfig or not
 MKPKGCONFIG?=	yes
 ifeq (${MKPKGCONFIG},yes)

Makefile.inc

@@ -1,3 +1,3 @@
 NAME=		openrc
-VERSION=	0.13.7
+VERSION=	0.11.7
 PKG=		${NAME}-${VERSION}

NEWS

@@ -1,44 +0,0 @@
-OpenRC NEWS
-
-This file will contain a list of notable changes for each release.
-
-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.

README

@@ -10,7 +10,7 @@ You may wish to tweak the installation with the below arguments
 PROGLDFLAGS=-static
 LIBNAME=lib64
 DESTDIR=/tmp/openrc-image
-MKNET=no
+MKNET=oldnet
 MKPAM=pam
 MKPREFIX=yes
 MKPKGCONFIG=no
@@ -18,7 +18,6 @@ MKSELINUX=yes
 MKSTATICLIBS=no
 MKTERMCAP=ncurses
 MKTERMCAP=termcap
-MKTOOLS=yes
 PKG_PREFIX=/usr/pkg
 LOCAL_PREFIX=/usr/local
 PREFIX=/usr/local
@@ -57,6 +56,7 @@ init.d.misc is not installed by default as the scripts will need
 tweaking on a per distro basis. They are also non essential to the operation
 of the system.
 
+
 Reporting Bugs
 --------------
 Since Gentoo Linux is hosting OpenRC development, Bugs should go to
@@ -64,3 +64,25 @@ 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.

README.busybox

@@ -1,31 +0,0 @@
-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.
-
-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".
-
-There is work to get most of these supported by busybox, so this file
-will be updated as things change.

README.history

@@ -1,55 +0,0 @@
-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. 
-
-[1] http://www.gentoo.org/news/en/gwn/20040426-newsletter.xml

README.newnet

@@ -1,3 +1,7 @@
+The following applies only to the newnet stack, which is not presently
+maintained in OpenRC. The oldnet stack is maintained instead.
+- Robin H. Johnson <robbat2@gentoo.org>, 2011/02/21
+
 OpenRC Network Ideals
 ---------------------
 

STYLE

@@ -51,7 +51,7 @@ line separating the summary from the body is critical (unless you omit
 the body entirely); tools like rebase can get confused if you run the
 two together.
 
-Write your commit message in the imperative: "Fix bug" and not "Fixed
+Write your commit message in the present tense: "Fix bug" and not "Fixed
 bug."  This convention matches up with commit messages generated by
 commands like git merge and git revert.
 

conf.d/Makefile

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

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"

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

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"

conf.d/net

@@ -0,0 +1,4 @@
+# This blank configuration will automatically use DHCP for any net.*
+# scripts in /etc/init.d.  To create a more complete configuration,
+# please review /usr/share/doc/openrc*/net.example* and save your configuration
+# in /etc/conf.d/net (this file :]!).

conf.d/network.GNU-kFreeBSD.in

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

conf.d/network.GNU.in

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

conf.d/network.in

@@ -7,7 +7,7 @@
 # You also have ifup_eth0 and ifdown_eth0 to run other commands when
 # eth0 is started and stopped.
 # You should note that we don't stop the network at system shutdown by default.
-# If you really need this, then set keep_network=NO
+# If you really need this, then set shutdown_network=YES
 
 # Lastly, the interfaces variable pulls in virtual interfaces that cannot
 # be automatically detected.

conf.d/staticroute.GNU-kFreeBSD.in

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

conf.d/staticroute.GNU.in

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

doc/.gitignore

@@ -0,0 +1 @@
+net.example

doc/Makefile

@@ -0,0 +1,11 @@
+DIR=	${DOCDIR}/openrc
+SRCS=	net.example.in
+INC=	net.example
+
+MK=	../mk
+include ${MK}/os.mk
+
+%.example.in: %.example${SFX}
+	${CP} $< $@
+
+include ${MK}/scripts.mk

doc/net.example.BSD.in

@@ -0,0 +1,442 @@
+##############################################################################
+# QUICK-START
+#
+# The quickest start is if you want to use DHCP.
+# In that case, everything should work out of the box, no configuration
+# necessary, though the startup script will warn you that you haven't
+# specified anything.
+
+# WARNING :- some examples have a mixture of IPv4 (ie 192.168.0.1) and IPv6
+# (ie 4321:0:1:2:3:4:567:89ab) internet addresses. They only work if you have
+# the relevant kernel option enabled. So if you don't have an IPv6 enabled
+# kernel then remove the IPv6 address from your config.
+
+# If you want to use a static address or use DHCP explicitly, jump
+# down to the section labeled INTERFACE HANDLERS.
+#
+# If you want to do anything more fancy, you should take the time to
+# read through the rest of this file.
+
+##############################################################################
+# MODULES
+#
+# We now support modular networking scripts which means we can easily
+# add support for new interface types and modules while keeping
+# compatibility with existing ones.
+#
+# Modules load by default if the package they need is installed.  If
+# you specify a module here that doesn't have its package installed
+# then you get an error stating which package you need to install.
+# Ideally, you only use the modules setting when you have two or more
+# packages installed that supply the same service.
+#
+# In other words, you probably should DO NOTHING HERE...
+
+##############################################################################
+# INTERFACE HANDLERS
+
+# For a static configuration, use something like this
+#config_eth0="192.168.0.2/24"
+
+# If you need more than one address, you can use something like this
+# NOTE: ifconfig creates an aliased device for each extra IPv4 address
+#       (eth0:1, eth0:2, etc)
+#       iproute2 does not do this as there is no need to
+#config_eth0="192.168.0.2/24 192.168.0.3/24 192.168.0.4/24"
+
+# You can also use IPv6 addresses
+# (you should always specify a prefix length with IPv6 here)
+#config_eth0="192.168.0.2/24 4321:0:1:2:3:4:567:89ab/64 4321:0:1:2:3:4:567:89ac/64"
+
+# If you wish to keep existing addresses + routing and the interface is up,
+# you can specify a noop (no operation). If the interface is down or there
+# are no addresses assigned, then we move onto the next step (default dhcp)
+# This is useful when configuring your interface with a kernel command line
+# or similar
+#config_eth0="noop 192.168.0.2/24"
+
+# If you don't want ANY address (only useful when calling for advanced stuff)
+#config_eth0="null"
+
+# Here's how to do routing if you need it
+# We add an IPv4 default route, IPv4 subnet route and an IPv6 unicast route
+#routes_eth0="default via 192.168.0.1
+#10.0.0.0/8 via 192.168.0.1
+#::/0"
+
+# If a specified module fails (like dhcp - see below), you can specify a
+# fallback like so
+#fallback_eth0="192.168.0.2 netmask 255.255.255.0"
+#fallback_routes_eth0="default via 192.168.0.1"
+
+# NOTE: fallback entry must match the entry location in config_eth0
+# As such you can only have one fallback route.
+# Also, if you do not set a fallback_routes entry for an interface, the
+# routes entry will be used if that is set.
+
+# Some users may need to alter the MTU - here's how
+#mtu_eth0="1500"
+
+# Most drivers that report carrier status function correctly, but some do not
+# One of these faulty drivers is for the Intel e1000 network card, but only
+# at boot time. To get around this you may alter the carrier_timeout value for
+# the interface. 0 is disable and any other number of seconds is how
+# long we wait for carrier. The current default is disabled.
+#carrier_timeout_eth0=0
+
+# You may wish to disable the interface being brought down when stopping.
+# This is only of use for WakeOnLan.
+#ifdown_eth0="NO"
+
+##############################################################################
+# OPTIONAL MODULES
+
+#-----------------------------------------------------------------------------
+# WIRELESS (802.11 support)
+# Wireless can be provided by BSDs ifconfig (iwconfig) or wpa_supplicant
+# wpa_supplicant is preferred, use the modules directive to prefer iwconfig.
+#modules="iwconfig"
+
+# ifconfig (iwconig) support is a one shot script - wpa_supplicant is daemon
+# that scans, associates and re-configures if association is lost.
+# We call it iwconfig to separate the wireless setup from ifconfig.
+####################################
+# HINTS
+#
+# Most users will just need to set the following options
+# key_SSID1="s:yourkeyhere enc open" # s: means a text key
+# key_SSID2="aaaa-bbbb-cccc-dd"      # no s: means a hex key
+# preferred_aps="SSID1 SSID2"
+#
+# Clear? Good. Now configure your wireless network below
+
+####################################
+# SETTINGS
+# Hard code an SSID to an interface - leave this unset if you wish the driver
+# to scan for available Access Points
+# I would only set this as a last resort really - use the preferred_aps
+# setting at the bottom of this file
+#essid_eth0='foo'
+
+# Some drivers/hardware don't scan all that well. We have no control over this
+# but we can say how many scans we want to do to try and get a better sweep of
+# the area. The default is 1.
+#scans_eth0="1"
+
+#Channel can be set (1-14), but defaults to 3 if not set.
+#
+# The below is taken verbatim from the BSD wavelan documentation found at
+# http://www.netbsd.org/Documentation/network/wavelan.html
+# There are 14 channels possible; We are told that channels 1-11 are legal for
+# North America, channels 1-13 for most of Europe, channels 10-13 for France,
+# and only channel 14 for Japan. If in doubt, please refer to the documentation
+# that came with your card or access point. Make sure that the channel you
+# select is the same channel your access point (or the other card in an ad-hoc
+# network) is on. The default for cards sold in North America and most of Europe
+# is 3; the default for cards sold in France is 11, and the default for cards
+# sold in Japan is 14.
+#channel_eth0="3"
+
+# Setup any other config commands. This is basically the ifconfig argument
+# without the ifconfig $iface.
+#ifconfig_eth0=""
+# You can do the same per SSID too.
+#ifconfig_SSID=""
+
+# Seconds to wait until associated. The default is to wait 10 seconds.
+# 0 means wait indefinitely. WARNING: this can cause an infinite delay when
+# booting.
+#associate_timeout_eth0="5"
+
+# Define a WEP key per SSID or MAC address (of the AP, not your card)
+# The encryption type (open or restricted) must match the
+# encryption type on the Access Point.
+# To set a hex key, prefix with 0x
+#key_SSID="0x12341234123412341234123456"
+# or you can use strings. Passphrase IS NOT supported
+#key_SSID="foobar"
+#key_SSID="foobar"
+
+# WEP key for the AP with MAC address 001122334455
+#mac_key_001122334455="foobar"
+
+# You can also override the interface settings found in /etc/conf.d/net
+# per SSID - which is very handy if you use different networks a lot
+#config_SSID="dhcp"
+#routes_SSID=
+#fallback_SSID=
+
+# Setting name/domain server causes /etc/resolv.conf to be overwritten
+# Note that if DHCP is used, and you want this to take precedence then
+# please put -R in your dhcpcd options
+#dns_servers_SSID="192.168.0.1 192.168.0.2"
+#dns_domain_SSID="some.domain"
+#dns_search_SSID="search.this.domain search.that.domain"
+# Please check the man page for resolv.conf for more information
+# as domain and search (searchdomains) are mutually exclusive and
+# searchdomains takes precedence
+
+# You can also set any of the /etc/conf.d/net variables per MAC address
+# incase you use Access Points with the same SSID but need different
+# networking configs. Below is an example - of course you use the same
+# method with other variables
+#config_001122334455="dhcp"
+#dns_servers_001122334455="192.168.0.1 192.168.0.2"
+
+# Map a MAC address to an SSID
+# This is used when the Access Point is not broadcasting its SSID
+# WARNING: This will override the SSID being broadcast due to some
+# Access Points sending an SSID even when they have been configured
+# not to!
+# Change 001122334455 to the MAC address and SSID to the SSID
+# it should map to
+#mac_essid_001122334455="SSID"
+
+# This lists the preferred SSIDs to connect to in order
+# SSID's can contain any characters here as they must match the broadcast
+# SSID exactly.
+# Surround each SSID with the " character and separate them with a space
+# If the first SSID isn't found then it moves onto the next
+# If this isn't defined then it connects to the first one found
+#preferred_aps="SSID1 SSID2"
+
+# You can also define a preferred_aps list per interface
+#preferred_aps_eth0="SSID3 SSID4"
+
+# You can also say whether we only connect to preferred APs or not
+# Values are "any", "preferredonly", "forcepreferred", "forcepreferredonly"
+# and "forceany"
+# "any" means it will connect to visible APs in the preferred list and then
+# any other available AP
+# "preferredonly" means it will only connect to visible APs in the preferred
+# list
+# "forcepreferred" means it will forcibly connect to APs in order if it does
+# not find them in a scan
+# "forcepreferredonly" means it forcibly connects to the APs in order and
+# does not bother to scan
+# "forceany" does the same as forcepreferred + connects to any other
+# available AP
+# Default is "any"
+#associate_order="any"
+#associate_order_eth0="any"
+
+# You can define blacklisted Access Points in the same way
+#blacklist_aps="SSID1 SSID2"
+#blacklist_aps_eth0="SSID3 SSID4"
+
+# If you have more than one wireless card, you can say if you want
+# to allow each card to associate with the same Access Point or not
+# Values are "yes" and "no"
+# Default is "yes"
+#unique_ap="yes"
+#unique_ap_eth0="yes"
+
+# IMPORTANT: preferred_only, blacklisted_aps and unique_ap only work when
+# essid_eth0 is not set and your card is capable of scanning
+
+# NOTE: preferred_aps  list ignores blacklisted_aps - so if you have
+# the same SSID in both, well, you're a bit silly :p
+
+##################################################
+# wpa_supplicant
+# emerge net-wireless/wpa_supplicant
+# Wireless options are held in /etc/wpa_supplicant/wpa_supplicant.conf
+# Consult the wpa_supplicant.conf.example that is installed in
+# /usr/share/doc/wpa_supplicant
+
+# By default we don't wait for wpa_supplicant to associate and authenticate.
+# If you would like to, so can specify how long in seconds
+#associate_timeout_eth0=60
+# A value of 0 means wait forever.
+
+# You can also override any settings found here per SSID - which is very
+# handy if you use different networks a lot. See below for using the SSID
+# in our variables
+#config_SSID="dhcp"
+# See the System module below for setting dns/nis/ntp per SSID
+
+# You can also override any settings found here per MAC address of the AP
+# in case you use Access Points with the same SSID but need different
+# networking configs. Below is an example - of course you use the same
+# method with other variables
+#mac_config_001122334455="dhcp"
+#mac_dns_servers_001122334455="192.168.0.1 192.168.0.2"
+
+# When an interface has been associated with an Access Point, a global
+# variable called SSID is set to the Access Point's SSID for use in the
+# pre/post user functions below (although it's not available in preup as you
+# won't have associated then)
+
+# If you're using anything else to configure wireless on your interface AND
+# you have installed wpa_supplicant, you need to disable wpa_supplicant
+#modules="!iwconfig !wpa_supplicant"
+#or
+#modules="!wireless"
+
+##############################################################################
+# WIRELESS SSID IN VARIABLES
+##############################################################################
+# Remember to change SSID to your SSID.
+# Say that your SSID is My NET - the line
+#      #key_SSID="s:passkey"
+# becomes
+#      #key_My_NET="s:passkey"
+# Notice that the space has changed to an underscore - do the same with all
+# characters not in a-z A-Z (English alphabet) 0-9. This only applies to
+# variables and not values.
+#
+# Any SSID's in values like essid_eth0="My NET" may need to be escaped
+# This means placing the character \ before the character
+# \" need to be escaped for example
+# So if your SSID is
+#      My "\ NET
+# it becomes
+#      My \"\\ NET
+# for example
+#      #essid_eth0="My\"\\NET"
+#
+# So using the above we can use
+#      #dns_domain_My____NET="My\"\\NET"
+# which is an invalid dns domain, but shows the how to use the variable
+# structure
+#########################################################
+
+#-----------------------------------------------------------------------------
+# DHCP
+# DHCP can be provided by dhclient.
+#
+# dhcpcd:   emerge net-misc/dhcpcd
+# dhclient: emerge net-misc/dhcp
+
+# Regardless of which DHCP client you prefer, you configure them the
+# same way using one of following depending on which interface modules
+# you're using.
+#config_eth0="dhcp"
+
+# For passing custom options to dhcpcd use something like the following.  This
+# example reduces the timeout for retrieving an address from 60 seconds (the
+# default) to 10 seconds.
+#dhcpcd_eth0="-t 10"
+
+# GENERIC DHCP OPTIONS
+# Set generic DHCP options like so
+#dhcp_eth0="release nodns nontp nonis nogateway nosendhost"
+
+# This tells the dhcp client to release its lease when it stops, not to
+# overwrite dns, ntp and nis settings, not to set a default route and not to
+# send the current hostname to the dhcp server and when it starts.
+# You can use any combination of the above options - the default is not to
+# use any of them.
+
+
+#-----------------------------------------------------------------------------
+# System
+# For configuring system specifics such as domain, dns, ntp and nis servers
+# It's rare that you would need todo this, but you can anyway.
+# This is most benefit to wireless users who don't use DHCP so they can change
+# their configs based on SSID.
+
+# If you omit the _eth0 suffix, then it applies to all interfaces unless
+# overridden by the interface suffix.
+#dns_domain_eth0="your.domain"
+#dns_servers_eth0="192.168.0.2 192.168.0.3"
+#dns_search_eth0="this.domain that.domain"
+#dns_options_eth0="timeout:1 rotate"
+#dns_sortlist_eth0="130.155.160.0/255.255.240.0 130.155.0.0"
+# See the man page for resolv.conf for details about the options and sortlist
+# directives
+
+#ntp_servers_eth0="192.168.0.2 192.168.0.3"
+
+#nis_domain_eth0="domain"
+#nis_servers_eth0="192.168.0.2 192.168.0.3"
+
+# NOTE: Setting any of these will stamp on the files in question. So if you
+# don't specify dns_servers but you do specify dns_domain then no nameservers
+# will be listed in /etc/resolv.conf even if there were any there to start
+# with.
+# If this is an issue for you then maybe you should look into a resolv.conf
+# manager like resolvconf-gentoo to manage this file for you. All packages
+# that baselayout supports use resolvconf-gentoo if installed.
+
+#-----------------------------------------------------------------------------
+# Cable in/out detection
+# Sometimes the cable is in, others it's out. Obviously you don't want to
+# restart net.eth0 every time when you plug it in either.
+# BSD has the Device State Change Daemon - or devd for short
+# To enable this,  simple add devd to the boot runlevel
+#rc-update add devd boot
+#rc
+
+##############################################################################
+# ADVANCED CONFIGURATION
+#
+# Four functions can be defined which will be called surrounding the
+# start/stop operations.  The functions are called with the interface
+# name first so that one function can control multiple adapters. An extra two
+# functions can be defined when an interface fails to start or stop.
+#
+# The return values for the preup and predown functions should be 0
+# (success) to indicate that configuration or deconfiguration of the
+# interface can continue.  If preup returns a non-zero value, then
+# interface configuration will be aborted.  If predown returns a
+# non-zero value, then the interface will not be allowed to continue
+# deconfiguration.
+#
+# The return values for the postup, postdown, failup and faildown functions are
+# ignored since there's nothing to do if they indicate failure.
+#
+# ${IFACE} is set to the interface being brought up/down
+# ${IFVAR} is ${IFACE} converted to variable name bash allows
+#
+# For historical and compatibility reasons, preup is actually normally called
+# in the following sequence: up ; preup ; up.
+# The first up causes the kernel to initialize the device, so
+# that it is available for use in the preup function.  However, for some
+# hardware, e.g. CAN devices, some configuration is needed before trying to up
+# the interface will actually work. For such hardware, the
+# up_before_preup variables will allow skipping the first up call if set
+# to yes.
+#up_before_preup_IFVAR="NO"
+#up_before_preup="NO"
+
+#preup() {
+#	# Remember to return 0 on success
+#	return 0
+#}
+
+#predown() {
+#	# The default in the script is to test for NFS root and disallow
+#	# downing interfaces in that case.  Note that if you specify a
+#	# predown() function you will override that logic.  Here it is, in
+#	# case you still want it...
+#	if is_net_fs /; then
+#		eerror "root filesystem is network mounted -- can't stop ${IFACE}"
+#		return 1
+#	fi
+#
+#	# Remember to return 0 on success
+#	return 0
+#}
+
+#postup() {
+#	# This function could be used, for example, to register with a
+#	# dynamic DNS service.  Another possibility would be to
+#	# send/receive mail once the interface is brought up.
+
+#}
+
+#postdown() {
+#	# Return 0 always
+#	return 0
+#}
+
+#failup() {
+#       # This function is mostly here for completeness... I haven't
+#       # thought of anything nifty to do with it yet ;-)
+#}
+
+#faildown() {
+#       # This function is mostly here for completeness... I haven't
+#       # thought of anything nifty to do with it yet ;-)
+#}

etc/rc.conf.DragonFly

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

etc/rc.conf.GNU

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

etc/rc.conf.GNU-kFreeBSD

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

etc/rc.conf.Linux

@@ -20,59 +20,10 @@
 # consolefont, numlock, etc ...)
 rc_tty_number=12
 
-##############################################################################
-# CGROUPS RESOURCE MANAGEMENT
-
 # If you have cgroups turned on in your kernel, this switch controls
 # whether or not a group for each controller is mounted under
 # /sys/fs/cgroup.
-# None of the other options in this section work if this is set to "NO".
+# Support for process management by cgroups is planned in the future,
+# so if you turn this off, be aware that you may not be able to use that
+# feature.
 #rc_controller_cgroups="YES"
-
-# The following settings allow you to set up values for the cgroup
-# controllers for your services.
-# They can be set in this file;, however, if you do this, the settings
-# will apply to all of your services.
-# If you want different settings for each service, place the settings in
-# /etc/conf.d/foo for service foo.
-# The format is to specify the names of the settings followed by their
-# values. Each variable can hold multiple settings.
-# For example, you would use this to set the cpu.shares setting in the
-# cpu controller to 512 for your service.
-# rc_cgroup_cpu="
-# cpu.shares 512
-# "
-#
-#For more information about the adjustments that can be made with
-#cgroups, see Documentation/cgroups/* in the linux kernel source tree.
-
-# Set the blkio controller settings for this service.
-#rc_cgroup_blkio=""
-
-# Set the cpu controller settings for this service.
-#rc_cgroup_cpu=""
-
-# Add this service to the cpuacct controller (any value means yes).
-#rc_cgroup_cpuacct=""
-
-# Set the cpuset controller settings for this service.
-#rc_cgroup_cpuset=""
-
-# Set the devices controller settings for this service.
-#rc_cgroup_devices=""
-
-# Set the memory controller settings for this service.
-#rc_cgroup_memory=""
-
-# Set the net_prio controller settings for this service.
-#rc_cgroup_net_prio=""
-
-# Set this to YES if yu want all of the processes in a service's cgroup
-# killed when the service is stopped or restarted.
-# This should not be set globally because it kills all of the service's
-# child processes, and most of the time this is undesirable. Please set
-# it in /etc/conf.d/<service>.
-# To perform this cleanup manually for a stopped service, you can
-# execute cgroup_cleanup with /etc/init.d/<service> cgroup_cleanup or
-# rc-service <service> cgroup_cleanup.
-# rc_cgroup_cleanup="NO"

etc/rc.conf.in

@@ -51,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"
@@ -77,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
@@ -88,13 +80,9 @@
 # Set unicode to YES to turn on unicode support for keyboards and screens.
 #unicode="NO"
 
-# This is how long fuser should wait for a remote server to respond. The
-# default is 60 seconds, but  it can be adjusted here.
-#rc_fuser_timeout=60
-
 # Below is the default list of network fstypes.
 #
-# afs ceph cifs coda davfs fuse fuse.sshfs gfs glusterfs lustre ncpfs
+# 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
@@ -113,7 +101,7 @@
 
 # Some daemons are started and stopped via start-stop-daemon.
 # We can set some things on a per service basis, like the nicelevel.
-#SSD_NICELEVEL="-19"
+#export SSD_NICELEVEL="-19"
 
 # Pass ulimit parameters
 #rc_ulimit="-u 30"

etc/rc.devd

@@ -3,9 +3,8 @@
 # Released under the 2-clause BSD license.
 
 # Inform RC that we are in the background and hotplugged
-IN_BACKGROUND=yes
-IN_HOTPLUG=yes
-export IN_BACKGROUND IN_HOTPLUG
+export IN_BACKGROUND=yes
+export IN_HOTPLUG=yes
 
 getmedia() {
 	ifconfig "$1" | while read line; do

etc/rc.in

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

etc/rc.shutdown.in

@@ -7,11 +7,11 @@ trap : SIGINT SIGQUIT
 
 # Try and use stuff in /lib over anywhere else so we can shutdown
 # local mounts correctly.
-LD_LIBRARY_PATH="/lib${LD_LIBRARY_PATH:+:}${LDLIBRARY_PATH}" ; export LD_LIBRARY_PATH
+export LD_LIBRARY_PATH="/lib${LD_LIBRARY_PATH:+:}${LDLIBRARY_PATH}"
 
 # If $TERM is not set then assume default of @TERM@
 # This gives us a nice colour boot :)
-[ -z "$TERM" -o "$TERM" = "dumb" ] && TERM="@TERM@" && export TERM
+[ -z "$TERM" -o "$TERM" = "dumb" ] && export TERM="@TERM@"
 
 action=${1:-shutdown}
 exec /sbin/rc "${action}"

init.d.misc/avahi-dnsconfd.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d.misc/avahid.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d.misc/dbus.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d.misc/dhcpcd.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d.misc/dnsmasq.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d.misc/hald.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d.misc/named.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d.misc/ntpd.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d.misc/openvpn.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
@@ -53,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

init.d.misc/polkitd.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d.misc/sshd.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d.misc/wpa_supplicant.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d/.gitignore

@@ -3,8 +3,9 @@ fsck
 hostname
 local
 localmount
-loopback
 moused
+net.lo
+net.lo0
 netmount
 network
 root
@@ -40,5 +41,4 @@ syslogd
 termencoding
 ttys
 wscons
-tmpfiles.dev
 tmpfiles.setup

init.d/Makefile

@@ -1,19 +1,23 @@
-include ../mk/net.mk
-
 DIR=	${INITDIR}
-SRCS=	bootmisc.in fsck.in hostname.in local.in localmount.in loopback.in \
-	netmount.in root.in savecache.in swap.in swapfiles.in \
+SRCS=	bootmisc.in fsck.in hostname.in local.in localmount.in 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?
-ifeq (${MKNET},yes)
+# Build our old net foo or not
+ifeq (${MKNET},)
 SRCS+= network.in staticroute.in
 endif
 
+ifeq (${MKNET},oldnet)
+INSTALLAFTER=	_installafter_net.lo
+SRCS+= net.lo.in
+endif
+
 MK=	../mk
 include ${MK}/os.mk
 
+NET_LO-FreeBSD=	net.lo0
 # Generic BSD scripts
 SRCS-FreeBSD=	hostid.in moused.in newsyslog.in pf.in rarpd.in rc-enabled.in \
 		rpcbind.in savecore.in syslogd.in
@@ -21,10 +25,12 @@ 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
 
+NET_LO-Linux=	net.lo
 SRCS-Linux=	devfs.in dmesg.in hwclock.in consolefont.in keymaps.in \
 		killprocs.in modules.in mount-ro.in mtab.in numlock.in \
-		procfs.in sysfs.in termencoding.in tmpfiles.dev.in
+		procfs.in sysfs.in termencoding.in
 
+NET_LO-NetBSD=	net.lo0
 # Generic BSD scripts
 SRCS-NetBSD=	hostid.in moused.in newsyslog.in pf.in rarpd.in rc-enabled.in \
 		rpcbind.in savecore.in syslogd.in
@@ -37,3 +43,6 @@ SRCS-NetBSD+=	devdb.in swap-blk.in ttys.in wscons.in
 include ${MK}/scripts.mk
 
 _installafter_: realinstall
+
+_installafter_net.lo: realinstall
+	${INSTALL} -m ${BINMODE} net.lo ${DESTDIR}/${INITDIR}/${NET_LO-${OS}}

init.d/adjkerntz.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d/bootmisc.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
@@ -6,7 +6,7 @@ depend()
 {
 	need localmount
 	before logger
-	after clock root sysctl
+	after clock sysctl
 	keyword -prefix -timeout
 }
 
@@ -27,9 +27,9 @@ cleanup_tmp_dir()
 		ebegin "Wiping $dir directory"
 
 		# Faster than raw find
-		if ! rm -rf -- [!ajlq\.]* 2>/dev/null ; then
+		if ! rm -rf -- [^ajlq\.]* 2>/dev/null ; then
 			# Blah, too many files
-			find . -maxdepth 1 -name '[!ajlq\.]*' -exec rm -rf -- {} +
+			find . -maxdepth 1 -name '[^ajlq\.]*' -exec rm -rf -- {} +
 		fi
 
 		# pam_mktemp creates a .private directory within which
@@ -59,34 +59,6 @@ cleanup_tmp_dir()
 	fi
 }
 
-cleanup_var_run_dir()
-{
-	ebegin "Cleaning /var/run"
-	for x in $(find /var/run ! -type d ! -name utmp \
-		! -name random-seed ! -name dev.db \
-		! -name ld-elf.so.hints ! -name ld.so.hints);
-	do
-		# Clean stale sockets
-		if [ -S "$x" ]; then
-			if command -v fuser >/dev/null 2>&1; then
-				fuser "$x" >/dev/null 2>&1 || rm -- "$x"
-			else
-				rm -- "$x"
-			fi
-		fi
-		[ ! -f "$x" ] && continue
-		# Do not remove pidfiles of already running daemons
-		case "$x" in
-			*.pid)
-				start-stop-daemon --test --quiet \
-				--stop --pidfile "$x" && continue
-			;;
-		esac
-		rm -f -- "$x"
-	done
-	eend 0
-}
-
 mkutmp()
 {
 	: >"$1"
@@ -115,23 +87,10 @@ migrate_to_run()
  	fi
 }
 
-clean_run()
-{
-	[ "$RC_SYS" = VSERVER -o "$RC_SYS" = LXC ] && return 0
-	local dir
-	dir=$(mktemp -d)
-	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
@@ -156,7 +115,6 @@ start()
 	if [ "$RC_UNAME" = Linux -a -d /run ]; then
 		migrate_to_run	/var/lock /run/lock
 		migrate_to_run	/var/run /run
-		clean_run
 	fi
 
 	if checkpath -W /var/run; then
@@ -169,13 +127,36 @@ start()
 		[ -e /var/log/wtmp ] || mkutmp /var/log/wtmp
 		eend 0
 
-		mountinfo -q -f tmpfs /var/run || cleanup_var_run_dir
+		ebegin "Cleaning /var/run"
+		for x in $(find /var/run ! -type d ! -name utmp \
+			! -name random-seed ! -name dev.db \
+			! -name ld-elf.so.hints ! -name ld.so.hints);
+		do
+			# Clean stale sockets
+			if [ -S "$x" ]; then
+				if type fuser >/dev/null 2>&1; then
+					fuser "$x" >/dev/null 2>&1 || rm -- "$x"
+				else
+					rm -- "$x"
+				fi
+			fi
+			[ ! -f "$x" ] && continue
+			# Do not remove pidfiles of already running daemons
+			case "$x" in
+				*.pid)
+					start-stop-daemon --test --quiet \
+					--stop --pidfile "$x" && continue
+				;;
+			esac
+			rm -f -- "$x"
+		done
+		eend 0
 	fi
 
 	# Clean up /tmp directories
 	local tmp=
 	for tmp in ${clean_tmp_dirs:-${wipe_tmp_dirs-/tmp}}; do
-		mountinfo -q -f tmpfs "$tmp" || cleanup_tmp_dir "$tmp"
+		cleanup_tmp_dir "$tmp"
 	done
 
 	if checkpath -W /tmp; then
@@ -193,7 +174,7 @@ start()
 	if yesno $log_dmesg; then
 		if $logw || checkpath -W /var/log; then
 			# Create an 'after-boot' dmesg log
-			if [ "$RC_SYS" != VSERVER -a "$RC_SYS" != OPENVZ -a "$RC_SYS" != LXC ]; then
+			if [ "$RC_SYS" != VSERVER -a "$RC_SYS" != OPENVZ ]; then
 				dmesg > /var/log/dmesg
 				chmod 640 /var/log/dmesg
 			fi

init.d/consolefont.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
@@ -53,10 +53,14 @@ start()
 	done
 	eend $retval
 
-	# Store the font so we can use it ASAP on boot
+	# Store the last font so we can use it ASAP on boot
 	if [ $retval -eq 0 ] && checkpath -W "$RC_LIBEXECDIR"; then
 		mkdir -p "$RC_LIBEXECDIR"/console
-		setfont -O "$RC_LIBEXECDIR"/console/font
+		for font in /usr/share/consolefonts/"$consolefont".*; do
+			:
+		done
+		cp "$font" "$RC_LIBEXECDIR"/console
+		echo "${font##*/}" >"$RC_LIBEXECDIR"/console/font
 	fi
 
 	return $retval

init.d/devd.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d/devdb.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2008 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d/devfs.in

@@ -1,86 +1,20 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/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 -vserver -lxc
+	keyword -prefix -vserver
 }
 
-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
@@ -99,23 +33,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
 }

init.d/dmesg.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d/dumpon.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d/encswap.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright 1992-2012 FreeBSD Project
 # Released under the 2-clause BSD license
 

init.d/fsck.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
@@ -9,7 +9,7 @@ _IFS="
 depend()
 {
 	use dev clock modules
-	keyword -jail -openvz -prefix -timeout -vserver -lxc -uml
+	keyword -jail -openvz -prefix -timeout -vserver -lxc
 }
 
 _abort() {
@@ -71,12 +71,14 @@ start()
 	done
 
 	if [ "$RC_UNAME" = Linux ]; then
-		local skiptypes
-		skiptypes=$(printf 'no%s,' ${net_fs_list} ${extra_net_fs_list})
-		[ "${skiptypes}" = "no," ] && skiptypes=""
-		fsck_opts="$fsck_opts -C0 -T -t ${skiptypes}noopts=_netdev"
+		local skiptypes x
+		for x in $net_fs_list $extra_net_fs_list; do
+			skiptypes="${skiptypes}no${x},"
+		done
+		skiptypes="${skiptypes}noopts=_netdev"
+		fsck_opts="$fsck_opts -C0 -T -t $skiptypes"
 		if [ -z "$fsck_passno" -a -z "$fsck_mnt" ]; then
-			fsck_args=${fsck_args:--A -p}
+			fsck_args=${fsck_args--A -p}
 			if echo 2>/dev/null >/.test.$$; then
 				rm -f /.test.$$
 				fsck_opts="$fsck_opts -R"
@@ -85,7 +87,7 @@ start()
 	fi
 
 	trap : INT QUIT
-	fsck ${fsck_args:--p} $fsck_opts "$@"
+	fsck ${fsck_args--p} $fsck_opts "$@"
 	case $? in
 	0)	eend 0; return 0;;
 	1)	ewend 1 "Filesystems repaired"; return 0;;

init.d/hostid.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
@@ -40,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

init.d/hostname.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
@@ -10,9 +10,7 @@ depend() {
 
 start()
 {
-	# HOSTNAME variable used to be defined in caps in conf.d/hostname.
-	# It is also a magic variable in bash.
-	hostname=${hostname-${HOSTNAME-localhost}} # checkbashisms: false positive
+	hostname=${hostname-${HOSTNAME-localhost}}
 	ebegin "Setting hostname to $hostname"
 	hostname "$hostname"
 	eend $? "Failed to set the hostname"

init.d/hwclock.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
@@ -83,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
 

init.d/ipfw.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
@@ -8,7 +8,7 @@ ipfw_ip_in=${ipfw_ip_in-any}
 ipfw_ports_in=${ipfw_ports_in-auth ssh}
 ipfw_ports_nolog=${ipfw_ports_nolog-135-139,445 1026,1027 1433,1434}
 
-extra_commands="panic showstatus"
+opts="panic showstatus"
 
 depend() {
 	before net

init.d/keymaps.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
@@ -58,7 +58,7 @@ start()
 	if yesno $fix_euro; then
 		ebegin "Fixing font for euro symbol"
 		# Fix some fonts displaying the Euro, #173528.
-		echo "altgr keycode 18 = U+20AC" | loadkeys -q -
+		echo "altgr keycode 18 = U+20AC" | loadkeys -q
 		eend $?
 	fi
 

init.d/killprocs.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d/local.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
@@ -12,73 +12,40 @@ depend()
 
 start()
 {
-	ebegin "Starting local"
+	einfo "Starting local"
 
-	local file has_errors=0 retval
-	eindent
-	for file in @SYSCONFDIR@/local.d/*.start; do
-		if [ -x "${file}" ]; then
-			vebegin "Executing \"${file}\""
-			"${file}" 2>&1 >/dev/null
-			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 retval
-	eindent
+	local file
 	for file in @SYSCONFDIR@/local.d/*.stop; do
-		if [ -x "${file}" ]; then
-			vebegin "Executing \"${file}\""
-			"${file}" 2>&1 >/dev/null
-			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
 }

init.d/localmount.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
@@ -9,7 +9,7 @@ depend()
 	need fsck
 	use lvm modules mtab
 	after lvm modules
-	keyword -jail -prefix -vserver -lxc
+	keyword -jail -openvz -prefix -vserver -lxc
 }
 
 start()
@@ -17,13 +17,13 @@ start()
 	# Mount local filesystems in /etc/fstab.
 	local types="noproc" x= no_netdev=
 	for x in $net_fs_list $extra_net_fs_list; do
-		types="${types},no${x}"
+		types="${types},${x}"
 	done
 
 	if [ "$RC_UNAME" = Linux ]; then
 		no_netdev="-O no_netdev"
 		if mountinfo -q /usr; then
-			touch "$RC_SVCDIR"/usr_premounted
+			touch $RC_SVCDIR/usr_premounted
 		fi
 	fi
 	ebegin "Mounting local filesystems"
@@ -40,7 +40,7 @@ stop()
 	# We never unmount / or /dev or $RC_SVCDIR
 
 	# Bug 381783
-	local rc_svcdir=$(printf '%s\n' "$RC_SVCDIR" | sed 's:/lib\(32\|64\)\?/:/lib(32|64)?/:g')
+	local rc_svcdir=$(echo $RC_SVCDIR | sed 's:/lib\(32\|64\)\?/:/lib(32|64)?/:g')
 
 	local x= no_umounts_r="/|/dev|/dev/.*|${rc_svcdir}"
 	no_umounts_r="${no_umounts_r}|/bin|/sbin|/lib(32|64)?|/libexec"
@@ -52,42 +52,17 @@ stop()
 
 	if [ "$RC_UNAME" = Linux ]; then
 		no_umounts_r="$no_umounts_r|/proc|/proc/.*|/run|/sys|/sys/.*"
-		if [ -e "$rc_svcdir"/usr_premounted ]; then
+		if [ -e $rc_svcdir/usr_premounted ]; then
 			no_umounts_r="$no_umounts_r|/usr"
 		fi
 	fi
 	no_umounts_r="^($no_umounts_r)$"
 
 	# Flush all pending disk writes now
-	sync
+	sync; sync
 
 	. "$RC_LIBEXECDIR"/sh/rc-mount.sh
 
-	if [ "$RC_UNAME" = Linux ] && [ -d /sys/fs/aufs ] ; then
-		#if / is aufs we remount it noxino during shutdown
-		if mountinfo -q -f '^aufs$' / ; then
-			mount -o remount,noxino,rw /
-			sync
-		fi
-
-		local aufs_branch aufs_mount_dir aufs_mount_point aufs_si_dir aufs_si_id
-		for aufs_si_dir in /sys/fs/aufs/*; do
-			aufs_mount_dir=${aufs_si_dir#/sys/fs/aufs/}
-			aufs_si_id="$(printf "%s" $aufs_mount_dir | sed 's/_/=/g')"
-			aufs_mount_point="$(mountinfo -o ${aufs_si_id})"
-			for x in $aufs_si_dir/br[0-9][0-9][0-9]; do
-				aufs_branch=$(sed 's/=.*//g' $x)
-				eindent
-				if ! mount -o "remount,del:$aufs_branch" "$aufs_mount_point" > /dev/null 2>&1; then
-					ewarn "Failed to remove branch $aufs_branch from aufs \
-						$aufs_mount_point"
-				fi
-				eoutdent
-				sync
-			done
-		done
-	fi
-
 	# Umount loop devices
 	einfo "Unmounting loop devices"
 	eindent

init.d/loopback.in

@@ -1,35 +0,0 @@
-#!@SBINDIR@/openrc-run
-# 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 -vserver
-}
-
-start()
-{
-	if [ "$RC_UNAME" = Linux ]; then
-		ebegin "Bringing up network interface lo"
-		if command -v ip > /dev/null 2>&1; then
-			ip addr add 127.0.0.1/8 dev lo brd + scope host
-			ip route add 127.0.0.0/8 dev lo scope host
-			ip link set lo up
-		else
-			ifconfig lo 127.0.0.1 netmask 255.0.0.0
-			route add -net 127.0.0.0 netmask 255.0.0.0 gw 127.0.0.1
-		fi
-	else
-		ebegin "Bringing up network interface lo0"
-		ifconfig lo0 127.0.0.1 netmask 255.0.0.0
-		route -q add -inet 127.0.0.0 -netmask 255.0.0.0 127.0.0.1
-	fi
-	eend $?
-}
-
-stop()
-{
-	return 0
-}

init.d/mixer.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d/modules.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d/mount-ro.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
@@ -15,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

init.d/moused.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d/mtab.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
@@ -12,16 +12,13 @@ depend()
 
 start()
 {
-	if [ -L /etc/mtab ]; then
+	if [ -L /etc/mtab ]
+	then
+		einfo "Skipping mtab update (mtab is a symbolic link)"
 		return 0
 	fi
 
 	ebegin "Updating /etc/mtab"
-	vewarn "The support for updating /etc/mtab as a file is"
-	vewarn "deprecated and will be removed in the future."
-	vewarn "Please run the following command as root on your system."
-	vewarn
-	vewarn "ln -snf /proc/self/mounts /etc/mtab"
 	if ! echo 2>/dev/null >/etc/mtab; then
 		ewend 1 "/etc/mtab is not updateable"
 		return 0
@@ -31,7 +28,7 @@ start()
 	# 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
+	grep -v "^[^ ]* / tmpfs " /proc/mounts > /etc/mtab
 
 	# Remove stale backups
 	rm -f /etc/mtab~ /etc/mtab~~

init.d/net.lo.in

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

init.d/netmount.in

@@ -1,21 +1,29 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/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()
 {
 	config /etc/fstab
 	use afc-client amd autofs openvpn
 	use dns
-	keyword -jail -prefix -vserver -lxc
+	keyword -jail -prefix -vserver
 }
 
 start()
 {
 	local x= fs= rc=
 	for x in $net_fs_list $extra_net_fs_list; do
+		case "$x" in
+			nfs|nfs4)
+			continue
+			;;
+		esac
 		fs="$fs${fs:+,}$x"
 	done
 
@@ -38,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"
@@ -47,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

init.d/network.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
@@ -46,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
@@ -227,6 +223,15 @@ start()
 
 	einfo "Starting network"
 	routeflush
+	if [ "$RC_UNAME" = "Linux" ]; then
+		ifconfig lo 127.0.0.1 netmask 255.0.0.0 || cr=1
+		route add -net 127.0.0.0 netmask 255.0.0.0 \
+			gw 127.0.0.1 reject 2>/dev/null
+	else
+		ifconfig lo0 127.0.0.1 netmask 255.0.0.0 || cr=1
+		route -q add -inet 127.0.0.0 -netmask 255.0.0.0 \
+			127.0.0.1 -reject || cr=1
+	fi
 	eindent
 	for int in $(interfaces); do
 		local func= cf=
@@ -318,17 +323,13 @@ stop()
 	# Don't stop the network at shutdown.
  	# We don't use the noshutdown keyword so that we are started again
 	# correctly if we go back to multiuser.
-	yesno ${keep_network:-YES} && yesno $RC_GOINGDOWN && return 0
+	yesno ${shutdown_network:-YES} && yesno $RC_GOINGDOWN && return 0
 
 	local int= intv= cmd= downcmd= r=
 	einfo "Stopping network"
 	routeflush
 	eindent
 	for int in $(reverse $(interfaces u)); do
-		case "$int" in
-			lo|lo0) continue ;;
-			*) ;;
-		esac
 		intv=$(shell_var "$int")
 		eval downcmd=\$ifdown_$intv
 		eval cmd=\$ip_$intv

init.d/newsyslog.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d/nscd.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d/numlock.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d/pf.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
@@ -17,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

init.d/powerd.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d/procfs.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
@@ -31,7 +31,7 @@ start()
 				ebegin "Loading custom binary format handlers"
 				fmts=$(grep -hsv -e '^[#;]' -e '^[[:space:]]*$' \
 					/run/binfmt.d/*.conf \
-					/etc/binfmt.d/*.conf \
+					@SYSCONFDIR@/binfmt.d/*.conf \
 					""/usr/lib/binfmt.d/*.conf)
 				if [ -n "${fmts}" ]; then
 					echo "${fmts}" > /proc/sys/fs/binfmt_misc/register
@@ -61,10 +61,10 @@ start()
 	fi
 
 	# Setup Kernel Support for SELinux
-	if [ -d /sys/fs/selinux ] && ! mountinfo -q /sys/fs/selinux; then
+	if [ -d /selinux ] && ! mountinfo -q /selinux; then
 		if grep -qs selinuxfs /proc/filesystems; then
 			ebegin "Mounting SELinux filesystem"
-			mount -t selinuxfs selinuxfs /sys/fs/selinux
+			mount -t selinuxfs selinuxfs /selinux
 			eend $?
 		fi
 	fi

init.d/rarpd.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d/rc-enabled.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d/root.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d/rpcbind.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d/savecache.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
@@ -13,8 +13,8 @@ start()
 			return 1
 		fi
 	fi
-	if ! checkpath -W "$RC_LIBEXECDIR"/cache; then
-		ewarn "WARNING: ${RC_LIBEXECDIR}/cache is not writable!"
+	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

init.d/savecore.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d/staticroute.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d/swap-blk.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d/swap.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d/swapfiles.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
@@ -21,6 +21,14 @@ start()
 stop()
 {
 	ebegin "Deactivating additional swap space"
+
+	# Try to unmount all tmpfs filesystems not in use, else a deadlock may
+	# occur. As $RC_SVCDIR may also be tmpfs we cd to it to lock it
+	# fixme: Do we need this here since we are only unmounting swap files
+	# and loopback swap?
+	cd "$RC_SVCDIR"
+	umount -a -t tmpfs 2>/dev/null
+
 	case "$RC_UNAME" in
 		Linux)
 			if [ -e /proc/swaps ]; then

init.d/swclock.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
@@ -17,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 @PREFIX@/sbin/runscript
 	fi
 	eend $?
 }

init.d/syscons.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d/sysctl.BSD.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d/sysctl.GNU-kFreeBSD.in

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

init.d/sysctl.GNU.in

@@ -1,32 +0,0 @@
-#!@PREFIX@/sbin/runscript
-# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
-#FIXME: Modify for GNU/Hurd
-
-depend()
-{
-	before bootmisc logger
-	keyword -prefix
-}
-
-start()
-{
-	[ -e /etc/sysctl.conf ] || return 0
-	local retval=0 var= comments= conf=
-	ebegin "Configuring kernel parameters"
-	eindent
-	for conf in @SYSCONFDIR@/sysctl.conf @SYSCONFDIR@/sysctl.d/*.conf; do
-		if [ -r "$conf" ]; then
-			vebegin "applying $conf"
-			while read var comments; do
-				case "$var" in
-				""|"#"*) continue;;
-				esac
-				sysctl -w "$var" >/dev/null || retval=1
-			done < "$conf"
-			veend $retval
-		fi
-	done
-	eoutdent
-	eend $retval "Some errors were encountered"
-}

init.d/sysctl.Linux.in

@@ -1,16 +1,34 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
 depend()
 {
 	before bootmisc logger
-	keyword -prefix -vserver
+	keyword -lxc -prefix -vserver
 }
 
 start()
 {
+	local conf= retval=0 err errs
+
 	ebegin "Configuring kernel parameters"
-	sysctl --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}"
 }

init.d/sysfs.in

@@ -1,11 +1,9 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
 description="Mount the sys filesystem."
 
-sysfs_opts=nodev,noexec,nosuid
-
 depend()
 {
 	keyword -lxc -prefix -vserver
@@ -25,7 +23,7 @@ mount_sys()
 
 	ebegin "Mounting /sys"
 	if ! fstabinfo --mount /sys; then
-		mount -n -t sysfs -o ${sysfs_opts} sysfs /sys
+		mount -n -t sysfs -o noexec,nosuid,nodev sysfs /sys
 	fi
 	eend $?
 }
@@ -37,7 +35,7 @@ mount_misc()
 		! mountinfo -q /sys/kernel/security; then
 		if grep -qs securityfs /proc/filesystems; then
 			ebegin "Mounting security filesystem"
-			mount -n -t securityfs -o ${sysfs_opts} \
+			mount -n -t securityfs -o nodev,noexec,nosuid \
 				securityfs /sys/kernel/security
 			eend $?
 		fi
@@ -47,7 +45,8 @@ mount_misc()
 	if [ -d /sys/kernel/debug ] && ! mountinfo -q /sys/kernel/debug; then
 		if grep -qs debugfs /proc/filesystems; then
 			ebegin "Mounting debug filesystem"
-			mount -n -t debugfs -o ${sysfs_opts} debugfs /sys/kernel/debug
+			mount -n -t debugfs -o nodev,noexec,nosuid \
+				debugfs /sys/kernel/debug
 			eend $?
 		fi
 	fi
@@ -56,7 +55,8 @@ mount_misc()
 	if [ -d /sys/kernel/config ] && ! mountinfo -q /sys/kernel/config; then
 		if grep -qs configfs /proc/filesystems; then
 			ebegin "Mounting config filesystem"
-			mount -n -t configfs -o  ${sysfs_opts} configfs /sys/kernel/config
+			mount -n -t configfs -o  nodev,noexec,nosuid \
+				configfs /sys/kernel/config
 			eend $?
 		fi
 	fi
@@ -65,78 +65,47 @@ mount_misc()
 	if [ -d /sys/fs/cgroup ] && ! mountinfo -q /sys/fs/cgroup; then
 		if grep -qs cgroup /proc/filesystems; then
 			ebegin "Mounting cgroup filesystem"
-			local opts="${sysfs_opts},mode=755,size=${rc_cgroupsize:-10m}"
+			local opts="nodev,noexec,nosuid,mode=755,size=${rc_cgroupsize:-10m}"
 			mount -n -t tmpfs -o ${opts} cgroup_root /sys/fs/cgroup
 			eend $?
 		fi
 	fi
-
-	# set up kernel support for fusectl
-	if [ -d /sys/fs/fuse/connections ] \
-		&& ! mountinfo -q /sys/fs/fuse/connections; then
-		if grep -qs fusectl /proc/filesystems; then
-			ebegin "Mounting fuse control filesystem"
-			mount -n -t fusectl -o ${sysfs_opts} \
-				fusectl /sys/fs/fuse/connections
-			eend $?
-		fi
-	fi
-
-	# setup up kernel support for efivarfs
-	# slightly complicated, as if it's build as a module but NOT yet loaded,
-	# it will NOT appear in /proc/filesystems yet
-	if [ -d /sys/firmware/efi/efivars ] \
-		&& ! mountinfo -q /sys/firmware/efi/efivars; then
-		modprobe -q efivarfs
-		if grep -qs efivarfs /proc/filesystems; then
-			ebegin "Mounting efivarfs filesystem"
-			mount -n -t efivarfs -o ${sysfs_opts} \
-				efivarfs /sys/firmware/efi/efivars
-			eend $?
-		fi
-	fi
 }
 
 mount_cgroups()
 {
-	mountinfo -q /sys/fs/cgroup || return 0
+		mountinfo -q /sys/fs/cgroup || return 0
 
-	if ! mountinfo -q /sys/fs/cgroup/openrc; then
-		local agent="@LIBEXECDIR@/sh/cgroup-release-agent.sh"
-		mkdir /sys/fs/cgroup/openrc
-		mount -n -t cgroup \
-			-o none,${sysfs_opts},name=openrc,release_agent="$agent" \
-			openrc /sys/fs/cgroup/openrc
-		echo 1 > /sys/fs/cgroup/openrc/notify_on_release
-	fi
+	local agent="@LIBEXECDIR@/sh/cgroup-release-agent.sh"
+	mkdir /sys/fs/cgroup/openrc
+	mount -n -t cgroup \
+		-o none,nodev,noexec,nosuid,name=openrc,release_agent="$agent" \
+		openrc /sys/fs/cgroup/openrc
+	echo 1 > /sys/fs/cgroup/openrc/notify_on_release
 
 	yesno ${rc_controller_cgroups:-YES} && [ -e /proc/cgroups ] || return 0
 	while read name hier groups enabled rest; do
 		case "${enabled}" in
-			1)	mountinfo -q /sys/fs/cgroup/${name} && continue
-				mkdir /sys/fs/cgroup/${name}
-				mount -n -t cgroup -o ${sysfs_opts},${name} \
+			1)	mkdir /sys/fs/cgroup/${name}
+				mount -n -t cgroup -o nodev,noexec,nosuid,${name} \
 					${name} /sys/fs/cgroup/${name}
 				;;
 		esac
 	done < /proc/cgroups
 }
 
-restorecon_sys()
-{
-	if [ -x /sbin/restorecon ]; then
-		ebegin "Restoring SELinux contexts in /sys"
-		restorecon -F /sys/devices/system/cpu/online >/dev/null 2>&1
-		restorecon -rF /sys/fs/cgroup >/dev/null 2>&1
-		eend $?
-	fi
-}
-
 start()
 {
+	local retval
 	mount_sys
-	mount_misc
-	mount_cgroups
-	restorecon_sys
-	return 0
+	retval=$?
+	if [ $retval -eq 0 ]; then
+		mount_misc
+		retval=$?
+	fi
+	if [ $retval -eq 0 ]; then
+		mount_cgroups
+		retval=$?
+	fi
+	return $retval
 }

init.d/syslogd.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d/termencoding.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2008-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d/tmpfiles.dev.in

@@ -1,20 +0,0 @@
-#!@SBINDIR@/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Released under the 2-clause BSD license.
-
-description="set up tmpfiles.d entries"
-
-depend()
-{
-	use dev-mount
-	before dev
-	keyword -prefix -vserver
-}
-
-start()
-{
-	ebegin "setting up tmpfiles.d entries for /dev"
-	@LIBEXECDIR@/sh/tmpfiles.sh --prefix=/dev --create ${tmpfiles_opts}
-	eend $?
-	return 0
-}

init.d/tmpfiles.setup.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright 1999-2012 Gentoo Foundation
 # Released under the 2-clause BSD license.
 
@@ -12,8 +12,7 @@ depend()
 start()
 {
 	ebegin "setting up tmpfiles.d entries"
-	@LIBEXECDIR@/sh/tmpfiles.sh --exclude-prefix=/dev --create --remove --boot \
-		${tmpfiles_opts}
+	@LIBEXECDIR@/sh/tmpfiles.sh --create --remove ${tmpfiles_opts}
 	eend $?
 	return 0
 }