release openrc-0.9.1

Makefile

@@ -4,7 +4,12 @@
 
 include Makefile.inc
 
-SUBDIR=		conf.d etc init.d local.d man scripts sh src sysctl.d
+SUBDIR=		conf.d etc init.d local.d man scripts sh src
+
+# Build our old net foo or not
+ifeq (${MKOLDNET},yes)
+SUBDIR+=	net doc
+endif
 
 # Build pkgconfig or not
 MKPKGCONFIG?=	yes
@@ -25,10 +30,6 @@ include ${MK}/dist.mk
 include ${MK}/git.mk
 
 _installafter:
-ifeq (${MKPREFIX},yes)
 	${INSTALL} -d ${DESTDIR}/${LIBEXECDIR}/init.d
-else ifneq (${OS},Linux)
-	${INSTALL} -d ${DESTDIR}/${LIBEXECDIR}/init.d
-endif
 	${INSTALL} -d ${DESTDIR}/${LIBEXECDIR}/tmp
 	${ECHO} "${VERSION}${GITVER}" > ${DESTDIR}/${LIBEXECDIR}/version

Makefile.inc

@@ -1,3 +1,3 @@
 NAME=		openrc
-VERSION=	0.12.4
+VERSION=	0.9.1
 PKG=		${NAME}-${VERSION}

README

@@ -10,15 +10,13 @@ You may wish to tweak the installation with the below arguments
 PROGLDFLAGS=-static
 LIBNAME=lib64
 DESTDIR=/tmp/openrc-image
-MKNET=no
 MKPAM=pam
-MKPREFIX=yes
 MKPKGCONFIG=no
+MKRCSYS=prefix
 MKSELINUX=yes
-MKSTATICLIBS=no
 MKTERMCAP=ncurses
 MKTERMCAP=termcap
-MKTOOLS=yes
+MKOLDNET=yes
 PKG_PREFIX=/usr/pkg
 LOCAL_PREFIX=/usr/local
 PREFIX=/usr/local
@@ -27,8 +25,6 @@ We don't support building a static OpenRC with PAM.
 You may need to use PROGLDFLAGS=-Wl,-Bstatic on glibc instead of just -static.
 If you debug memory under valgrind, add -DDEBUG_MEMORY to your CPPFLAGS
 so that all malloc memory should be freed at exit.
-If you are building OpenRC for a Gentoo Prefix installation, add
-MKPREFIX=yes.
 
 You can also brand OpenRC if you so wish like so
 BRANDING=\"Gentoo/$(uname -s)\"
@@ -38,6 +34,20 @@ LOCAL_PREFIX should be set when to where user maintained packages are.
 Only set LOCAL_PREFIX if different from PKG_PREFIX.
 PREFIX should be set when OpenRC is not installed to /.
 
+MKRCSYS should be set only if you need to specify a default system
+subtype. The subtype should be set to match the type of environment the
+file is installed into, not the virtualization the environment is
+capable of handling. Here is a list of subtypes and their meanings.
+
+jail	FreeBSD jail
+lxc	Linux container
+openvz	Linux OpenVZ
+prefix	Linux and *BSD prefix system
+uml	UsermodeLinux
+vserver	Linux vserver
+xen0 Linux and NetBSD xen0 Domain
+xenU Linux and NetBSD xenU Domain
+
 If any of the following files exist then we do not overwrite them
 /etc/devd.conf
 /etc/rc
@@ -57,9 +67,6 @@ init.d.misc is not installed by default as the scripts will need
 tweaking on a per distro basis. They are also non essential to the operation
 of the system.
 
-As of OpenRC-0.12, the net.* scripts, originally from Gentoo Linux, have
-been removed. If you need these scripts, look for a package called
-netifrc, which is maintained by them.
 
 Reporting Bugs
 --------------

README.busybox

@@ -1,28 +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.
-
-All of these apply to busybox 1.20.2, which is the current version of
-busybox as of this writing.
-
-1. The start-stop-daemon applet is not compatible with start-stop-daemon
-in OpenRC. Please make sure CONFIG_START_STOP_DAEMON is not set to y in
-the configuration file you use to build busybox.
-
-2. The -O option for the mount applet does not support the [no]_netdev
-options from util-linux for handling network file systems.
-
-3. The umount applet does not support the -O option from util-linux.
-
-4. The swapon applet does not support the -e option from util-linux.
-
-5. the setfont applet does not support the -u option from kbd.
-
-There is work to get most of these supported by busybox, so this file
-will be updated as things change.

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.
 

TODO

@@ -1,21 +1,7 @@
-- ensure all forks block, restore and unblock signals. needs review
+- ensure all forks block, restore and unblock signals. needs review 
 
 - add support somehow for optional translations
 
 - oldnet[bridging]: Review setting of bridge configuration on dynamic interface add
 
 - Document rc-depend binary.
-
-- _ifindex is not a reliable means of calculating metrics:
-	_ifindex is used for calculating metrics for new devices but has a major
-	problem: Since it's only the nth entry in /proc/net/dev
-	And devices may be removed from that file, and reordered, you won't always
-	get the same result.
-	If you do:
-	- add eth0 - _ifindex (eth0=0)
-	- add vlan1 - _ifindex (eth0=0,vlan1=1)
-	- add vlan2 - _ifindex (eth0=0,vlan1=1,vlan2=2)
-	- rem vlan1 - _ifindex (eth0=0,vlan2=1)
-	- add vlan3 - _ifindex (eth0=0,vlan2=1,vlan3=2)
-	Now your routing table has entries for both vlan2 and vlan3 with a metric of 2.
-

conf.d/Makefile

@@ -1,28 +1,19 @@
-include ../mk/net.mk
-
 DIR=	${CONFDIR}
-CONF=	bootmisc fsck hostname localmount netmount urandom tmpfiles \
-		${CONF-${OS}}
+CONF=	bootmisc fsck hostname localmount network staticroute urandom
 
-ifeq (${MKNET},yes)
-CONF+= network staticroute
 TARGETS+=	network staticroute
 CLEANFILES+=	network staticroute
-endif
 
 MK=	../mk
 include ${MK}/os.mk
-
-CONF-FreeBSD=	ipfw moused powerd rarpd savecore syscons
-
-CONF-Linux=	consolefont dmesg hwclock keymaps killprocs modules
-
-CONF-NetBSD=	moused rarpd savecore
-
+include Makefile.${OS}
 include ${MK}/scripts.mk
 
-network: network.in network${SFX}
-	cat $^ > $@
+SOS?=	BSD
 
-staticroute: staticroute${SFX}
-	cp $@${SFX} $@
+network: network.in network.${SOS}
+	cp $@.in $@
+	[ -e $@.${SOS} ] && cat $@.${SOS} >> $@ || true
+
+staticroute: staticroute.${SOS}
+	cp $@.${SOS} $@

conf.d/Makefile.FreeBSD

@@ -0,0 +1 @@
+CONF+=	ipfw moused powerd rarpd savecore syscons

conf.d/Makefile.Linux

@@ -0,0 +1,2 @@
+CONF+=	consolefont dmesg hwclock keymaps killprocs modules
+SOS=	Linux

conf.d/Makefile.NetBSD

@@ -0,0 +1 @@
+CONF+=	moused rarpd savecore

conf.d/adjkerntz

@@ -1,10 +1,10 @@
 # Set CLOCK to "UTC" if your system clock is set to UTC (also known as
-# Greenwich Mean Time).  If your clock is set to the local time, then
-# set CLOCK to "local".  Note that if you dual boot with Windows, then
+# Greenwich Mean Time).  If your clock is set to the local time, then 
+# set CLOCK to "local".  Note that if you dual boot with Windows, then 
 # you should set it to "local".
 clock="UTC"
 
-# If you want to set the Hardware Clock to the current System Time
+# If you want to set the Hardware Clock to the current System Time 
 # during shutdown, then say "YES" here.
 # You normally don't need to do this if you run a ntp daemon.
 clock_systohc="NO"

conf.d/bootmisc

@@ -4,7 +4,3 @@ clean_tmp_dirs="/tmp"
 # Should we wipe the tmp paths completely or just selectively remove known
 # locks / files / etc... ?
 wipe_tmp="YES"
-
-# Write the initial dmesg log into /var/log/dmesg after boot
-# This may be useful if you need the kernel boot log afterwards
-log_dmesg="YES"

conf.d/consolefont

@@ -1,10 +1,9 @@
-# The consolefont service is not activated by default. If you need to
-# use it, you should run "rc-update add consolefont boot" as root.
-#
 # consolefont specifies the default font that you'd like Linux to use on the
 # console.  You can find a good selection of fonts in /usr/share/consolefonts;
 # you shouldn't specify the trailing ".psf.gz", just the font name below.
 # To use the default console font, comment out the CONSOLEFONT setting below.
+# This setting is used by the /etc/init.d/consolefont script (NOTE: if you do
+# not want to use it, run "rc-update del consolefont boot" as root).
 consolefont="default8x16"
 
 # consoletranslation is the charset map file to use.  Leave commented to use

conf.d/dmesg

@@ -1,3 +1,3 @@
 # Sets the level at which logging of messages is done to the
-# console.  See dmesg(1) for more info.
+# console.  See dmesg(8) for more info.
 dmesg_level="1"

conf.d/fsck

@@ -13,13 +13,6 @@
 #fsck_passno=">1"
 #fsck_passno="<2"
 
-# If passno is not enough granularity, you can also specify mountpoints to
-# check. This should NOT be used for the default non-multiplexed fsck, or your
-# system might not be checked. Additionally, it is mutually exclusive with
-# the fsck_passno setting.
-#fsck_mnt=""
-#fsck_mnt="/home"
-
 # Most modern fs's don't require a full fsck on boot, but for those that do
 # it may be advisable to skip this when running on battery.
 # WARNING: Do not turn this off if you have any JFS partitions.

conf.d/hwclock

@@ -1,20 +1,22 @@
 # Set CLOCK to "UTC" if your Hardware Clock is set to UTC (also known as
-# Greenwich Mean Time).  If that clock is set to the local time, then
-# set CLOCK to "local".  Note that if you dual boot with Windows, then
+# Greenwich Mean Time).  If that clock is set to the local time, then 
+# set CLOCK to "local".  Note that if you dual boot with Windows, then 
 # you should set it to "local".
 clock="UTC"
 
-# If you want the hwclock script to set the system time (software clock)
-# to match the current hardware clock during bootup, leave this
-# commented out.
-# However, you can set this to "NO" ifyou are running a modern kernel
-# with CONFIG_RTC_HCTOSYS set to y and your hardware clock set to UTC.
-#clock_hctosys="YES"
-
-# If you do not want to set the hardware clock to the current system
-# time (software clock) during shutdown, set this to no.
-#clock_systohc="YES"
+# If you want to set the Hardware Clock to the current System Time 
+# (software clock) during shutdown, then say "YES" here.
+# You normally don't need to do this if you run a ntp daemon.
+clock_systohc="NO"
 
+# If you want to set the system time to the current hardware clock
+# during bootup, then say "YES" here. You do not need this if you are
+# running a modern kernel with CONFIG_RTC_HCTOSYS set to y.
+# Also, be aware that if you set this to "NO", the system time will
+# never be saved to the hardware clock unless you set
+# clock_systohc="YES" above.
+clock_hctosys="YES"
+ 
 # If you wish to pass any other arguments to hwclock during bootup,
 # you may do so here. Alpha users may wish to use --arc or --srm here.
 clock_args=""

conf.d/keymaps

@@ -12,7 +12,7 @@ windowkeys="NO"
 extended_keymaps=""
 #extended_keymaps="backspace keypad euro2"
 
-# Tell dumpkeys(1) to interpret character action codes to be
+# Tell dumpkeys(1) to interpret character action codes to be 
 # from the specified character set.
 # This only matters if you set unicode="yes" in /etc/rc.conf.
 # For a list of valid sets, run `dumpkeys --help`

conf.d/moused

@@ -11,6 +11,6 @@
 
 # You can also multiplex the init script for each device like so
 #   ln -s moused /etc/init.d/moused.ums0
-# This enables you to have a config file per mouse (forces moused_device
+# This enables you to have a config file per mouse (forces moused_device 
 # to ums0 in this case) and control each mouse.
 # devd can also start and stop these mice, which laptop users will find handy.

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/netmount

@@ -1,40 +0,0 @@
-# You will need to set the dependencies in the netmount script to match
-# the network configuration tools you are using. This should be done in
-# this file by following the examples below, and not by changing the
-# service script itself.
-#
-# Each of these examples is meant to be used separately. So, for
-# example, do not set rc_need to something like "net.eth0 dhcpcd".
-#
-# If you are using newnet and configuring your interfaces with static
-# addresses with the network script, you  should use this setting.
-#
-#rc_need="network"
-#
-# If you are using oldnet, you must list the specific net.* services you
-# need.
-#
-# This example assumes all of your netmounts can be reached on
-# eth0.
-#
-#rc_need="net.eth0"
-#
-# This example assumes some of your netmounts are on eth1 and some
-# are on eth2.
-#
-#rc_need="net.eth1 net.eth2"
-#
-# If you are using a dynamic network management tool like
-# networkmanager, dhcpcd in standalone mode, wicd, badvpn-ncd, etc, to
-# manage the network interfaces with the routes to your netmounts, you
-# should list that tool.
-#
-#rc_need="networkmanager"
-#rc_need="dhcpcd"
-#rc_need="wicd"
-#
-# The default setting is designed to be backward compatible with our
-# current setup, but you are highly discouraged from using this. In
-# other words, please change it to be more suited to your system.
-#
-rc_need="net"

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/tmpfiles

@@ -1,3 +0,0 @@
-# Extra options for tmpfiles.sh
-#tmpfiles_opts="--verbose"
-tmpfiles_opts=""

conf.d/urandom

@@ -2,4 +2,4 @@
 # (say for crypt swap), so you will need to customize this
 # behavior.  If you have /var on a separate partition, then
 # make sure this path lives on your root device somewhere.
-urandom_seed="/var/lib/misc/random-seed"
+urandom_seed="/var/run/random-seed"

doc/.gitignore

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

doc/Makefile

@@ -0,0 +1,7 @@
+DIR=	${DOCDIR}/openrc
+INC=	net.example
+
+MK=	../mk
+include ${MK}/os.mk
+include Makefile.${OS}
+include ${MK}/scripts.mk

doc/Makefile.FreeBSD

@@ -0,0 +1,5 @@
+SRCS+=		net.example.in
+
+.SUFFIXES:	.BSD.in
+.BSD.in:
+	${CP} $< $@

doc/Makefile.Linux

@@ -0,0 +1,5 @@
+SRCS+=		net.example.in
+
+.SUFFIXES:	.Linux.in
+.Linux.in:
+	${CP} $< $@

doc/Makefile.NetBSD

@@ -0,0 +1,5 @@
+SRCS+=		net.example.in
+
+.SUFFIXES:	.BSD.in
+.BSD.in:
+	${CP} $< $@

doc/net.example.BSD.in

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

@@ -1,28 +1,21 @@
 DIR=	${SYSCONFDIR}
-SRCS=	rc.conf.in rc.in rc.shutdown.in
-BIN=	${BIN-${OS}}
-CONF=	rc.conf ${BIN-${OS}}
+CONF=	rc.conf
 
 CLEANFILES+=	rc.conf
 
 MK=	../mk
 include ${MK}/os.mk
-
-SED_EXTRA-FreeBSD=	-e 's:@TERM@:cons25:g'
-BIN-FreeBSD=		rc rc.shutdown rc.devd
-CONF-FreeBSD=		devd.conf
-
-SED_EXTRA-Linux=	-e 's:@TERM@:wsvt25:g'
-BIN-Linux=
-CONF-Linux=
-
-SED_EXTRA-NetBSD=	-e 's:@TERM@:wsvt25:g'
-BIN-NetBSD=		rc rc.shutdown
-CONF-NetBSD=
-
-SED_EXTRA=	${SED_EXTRA-${OS}}
-
+include Makefile.${OS}
 include ${MK}/scripts.mk
 
+# We can't use "ifndef" here because that treats set-but-empty
+# as not-set which is not what we want
+MKRCSYS ?= automagicplease
+ifeq ($(MKRCSYS),automagicplease)
+# If the user isn't picking a default, then have the
+# config go with runtime automagic detection #357247
+rc.conf: SED_EXTRA += -e '/^rc_sys=""/s:^:\#:'
+MKRCSYS =
+endif
 rc.conf: rc.conf.in rc.conf.${OS}
 	${SED} ${SED_REPLACE} ${SED_EXTRA} $^ > $@

etc/Makefile.FreeBSD

@@ -0,0 +1,4 @@
+SED_EXTRA=	-e 's:@TERM@:cons25:g'
+SRCS+=		rc.conf.in rc.in rc.shutdown.in
+CONF+=		devd.conf
+BIN+=		rc rc.shutdown rc.devd

etc/Makefile.Linux

@@ -0,0 +1,2 @@
+SED_EXTRA=	-e 's:@TERM@:wsvt25:g'
+SRCS+=		rc.conf.in rc.in rc.shutdown.in

etc/Makefile.NetBSD

@@ -0,0 +1,3 @@
+SED_EXTRA=	-e 's:@TERM@:wsvt25:g'
+SRCS+=		rc.conf.in rc.in rc.shutdown.in
+BIN+=		rc rc.shutdown

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.FreeBSD

@@ -5,9 +5,10 @@
 # ""        - nothing special
 # "jail"    - FreeBSD jails
 # "prefix"  - Prefix
-# If this is commented out, automatic detection will be used.
+# If this is commented out, automatic detection will be attempted.
+# Note that automatic detection does not work in a prefix environment.
 #
 # 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=""
+rc_sys="@RC_SYS_DEFAULT@"
 

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

@@ -10,69 +10,15 @@
 # "vserver" - Linux vserver
 # "xen0"    - Xen0 Domain
 # "xenU"    - XenU Domain
-# If this is commented out, automatic detection will be used.
+# If this is commented out, automatic detection will be attempted.
+# Note that autodetection will not work in a prefix environment or in a
+# linux container.
 #
 # 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=""
+rc_sys="@RC_SYS_DEFAULT@"
 
 # This is the number of tty's used in most of the rc-scripts (like
 # 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".
-#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.NetBSD

@@ -6,9 +6,10 @@
 # "prefix"  - Prefix
 # "xen0"    - Xen0 Domain
 # "xenU"    - XenU Domain
-# If this is commented out, automatic detection will be used.
+# If this is commented out, automatic detection will be attempted.
+# Note that automatic detection does not work in a prefix environment.
 #
 # 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=""
+rc_sys="@RC_SYS_DEFAULT@"
 

etc/rc.conf.in

@@ -80,10 +80,6 @@
 # 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 cifs coda davfs fuse fuse.sshfs gfs glusterfs lustre ncpfs
@@ -98,14 +94,10 @@
 # These variables are documented here, but should be configured in
 # /etc/conf.d/foo for service foo and NOT enabled here unless you
 # really want them to work on a global basis.
-# If your service has characters in its name which are not legal in
-# shell variable names and you configure the variables for it in this
-# file, those characters should be replaced with underscores in the
-# variable names as shown below.
 
 # Some daemons are started and stopped via start-stop-daemon.
 # We can set some things on a per service basis, like the nicelevel.
-#SSD_NICELEVEL="-19"
+#export SSD_NICELEVEL="-19"
 
 # Pass ulimit parameters
 #rc_ulimit="-u 30"
@@ -124,13 +116,6 @@
 #rc_foo_need="openvpn"
 #rc_foo_after="clock"
 
-# Below is an example for service foo-bar. Note that the '-' is illegal
-# in a shell variable name, so we convert it to an underscore.
-# example for service foo-bar.
-#rc_foo_bar_config="/etc/foo-bar"
-#rc_foo_bar_need="openvpn"
-#rc_foo_bar_after="clock"
-
 # You can also remove dependencies.
 # This is mainly used for saying which servies do NOT provide net.
 #rc_net_tap0_provide="!net"

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/Makefile

@@ -7,5 +7,5 @@ MK=	../mk
 
 SED_EXTRA+= -e 's:@VARBASE@:/var:g'
 
-include ${MK}/os.mk
 include ${MK}/scripts.mk
+include Makefile.${OS}

init.d.misc/Makefile.FreeBSD

@@ -0,0 +1 @@
+PKG_PREFIX?=	/usr/local

init.d.misc/Makefile.Linux

@@ -0,0 +1 @@
+PKG_PREFIX?=/usr

init.d.misc/Makefile.NetBSD

@@ -0,0 +1 @@
+PKG_PREFIX?=	/usr/pkg

init.d.misc/avahi-dnsconfd.in

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

init.d.misc/polkitd.in

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

init.d/.gitignore

@@ -11,7 +11,6 @@ network
 root
 savecache
 swap
-swapfiles
 sysctl
 urandom
 devfs
@@ -41,4 +40,3 @@ syslogd
 termencoding
 ttys
 wscons
-tmpfiles.setup

init.d/Makefile

@@ -1,39 +1,25 @@
-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 \
-	tmpfiles.setup.in swclock.in sysctl.in urandom.in ${SRCS-${OS}}
+SRCS=	bootmisc.in fsck.in hostname.in local.in localmount.in netmount.in \
+	network.in root.in savecache.in staticroute.in swap.in swclock.in \
+	sysctl.in urandom.in
 BIN=	${OBJS}
 
-# Are we installing our network scripts?
-ifeq (${MKNET},yes)
-SRCS+= network.in staticroute.in
+# Build our old net foo or not
+ifeq (${MKOLDNET},yes)
+_OLDNET=	net.lo
 endif
+_NET_LO=	${_OLDNET}
+
+INSTALLAFTER=	_installafter_${_NET_LO}
+CLEANFILES+=	${_NET_LO}
+TARGETS+=	${_NET_LO}
 
 MK=	../mk
 include ${MK}/os.mk
-
-# Generic BSD scripts
-SRCS-FreeBSD=	hostid.in moused.in newsyslog.in pf.in rarpd.in rc-enabled.in \
-		rpcbind.in savecore.in syslogd.in
-# These are FreeBSD specific
-SRCS-FreeBSD+=	adjkerntz.in devd.in dumpon.in encswap.in ipfw.in \
-		mixer.in nscd.in powerd.in syscons.in
-
-SRCS-Linux=	devfs.in dmesg.in hwclock.in consolefont.in keymaps.in \
-		killprocs.in modules.in mount-ro.in mtab.in numlock.in \
-		procfs.in sysfs.in termencoding.in tmpfiles.dev.in
-
-# Generic BSD scripts
-SRCS-NetBSD=	hostid.in moused.in newsyslog.in pf.in rarpd.in rc-enabled.in \
-		rpcbind.in savecore.in syslogd.in
-# These are NetBSD specific
-SRCS-NetBSD+=	devdb.in swap-blk.in ttys.in wscons.in
-
-%.in: %${SFX}
-	sed ${SED_REPLACE} ${SED_EXTRA} $< > $@
-
+include Makefile.${OS}
 include ${MK}/scripts.mk
 
 _installafter_: realinstall
+
+_installafter_net.lo: realinstall
+	${INSTALL} -m ${BINMODE} net.lo ${DESTDIR}/${INITDIR}/${NET_LO}

init.d/Makefile.FreeBSD

@@ -0,0 +1,13 @@
+NET_LO=	net.lo0
+
+# Generic BSD scripts
+SRCS+=	hostid.in moused.in newsyslog.in pf.in rarpd.in rc-enabled.in \
+	rpcbind.in savecore.in syslogd.in
+
+# These are FreeBSD specific
+SRCS+=	adjkerntz.in devd.in dumpon.in ipfw.in mixer.in nscd.in \
+	powerd.in syscons.in
+
+.SUFFIXES:	.BSD.in
+.BSD.in:
+	sed ${SED_REPLACE} ${SED_EXTRA} $< > $@

init.d/Makefile.Linux

@@ -0,0 +1,9 @@
+NET_LO=	net.lo
+
+SRCS+=	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
+
+.SUFFIXES:	.Linux.in
+.Linux.in:
+	sed ${SED_REPLACE} ${SED_EXTRA} $< > $@

init.d/Makefile.NetBSD

@@ -0,0 +1,12 @@
+NET_LO=	net.lo0
+
+# Generic BSD scripts
+SRCS+=	hostid.in moused.in newsyslog.in pf.in rarpd.in rc-enabled.in \
+	rpcbind.in savecore.in syslogd.in
+
+# These are NetBSD specific
+SRCS+=	devdb.in swap-blk.in ttys.in wscons.in
+
+.SUFFIXES:	.BSD.in
+.BSD.in:
+	sed ${SED_REPLACE} ${SED_EXTRA} $< > $@

init.d/adjkerntz.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/runscript
+#!@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@/runscript
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
@@ -10,8 +10,12 @@ depend()
 	keyword -prefix -timeout
 }
 
+dir_writeable()
+{
+	mkdir "$1"/.test.$$ 2>/dev/null && rmdir "$1"/.test.$$
+}
+
 : ${wipe_tmp:=${WIPE_TMP:-yes}}
-: ${log_dmesg:=${LOG_DMESG:-yes}}
 
 cleanup_tmp_dir()
 {
@@ -20,16 +24,16 @@ cleanup_tmp_dir()
 	if ! [ -d "$dir" ]; then
 		mkdir -p "$dir" || return $?
 	fi
-	checkpath -W "$dir" || return 1
+	dir_writeable "$dir" || return 1
 	chmod a+rwt "$dir" 2> /dev/null
 	cd "$dir" || return 1
 	if yesno $wipe_tmp; then
 		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 +63,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 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
-}
-
 mkutmp()
 {
 	: >"$1"
@@ -95,37 +71,6 @@ mkutmp()
 	chmod 0664 "$1"
 }
 
-migrate_to_run()
-{
-	src="$1"
-	dst="$2"
- 	if [ -L $src -a "$(readlink -f $src)" != $dst ]; then
- 		ewarn "$src does not point to $dst."
- 		ewarn "Setting $src to point to $dst."
- 		rm $src
- 	elif [ ! -L $src -a -d $src ]; then
- 		ebegin "Migrating $src to $dst"
- 		cp -a $src/* $dst/
- 		rm -rf $src
- 		eend $?
- 	fi
- 	# If $src doesn't exist at all, just run this
- 	if [ ! -e $src ]; then
- 		ln -s $dst $src
- 	fi
-}
-
-clean_run()
-{
-	[ "$RC_SYS" = VSERVER ] && 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
@@ -133,16 +78,8 @@ start()
 
 	local logw=false runw=false extra=
 	# Ensure that our basic dirs exist
-	if [ "$RC_UNAME" = Linux ]; then
-		# Satisfy Linux FHS
-		extra=/var/lib/misc
-		if [ ! -d /run ]; then
-			extra="/var/run $extra"
-		fi
-	else
-		extra=/var/run
-	fi
-	for x in /var/log /tmp $extra; do
+	[ "$RC_UNAME" = Linux ] && extra=/var/lib/misc # Satisfy Linux FHS
+	for x in /var/log /var/run /tmp $extra; do
 		if ! [ -d $x ]; then
 			if ! mkdir -p $x; then
 				eend 1 "failed to create needed directory $x"
@@ -151,13 +88,7 @@ start()
 		fi
 	done
 
-	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
+	if dir_writeable /var/run; then
 		ebegin "Creating user login records"
 		local xtra=
 		[ "$RC_UNAME" = NetBSD ] && xtra=x
@@ -167,16 +98,39 @@ 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
+	if dir_writeable /tmp; then
 		# Make sure our X11 stuff have the correct permissions
 		# Omit the chown as bootmisc is run before network is up
 		# and users may be using lame LDAP auth #139411
@@ -188,16 +142,15 @@ start()
 		fi
 	fi
 
-	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
-				dmesg > /var/log/dmesg
-				chmod 640 /var/log/dmesg
-			fi
+	if $logw || dir_writeable /var/log; then
+		# Create an 'after-boot' dmesg log
+		if [ "$RC_SYS" != VSERVER -a "$RC_SYS" != OPENVZ ]; then
+			dmesg > /var/log/dmesg
+			chmod 640 /var/log/dmesg
 		fi
 	fi
 
+	[ -w /etc/nologin ] && rm -f /etc/nologin
 	return 0
 }
 
@@ -213,5 +166,3 @@ stop()
 
 	return 0
 }
-
-# vim: ft=sh

init.d/consolefont.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/runscript
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
@@ -49,14 +49,18 @@ start()
 			retval=1
 			break
 		fi
-		: $(( x += 1 ))
+		x=$(($x + 1))
 	done
 	eend $retval
 
-	# Store the font so we can use it ASAP on boot
-	if [ $retval -eq 0 ] && checkpath -W "$RC_LIBEXECDIR"; then
+	# Store the last font so we can use it ASAP on boot
+	if [ $retval -eq 0 -a -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@/runscript
+#!@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@/runscript
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2008 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
@@ -11,7 +11,7 @@ depend()
 
 start()
 {
-	ebegin "Building the dev database"
+	ebegin "Bulding the dev database"
 	if [ /var/run/dev.db -nt /dev ]; then
 		:
 	else

init.d/devfs.in

@@ -1,19 +1,17 @@
-#!@SBINDIR@/runscript
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
 description="Mount system critical filesystems in /dev."
 
 depend() {
-	use dev-mount
-	before dev
-	keyword -prefix -vserver -lxc
+	use dev
+	keyword -prefix -vserver
 }
 
 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 shm" \
 	; do

init.d/dmesg.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/runscript
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
@@ -7,7 +7,7 @@ description="Set the dmesg level for a cleaner boot"
 depend()
 {
 	before dev modules
-	keyword -lxc -prefix -vserver
+	keyword -vserver
 }
 
 start()

init.d/dumpon.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/runscript
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
@@ -19,7 +19,7 @@ start() {
 }
 
 stop() {
-	ebegin "Deactivating kernel core dump device"
+	ebegin "Deactiving kernel core dump device"
 	dumpon off
 	eend $?
 }

init.d/encswap.in

@@ -1,43 +0,0 @@
-#!@SBINDIR@/runscript
-# Copyright 1992-2012 FreeBSD Project
-# Released under the 2-clause BSD license
-
-depend() {
-	before swap
-}
-
-start() {
-	while read device mountpoint type options rest ; do
-		case ":${device}:${type}:${options}" in
-		:#*)
-			;;
-		*.bde:swap:sw)
-			passphrase=$(dd if=/dev/random count=1 2>/dev/null | md5 -q)
-			device="${device%.bde}"
-			gbde init "${device}" -P "${passphrase}" || return 1
-			gbde attach "${device}" -p "${passphrase}" || return 1
-			;;
-		*.eli:swap:sw)
-			device="${device%.eli}"
-			geli onetime ${geli_swap_flags} "${device}" || return 1
-			;;
-		esac
-	done < /etc/fstab
-}
-
-stop() {
-	while read device mountpoint type options rest ; do
-		case ":${device}:${type}:${options}" in
-		:#*)
-			;;
-		*.bde:swap:sw)
-			device="${device%.bde}"
-			gbde detach "${device}"
-			;;
-		*.eli:swap:sw)
-			# Nothing here, because geli swap devices should be
-			# created with the auto-detach-on-last-close option.
-			;;
-		esac
-	done < /etc/fstab
-}

init.d/fsck.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/runscript
+#!@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() {
@@ -48,13 +48,8 @@ start()
 
 	if [ -n "$fsck_passno" ]; then
 		check_extra="[passno $fsck_passno] $check_extra"
-		if [ -n "$fsck_mnt" ]; then
-			eerror "Only 1 of fsck_passno and fsck_mnt must be set!"
-			return 1
-		fi
 	fi
 	ebegin "Checking local filesystems $check_extra"
-	# Append passno mounts
 	for p in $fsck_passno; do
 		local IFS="$_IFS"
 		case "$p" in
@@ -63,20 +58,11 @@ start()
 		set -- "$@" $(fstabinfo --passno "$p")
 		unset IFS
 	done
-	# Append custom mounts
-	for m in $fsck_mnt ; do
-		local IFS="$_IFS"
-		set -- "$@" "$m"
-		unset IFS
-	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"
-		if [ -z "$fsck_passno" -a -z "$fsck_mnt" ]; then
-			fsck_args=${fsck_args:--A -p}
+		fsck_opts="$fsck_opts -C0 -T"
+		if [ -z "$fsck_passno" ]; then
+			fsck_args=${fsck_args--A -p}
 			if echo 2>/dev/null >/.test.$$; then
 				rm -f /.test.$$
 				fsck_opts="$fsck_opts -R"
@@ -85,7 +71,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;;
@@ -105,7 +91,7 @@ start()
 			_reboot
 		fi;;
 	8)	ewend 1 "Operational error"; return 0;;
-	12)	ewend 1 "fsck interrupted";;
+	12)	ewend 1 "fsck interupted";;
 	*)	eend 2 "Filesystems couldn't be fixed";;
 	esac
 	_abort || return 1

init.d/hostid.in

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

init.d/hostname.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/runscript
+#!@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@/runscript
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
@@ -85,7 +85,7 @@ start()
 
 	if [ -e /etc/adjtime ] && yesno $clock_adjfile; then
 		_hwclock --adjust $utc_cmd
-		: $(( retval += $? ))
+		retval=$(($retval + $?))
 	fi
 
 	# If setting UTC, don't bother to run hwclock when first booting
@@ -94,12 +94,12 @@ start()
 		"$utc_cmd" != --utc -o \
 		-n "$clock_args" ];
 	then
-		if yesno ${clock_hctosys:-YES}; then
+		if yesno $clock_hctosys; then
 			_hwclock --hctosys $utc_cmd $clock_args
 		else
 			_hwclock --systz $utc_cmd $clock_args
 		fi
-		: $(( retval += $? ))
+		retval=$(($retval + $?))
 	fi
 
 	eend $retval "Failed to set the system clock"
@@ -111,7 +111,7 @@ stop()
 {
 	# Don't tweak the hardware clock on LiveCD halt.
 	[ -n "$CDBOOT" ] && return 0
-	yesno ${clock_systohc:-YES} || return 0
+	yesno $clock_systohc || return 0
 
 	local retval=0 errstr=""
 	setupopts

init.d/ipfw.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/runscript
+#!@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
@@ -59,7 +59,7 @@ start() {
 		return 1
 	fi
 
-	# Use a stateful firewall
+	# Use a statefull firewall
 	ipfw add check-state
 	ipfw add pass tcp from me to any established
 
@@ -123,7 +123,7 @@ start() {
 	ipfw add deny udp from any to any 520 in
 
 	# Noise from webbrowsing.
-	# The stateful filter is a bit aggressive, and will cause some
+	# The statefull filter is a bit agressive, and will cause some
 	# connection teardowns to be logged.
 	ipfw add deny tcp from any 80,443 to any 1024-65535 in
 

init.d/keymaps.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/runscript
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
@@ -47,7 +47,7 @@ start()
 	n=1
 	while [ $n -le $ttyn ]; do
 		kbd_mode $kmode -C $ttydev$n
-		: $(( n += 1 ))
+		n=$(($n + 1))
 	done
 	eend 0
 
@@ -58,12 +58,12 @@ 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
 
 	# Save the keymapping for use immediately at boot
-	if checkpath -W "$RC_LIBEXECDIR"; then
+	if [ -w "$RC_LIBEXECDIR" ]; then
 		mkdir -p "$RC_LIBEXECDIR"/console
 		dumpkeys >"$RC_LIBEXECDIR"/console/keymap
 	fi

init.d/killprocs.in

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

init.d/localmount.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/runscript
+#!@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,14 +17,11 @@ 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
-		fi
 	fi
 	ebegin "Mounting local filesystems"
 	mount -at "$types" $no_netdev
@@ -36,14 +33,9 @@ start()
 
 stop()
 {
-	yesno $RC_GOINGDOWN || return 0
 	# 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 x= no_umounts_r="/|/dev|/dev/.*|${rc_svcdir}"
-	no_umounts_r="${no_umounts_r}|/bin|/sbin|/lib(32|64)?|/libexec"
+	local x= no_umounts_r="/|/dev|/dev/.*|${RC_SVCDIR}"
+	no_umounts_r="${no_umounts_r}|/bin|/sbin|/lib|/libexec"
 	# RC_NO_UMOUNTS is an env var that can be set by plugins
 	local IFS="$IFS:"
 	for x in $no_umounts $RC_NO_UMOUNTS; do
@@ -52,9 +44,6 @@ stop()
 
 	if [ "$RC_UNAME" = Linux ]; then
 		no_umounts_r="$no_umounts_r|/proc|/proc/.*|/run|/sys|/sys/.*"
-		if [ -e "$rc_svcdir"/usr_premounted ]; then
-			no_umounts_r="$no_umounts_r|/usr"
-		fi
 	fi
 	no_umounts_r="^($no_umounts_r)$"
 
@@ -80,7 +69,7 @@ stop()
 	done
 	[ -n "$fs" ] && fs="^($fs)$"
 	do_unmount umount --skip-point-regex "$no_umounts_r" \
-		"${fs:+--skip-fstype-regex}" $fs --nonetdev
+		${fs:+--skip-fstype-regex} $fs --nonetdev
 	eoutdent
 
 	return 0

init.d/loopback.in

@@ -1,35 +0,0 @@
-#!@SBINDIR@/runscript
-# Copyright (c) 2013 William Hubbs <w.d.hubbs@gmail.com>
-# Released under the 2-clause BSD license.
-
-description="Configures the loopback interface."
-
-depend()
-{
-	keyword -jail -prefix -vserver
-}
-
-start()
-{
-	if [ "$RC_UNAME" = Linux ]; then
-		ebegin "Bringing up network interface lo"
-		if type ip > /dev/null 2>&1; then
-			ip addr add 127.0.0.1/8 dev lo brd + scope host
-			ip route add 127.0.0.0/8 dev lo scope host
-			ip link set lo up
-		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@/runscript
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
@@ -21,7 +21,7 @@ restore()
 			mixer -f "$mixer" \
 			$(cat "/var/db/${mixer#/dev/}-state") >/dev/null
 			veend $?
-			: $(( retval += $? ))
+			: $((retval += $?))
 		fi
 	done
 }
@@ -40,7 +40,7 @@ stop()
 		vebegin "$mixer"
 		mixer -f "$mixer" -s >/var/db/"${mixer#/dev/}"-state
 		veend $?
-		: $(( retval += $? ))
+		: $((retval += $?))
 	done
 	eoutdent
 	eend $retval

init.d/modules.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/runscript
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
@@ -57,7 +57,7 @@ start()
 		[ -z "$args" ] && eval args=\$module_${aa}_args
 		[ -z "$args" ] && eval args=\$module_${xx}_args
 		eval modprobe -q "$mpargs" "$x" "$args"
-		eend $? "Failed to load $x" && : $(( cnt += 1 ))
+		eend $? "Failed to load $x" && cnt=$(($cnt + 1))
 	done
 	einfo "Autoloaded $cnt module(s)"
 }

init.d/mount-ro.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/runscript
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
@@ -7,13 +7,11 @@ description="Re-mount filesytems read-only for a clean reboot."
 depend()
 {
 	need killprocs savecache
-	keyword -openvz -prefix -vserver -lxc
+	keyword -prefix -openvz -vserver -lxc
 }
 
 start()
 {
-	local ret=0
-
 	# Flush all pending disk writes now
 	sync; sync
 
@@ -21,12 +19,8 @@ start()
 	# We need the do_unmount function
 	. "$RC_LIBEXECDIR"/sh/rc-mount.sh
 	eindent
-
-	# Bug 381783
-	local rc_svcdir=$(echo $RC_SVCDIR | sed 's:/lib\(32\|64\)\?/:/lib(32|64)?/:g')
-
-	local m="/dev|/dev/.*|/proc|/proc.*|/sys|/sys/.*|/run|${rc_svcdir}" x= fs=
-	m="$m|/bin|/sbin|/lib(32|64)?|/libexec"
+	local m="/dev|/dev/.*|/proc|/proc.*|/sys|/sys/.*|${RC_SVCDIR}" x= fs=
+	m="$m|/bin|/sbin|/lib|/libexec"
 	# RC_NO_UMOUNTS is an env var that can be set by plugins
 	local IFS="$IFS:"
 	for x in $no_umounts $RC_NO_UMOUNTS; do
@@ -40,10 +34,7 @@ start()
 	[ -n "$fs" ] && fs="^($fs)$"
 	do_unmount "umount -r" \
 		--skip-point-regex "$m" \
-		"${fs:+--skip-fstype-regex}" $fs --nonetdev
-	ret=$?
-
+		${fs:+--skip-fstype-regex} $fs --nonetdev
 	eoutdent
-
-	eend $ret
+	eend $?
 }

init.d/moused.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/runscript
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
@@ -54,7 +54,7 @@ start()
 		local ttyv=
 		for ttyv in /dev/ttyv*; do
 			vidcontrol < "$ttyv" -m on
-			: $(( retval += $? ))
+			: $((retval+= $?))
 		done
 	fi
 

init.d/mtab.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/runscript
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
@@ -12,7 +12,7 @@ depend()
 
 start()
 {
-	if [ -L /etc/mtab ]
+	if [ -l /etc/mtab ]
 	then
 		einfo "Skipping mtab update (mtab is a symbolic link)"
 		return 0
@@ -28,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,733 @@
+#!@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
+	after bootmisc
+	provide net
+	keyword -jail -prefix -vserver
+
+	case "${IFACE}" in
+		lo|lo0);;
+		*) after net.lo net.lo0;;
+	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}
+		fi
+	done
+}
+
+# Support bash arrays - sigh
+_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
+
+	eval _a=\$$1
+	printf "%s" "${_a}"
+	printf "\n"
+	[ -n "${_a}" ]
+}
+
+# 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
+
+	eval _a=\$$1
+	printf "%s" "${_a}"
+	printf "\n"
+	[ -n "${_a}" ]
+}
+
+_wait_for_carrier()
+{
+	local timeout= efunc=einfon
+
+	_has_carrier  && return 0
+
+	eval timeout=\$carrier_timeout_${IFVAR}
+	timeout=${timeout:-${carrier_timeout:-5}}
+
+	# Incase users don't want this nice feature ...
+	[ ${timeout} -le 0 ] && return 0
+
+	yesno ${RC_PARALLEL} && efunc=einfo
+	${efunc} "Waiting for carrier (${timeout} seconds) "
+	while [ ${timeout} -gt 0 ]; do
+		sleep 1
+		if _has_carrier; then
+			[ "${efunc}" = "einfon" ] && echo
+			eend 0
+			return 0
+		fi
+		timeout=$((${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} != "0" ]; do
+			len=$((${len} + ${i} % 2))
+			i=$((${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
+}
+
+_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=$((${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=$((${i} + 1))
+		eval mod=\$module_${i}
+		[ -z "${mod}" ] && break
+		[ -e "${MODULESDIR}/${mod}.sh" ] || continue
+
+		eval set -- \$module_${i}_program
+		if [ -n "$1" ]; then
+			x=
+			for x; do
+				[ -x "${x}" ] && break
+			done
+			[ -x "${x}" ] || continue
+		fi
+		if ${starting}; then
+			eval set -- \$module_${i}_program_start
+		else
+			eval set -- \$module_${i}_program_stop
+		fi
+		if [ -n "$1" ]; then
+			x=
+			for x; do
+				case "${x}" in
+					/*) [ -x "${x}" ] && break;;
+					*) type "${x}" >/dev/null 2>&1 && break;;
+				esac
+				unset x
+			done
+			[ -n "${x}" ] || continue
+		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
+	if [ $# = 1 ]; then
+		unset IFS
+		set -- ${config}
+		# Of course, we may have a single address added old style.
+		case "$2" in
+			netmask|broadcast|brd|brd+|peer|pointopoint)
+				local IFS="$__IFS"
+				set -- ${config}
+				;;
+		esac
+	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=$((${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=$((${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
+
+	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
+		_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=$((${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=$((${config_index} - 1))
+			fi
+		fi
+		eoutdent
+		config_index=$((${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,27 +1,63 @@
-#!@SBINDIR@/runscript
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
-description="Mounts network shares, other than NFS, according to /etc/fstab."
-# We skip all NFS shares in this script because they require extra
-# daemons to be running on the client in order to work correctly.
-# It is best to allow nfs-utils to handle all nfs shares.
+description="Mounts network shares according to /etc/fstab."
+
+need_portmap()
+{
+	local opts=
+	local IFS="
+"
+	set -- $(fstabinfo --options --fstype nfs,nfs4)
+	for opts; do
+		case ,$opts, in
+			*,noauto,*|*,nolock,*);;
+			*) return 0;;
+		esac
+	done
+	return 1
+}
 
 depend()
 {
+	# Only have portmap as a dependency if there is a nfs mount in fstab
+	# that is set to mount at boot
+	local pmap=
+	if need_portmap; then
+		pmap="rpc.statd"
+		[ -x @SYSCONFDIR@/init.d/rpcbind ] \
+			&& pmap="$pmap rpcbind" \
+			|| pmap="$pmap portmap"
+	fi
+
 	config /etc/fstab
+	need net $pmap
 	use afc-client amd autofs openvpn
-	use dns
-	keyword -jail -prefix -vserver -lxc
+	use dns nfs nfsmount portmap rpcbind rpc.statd rpc.lockd
+	keyword -jail -prefix -vserver
 }
 
 start()
 {
+	local myneed= myuse= pmap="portmap" nfsmounts=
+	[ -x @SYSCONFDIR@/init.d/rpcbind ] && pmap="rpcbind"
+
 	local x= fs= rc=
 	for x in $net_fs_list $extra_net_fs_list; do
 		case "$x" in
 			nfs|nfs4)
-			continue
+			# If the nfsmount script took care of the nfs
+			# filesystems, then there's no point in trying
+			# them twice
+			service_started nfsmount && continue
+
+			# Only try to mount NFS filesystems if portmap was
+			# started. This is to fix "hang" problems for new
+			# users who do not add portmap to the default runlevel.
+			if need_portmap && ! service_started "$pmap"; then
+				continue
+			fi
 			;;
 		esac
 		fs="$fs${fs:+,}$x"
@@ -46,14 +82,7 @@ stop()
 	. "$RC_LIBEXECDIR"/sh/rc-mount.sh
 
 	for x in $net_fs_list $extra_net_fs_list; do
-		case "$x" in
-			nfs|nfs4)
-				continue
-				;;
-			*)
-				fs="$fs${fs:+,}$x"
-				;;
-		esac
+		fs="$fs${fs:+,}$x"
 	done
 	if [ -n "$fs" ]; then
 		umount -at $fs || eerror "Failed to simply unmount filesystems"
@@ -62,14 +91,7 @@ stop()
 	eindent
 	fs=
 	for x in $net_fs_list $extra_net_fs_list; do
-		case "$x" in
-			nfs|nfs4)
-				continue
-				;;
-			*)
-				fs="$fs${fs:+|}$x"
-				;;
-		esac
+		fs="$fs${fs:+|}$x"
 	done
 	[ -n "$fs" ] && fs="^($fs)$"
 	do_unmount umount ${fs:+--fstype-regex} $fs --netdev

init.d/network.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/runscript
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
@@ -12,9 +12,7 @@ depend()
 {
 	need localmount
 	after bootmisc
-	if [ -n "$(interfaces)" ]; then
-		provide net
-	fi
+	provide net
 	keyword -jail -prefix -vserver
 }
 
@@ -223,6 +221,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=
@@ -274,7 +281,7 @@ start()
 		tentative || break
 		[ $r = 5 ] && vebegin "Waiting for tentative addresses"
 		sleep 1
-		: $(( r -= 1 ))
+		r=$(($r - 1))
 	done
 	if [ $r != 5 ]; then
 		[ $r != 0 ]
@@ -314,17 +321,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@/runscript
+#!@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@/runscript
+#!@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@/runscript
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
@@ -21,7 +21,7 @@ _setleds()
 
 	while [ $i -le $ttyn ]; do
 		setleds -D "$1"num < $dev$i || retval=1
-		: $(( i += 1 ))
+		i=$(($i + 1))
 	done
 
 	return $retval

init.d/pf.in

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