Remove prefix support

I spoke with the prefix team sometime back and was told that they do not
have an interest in using OpenRC on prefix systems.

.gitignore

@@ -1 +1,16 @@
 *.bz2
+
+*.diff
+*.patch
+*.orig
+*.rej
+
+core
+.gdb_history
+.gdbinit
+
+.depend
+*.a
+*.o
+*.So
+lib*.so

FEATURE-REMOVAL-SCHEDULE

@@ -0,0 +1,49 @@
+The following is a list of files and features that are going to be removed in
+the source tree.  Every entry should contain what exactly is going away, why it
+is happening, and who is going to be doing the work.  When the feature is
+removed, it should also be removed from this file.
+
+---------------------------
+
+What: oldnet ADSL rp-pppoe mode
+
+When: undecided
+
+Why: Replaced by the oldnet PPP module
+
+Who:  Robin H. Johnson <robbat2@gentoo.org>
+
+---------------------------
+
+What: oldnet /etc/conf.d/wireless
+
+When: undecided
+
+Why: All configuration moved to /etc/conf.d/net
+
+Who:  Robin H. Johnson <robbat2@gentoo.org>
+
+---------------------------
+
+What: Service pause action
+
+When: Removed already, compatbility warning in place.
+
+Why: ...
+
+Who:
+
+---------------------------
+
+What: Service --startas, --chuid , --oknodo
+
+When: undecided
+
+Why: Obsolete or replaced by other options.
+	 --startas => use --name or --exec
+	 --chuid => use --user
+	 --oknodo => ignore return code instead
+
+Who:
+
+---------------------------

Makefile

@@ -1,26 +1,16 @@
 # OpenRC Makefile
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 include Makefile.inc
 
-SUBDIR=		conf.d etc init.d man scripts sh src
+SUBDIR=		conf.d doc etc init.d local.d sysctl.d man net scripts sh src
-
-# Build our old net foo or not
-_OLDNET_SH=	case "${MKOLDNET}" in \
-		[Yy][Ee][Ss]) echo "net doc";; \
-		*) echo "";; \
-		esac
-_OLDNET!=	${_OLDNET_SH}
-SUBDIR+=	${_OLDNET}$(shell ${_OLDNET_SH})
 
 # Build pkgconfig or not
-_PKGCONFIG_SH=	case "${MKPKGCONFIG}" in \
+MKPKGCONFIG?=	yes
-		[Yy][Ee][Ss]|"") echo "pkgconfig";; \
+ifeq (${MKPKGCONFIG},yes)
-		*) echo "";; \
+SUBDIR+=	pkgconfig
-		esac
+endif
-_PKGCONFIG!=	${_PKGCONFIG_SH}
-SUBDIR+=	${_PKGCONFIG}$(shell ${_PKGCONFIG_SH})
 
 # We need to ensure that runlevels is done last
 SUBDIR+=	runlevels

Makefile.inc

@@ -1,3 +1,3 @@
 NAME=		openrc
-VERSION=	0.6.3
+VERSION=	0.9.9
 PKG=		${NAME}-${VERSION}

README

@@ -4,7 +4,7 @@ OpenRC README
 Installation
 ------------
 make install
-Yup, that simple. Works with GNU make and BSD make.
+Yup, that simple. Works with GNU make.
 
 You may wish to tweak the installation with the below arguments
 PROGLDFLAGS=-static
@@ -12,9 +12,10 @@ LIBNAME=lib64
 DESTDIR=/tmp/openrc-image
 MKPAM=pam
 MKPKGCONFIG=no
+MKSELINUX=yes
+MKSTATICLIBS=no
 MKTERMCAP=ncurses
 MKTERMCAP=termcap
-MKOLDNET=yes
 PKG_PREFIX=/usr/pkg
 LOCAL_PREFIX=/usr/local
 PREFIX=/usr/local
@@ -53,13 +54,12 @@ of the system.
 
 
 Reporting Bugs
--------------
+--------------
-If you installed OpenRC from your chosen distribution, you should report
+Since Gentoo Linux is hosting OpenRC development, Bugs should go to
-bugs directly to them. For example, if you use Gentoo and emerged OpenRC
+the Gentoo Bugzilla:
-then you should reports bugs to http://bugs.gentoo.org.
+	http://bugs.gentoo.org/
-
+They should be filed under the "Gentoo Hosted Projects" product and
-Otherwise, you can report them directly to me at
+the "openrc" component.
-http://roy.marples.name/projects/openrc
 
 
 History - by Roy Marples

README.net

@@ -1,36 +0,0 @@
-OpenRC Network Ideals
----------------------
-
-The new style networking for OpenRC is very simplistic - provide a basic means
-of configuring static interface address and routes whilst allowing the
-possibility to run any command at any point.
-
-In a nutshell, init.d/network is a wrapper around ifconfig(8) and
-init.d/staticroute is wrapper around route(8).
-
-In the Perfect World (TM) ifconfig should be able to configure everything
-about the interface easily * . The BSD family almost get this right and Linux
-epically fails.
-
-* Only static configuration, including link setup.
-For dynamic, static, IPv4LL, arping and per ssid IPv4 setup dhcpcd-5.x
-provides your needs.
-
-It fails because there are many tools to do the same job and often have
-vastly different syntax where they could be similar. In other words, there
-is no coherence.
-
-OpenRC-0.4.x and older (inc Gentoo baselayout-1) had a collection of scripts
-for each tool and allowed a script per interface. Over the years, this design
-has proven very hard to maintain as each user has their own idea of how
-things should work. Also, there were (and still are) race conditions.
-
-So where do we go from here?
-Well, it's possible to use the new network scripts using the tools
-currently available. It's just harder as you have to know them and their
-documentation can be lacking at times.
-The correct end goal is a BSD style ifconfig tool.
-I've started work on it, but the project has stalled somewhat.
-It's display only right now and the source is not yet publicly available.
-If you have the skills and share the vision then contact me privately and
-we'll take it from there.

STYLE

@@ -0,0 +1,85 @@
+This is the openrc style manual.  It governs the coding style of all code
+in this repository.  Follow it.  Contact openrc@gentoo.org for any questions
+or fixes you might notice.
+
+##########
+# C CODE #
+##########
+
+The BSD Kernel Normal Form (KNF) style is used:
+	http://en.wikipedia.org/wiki/Indent_style#BSD_KNF_style
+Basically, it's like K&R/LKML, but wrapped lines that are indented use 4 spaces.
+
+Highlights:
+	- no trailing whitespace
+	- indented code use tabs (not line wrapped)
+	- cuddle the braces (except for functions)
+	- space after native statements and before paren (for/if/while/...)
+	- no space between function and paren
+	- pointer asterisk cuddles the variable, not the type
+
+void foo(int c)
+{
+	int ret = 0;
+
+	if (c > 1000)
+		return;
+
+	while (c--) {
+		bar(c);
+		ret++;
+	}
+
+	return ret;
+}
+
+##################
+# COMMIT MESSAGES #
+##################
+
+The following is an example of a correctly formatted git commit message
+for this repository. Most of this information came from this blog post
+[1], so I would like to thank the author.
+
+### cut here ###
+Capitalized, short (50 chars or less) summary
+
+More detailed explanatory text, if necessary.  Wrap it to about 72
+characters or so.  In some contexts, the first line is treated as the
+subject of an email and the rest of the text as the body.  The blank
+line separating the summary from the body is critical (unless you omit
+the body entirely); tools like rebase can get confused if you run the
+two together.
+
+Write your commit message in the present tense: "Fix bug" and not "Fixed
+bug."  This convention matches up with commit messages generated by
+commands like git merge and git revert.
+
+Further paragraphs come after blank lines.
+
+- Bullet points are okay, too
+
+- Typically a hyphen or asterisk is used for the bullet, preceded by a
+  single space, with blank lines in between, but conventions vary here
+
+- Use a hanging indent
+
+Reported-by: User Name <email>
+X-[Distro]-Bug: BugID
+X-[Distro]-Bug-URL: URL for the bug (on the distribution's web site typically)
+### cut here ###
+
+If you did not write the code and the patch does not include authorship
+information in a format git can use, please use the --author option of the
+git commit command to make the authorship correct.
+
+The Reported-by tag is required if the person who reported the bug is
+different from the author and committer.
+
+  The X-[Distro]-Bug/Bug-URL tags are required if this commit is related
+  to a bug reported to us by a specific distribution   of linux or a
+  *BSD. Also, [Distro] should be replaced with the name of the
+  distribution, e.g. X-Gentoo-Bug.
+
+[1] http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
+

TODO

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

conf.d/Makefile

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

conf.d/Makefile.FreeBSD

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

conf.d/Makefile.Linux

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

conf.d/Makefile.NetBSD

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

@@ -3,7 +3,7 @@
 # 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" as root).
+# 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/fsck

@@ -13,6 +13,13 @@
 #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,13 +1,17 @@
 # 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 
+# 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 
+# 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 system time to the current hardware clock
-# (software clock) during shutdown, then say "YES" here.
+# during bootup, then say "YES" here. You do not need this if you are
-# You normally don't need to do this if you run a ntp daemon.
+# running a modern kernel with CONFIG_RTC_HCTOSYS set to y.
-clock_systohc="NO"
+#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 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.

conf.d/keymaps

@@ -1,16 +1,18 @@
-# Use KEYMAP to specify the default console keymap.  There is a complete tree
+# Use keymap to specify the default console keymap.  There is a complete tree
 # of keymaps in /usr/share/keymaps to choose from.
 keymap="us"
 
 # Should we first load the 'windowkeys' console keymap?  Most x86 users will
 # say "yes" here.  Note that non-x86 users should leave it as "no".
+# Loading this keymap will enable VT switching (like ALT+Left/Right)
+# using the special windows keys on the linux console.
 windowkeys="NO"
 
 # The maps to load for extended keyboards.  Most users will leave this as is.
 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/killprocs

@@ -0,0 +1,3 @@
+# If you wish to pass any options to killall5 during shutdown,
+# you should do so here.
+killall5_opts=""

conf.d/local

@@ -1,18 +0,0 @@
-# Here is where you can put anything you need to start
-# that there is not an init script for.
-
-local_start() {
-	# This is a good place to load any misc programs
-	# on startup (use &>/dev/null to hide output)
-
-	# We should always return 0
-	return 0
-}
-
-local_stop() {
-	# This is a good place to unload any misc.
-	# programs you started above.
-	
-	# We should always return 0
-	return 0
-}

conf.d/modules

@@ -1,8 +1,10 @@
 # You can define a list modules for a specific kernel version,
 # a released kernel version, a main kernel version or just a list.
+# The most specific versioned variable will take precedence.
 #modules_2_6_23_gentoo_r5="ieee1394 ohci1394"
 #modules_2_6_23="tun ieee1394"
 #modules_2_6="tun"
+#modules_2="ipv6"
 #modules="ohci1394"
 
 # You can give modules a different name when they load - the new name
@@ -10,10 +12,12 @@
 #modules="dummy:dummy1"
 
 # Give the modules some arguments if needed, per version if necessary.
+# Again, the most specific versioned variable will take precedence.
 #module_ieee1394_args="debug"
-#module_ieee1394_args_2_6_23_gentoo_r5="ieee1394 ohci1394"
+#module_ieee1394_args_2_6_23_gentoo_r5="debug2"
-#module_ieee1394_args_2_6_23="tun ieee1394"
+#module_ieee1394_args_2_6_23="debug3"
-#module_ieee1394_args_2_6="tun"
+#module_ieee1394_args_2_6="debug4"
+#module_ieee1394_args_2="debug5"
 
 # You should consult your kernel documentation and configuration
 # for a list of modules and their options.

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

@@ -1,4 +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
+# please review /usr/share/doc/openrc*/net.example* and save your configuration
 # in /etc/conf.d/net (this file :]!).

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/run/random-seed"
+urandom_seed="/var/lib/misc/random-seed"

doc/Makefile

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

doc/Makefile.FreeBSD

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

doc/Makefile.Linux

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

doc/Makefile.NetBSD

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

doc/net.example.BSD.in

@@ -23,7 +23,7 @@
 # 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.
@@ -67,10 +67,12 @@
 # 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_route_eth0="default via 192.168.0.1"
+#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"
@@ -212,7 +214,7 @@
 # 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 
+# "forceany" does the same as forcepreferred + connects to any other
 # available AP
 # Default is "any"
 #associate_order="any"
@@ -266,13 +268,13 @@
 # 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 
+# you have installed wpa_supplicant, you need to disable wpa_supplicant
 #modules="!iwconfig !wpa_supplicant"
 #or
 #modules="!wireless"
 
 ##############################################################################
-# WIRELESS SSID IN VARIABLES 
+# WIRELESS SSID IN VARIABLES
 ##############################################################################
 # Remember to change SSID to your SSID.
 # Say that your SSID is My NET - the line
@@ -368,7 +370,7 @@
 
 ##############################################################################
 # 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
@@ -386,6 +388,17 @@
 #
 # ${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

doc/net.example.Linux.in

@@ -24,7 +24,7 @@
 # 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.
@@ -49,7 +49,7 @@
 
 ##############################################################################
 # INTERFACE HANDLERS
-# 
+#
 # We provide two interface handlers presently: ifconfig and iproute2.
 # You need one of these to do any kind of network configuration.
 # For ifconfig support, emerge sys-apps/net-tools
@@ -68,6 +68,7 @@
 # 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
+# WARNING: You cannot mix multiple addresses on a line with other parameters!
 #config_eth0="192.168.0.2/24 192.168.0.3/24 192.168.0.4/24"
 # However, that only works with CIDR addresses, so you can't use netmask.
 
@@ -85,6 +86,14 @@
 # If you don't want ANY address (only useful when calling for advanced stuff)
 #config_eth0="null"
 
+# If you need to pass parameters to go with an address, you can do so on the
+# same line as the address. You should split multiple addresses with newlines.
+# WARNING: You cannot mix multiple addresses on a line with other parameters!
+#config_eth0="192.168.0.2/24 scope host"
+#config_eth0="4321:0:1:2:3:4:567:89ab/64 nodad home preferred_lft 0"
+#config_eth0="192.168.0.2/24 scope host
+#4321:0:1:2:3:4:567:89ab/64 nodad home preferred_lft 0"
+
 # 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
@@ -94,10 +103,12 @@
 # If a specified module fails (like dhcp - see below), you can specify a
 # fallback like so
 #fallback_eth0="192.168.0.2/24"
-#fallback_route_eth0="default via 192.168.0.1"
+#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"
@@ -297,7 +308,7 @@
 # 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" 
+#preferred_aps="SSID1 SSID2"
 
 # You can also define a preferred_aps list per interface
 #preferred_aps_eth0="SSID3 SSID4"
@@ -348,7 +359,7 @@
 # By default we don't wait for wpa_supplicant to associate and authenticate.
 # If you need to change this behaviour then you don't know how our scripts work
 # and setting this value could cause strange things to happen.
-# If you would like to, so can specify how long in seconds.
+# If you would like it to wait, you can specify how long in seconds.
 #associate_timeout_eth0=60
 # A value of 0 means wait forever.
 
@@ -371,13 +382,13 @@
 # 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 
+# you have installed wpa_supplicant, you need to disable wpa_supplicant
 #modules="!iwconfig !wpa_supplicant"
 #or
 #modules="!wireless"
 
 ##############################################################################
-# WIRELESS SSID IN VARIABLES 
+# WIRELESS SSID IN VARIABLES
 ##############################################################################
 # Remember to change SSID to your SSID.
 # Say that your SSID is My NET - the line
@@ -412,7 +423,7 @@
 # dhclient: emerge net-misc/dhcp
 # dhcpcd:   emerge net-misc/dhcpcd
 # pump:     emerge net-misc/pump
-# udhcpc:   emerge net-misc/udhcp
+# udhcpc:   emerge sys-apps/busybox
 
 # If you have more than one DHCP client installed, you need to specify which
 # one to use - otherwise we default to dhcpcd if available.
@@ -421,7 +432,7 @@
 # Notes:
 # - All clients send the current hostname to the DHCP server by default
 # - dhcpcd does not daemonize when the lease time is infinite
-# - udhcp-0.9.3-r3 and earlier do not support getting NTP servers 
+# - udhcp-0.9.3-r3 and earlier do not support getting NTP servers
 # - pump does not support getting NIS servers
 # - DHCP tends to erase any existing device information - so add
 #   static addresses after dhcp if you need them
@@ -467,7 +478,7 @@
 #fallback_eth0="apipa"
 
 #-----------------------------------------------------------------------------
-# ARPING Gateway configuration 
+# ARPING Gateway configuration
 # and
 # Automatic Private IP Addressing (APIPA)
 # For arpingnet / apipa support, emerge net-misc/iputils or net-analyzer/arping
@@ -527,7 +538,8 @@
 
 #-----------------------------------------------------------------------------
 # VLAN (802.1q support)
-# For VLAN support, emerge net-misc/vconfig
+# For VLAN support, emerge sys-apps/iproute2
+# The old vconfig based VLAN support is no longer available.
 
 # Specify the VLAN numbers for the interface like so
 # Please ensure your VLAN IDs are NOT zero-padded
@@ -537,10 +549,27 @@
 # need it up.
 #config_eth0="null"
 
-# You can also configure the VLAN - see for vconfig man page for more details
+# You can also configure the VLAN - see for ip man page for more details
-#vconfig_eth0="set_name_type VLAN_PLUS_VID_NO_PAD"
+# To change the vlan interface name. If not set, the standard "iface.vlanid"
-#vconfig_vlan1="set_flag 1
+# will be used. This is the replacement for the old 'vconfig set_name_type'
-#set_egress_map 2 6"
+# functionality.
+#vlan1_name="vlan1"
+#vlan2_name="eth0.2"
+
+# The following shows the old set_name_type setting and what new option to set:
+# Using eth9 & VLAN VID 26 as an example.
+# VLAN_PLUS_VID         vlan26_name="vlan0026"
+# VLAN_PLUS_VID_NO_PAD  vlan26_name="vlan26"
+# DEV_PLUS_VID          vlan26_name="eth9.0026"
+# DEV_PLUS_VID_NO_PAD   vlan26_name="eth9.26"
+
+# Set the vlan flags
+#vlan1_flags="reorder_hdr off gvrp on loose_binding on"
+
+# Configure in/egress maps
+#vlan1_ingress="2:6 3:5"
+#vlan1_egress="1:2"
+
 #config_vlan1="172.16.3.1/23"
 #config_vlan2="172.16.2.1/23"
 
@@ -553,15 +582,31 @@
 # This means you do not need to create init scripts in /etc/init.d for each
 # vlan, you must need to create one for the physical interface.
 # If you wish to control the configuration of each vlan through a separate
-# script, or wish to rename the vlan interface to something that vconfig
+# script then you need to do this.
-# cannot then you need to do this.
 #vlan_start_eth0="no"
 
 # If you do the above then you may want to depend on eth0 like so
-# rc_need_vlan1="net.eth0"
+# rc_net_vlan1_need="net.eth0"
 # NOTE: depend functions only work in /etc/conf.d/net
 # and not in profile configs such as /etc/conf.d/net.foo
 
+# Also, you might want to make eth0 not provide net in this case so that
+# dependent services will start when the vlan is active instead of the
+# physical interface.
+# rc_net_eth0_provide="!net"
+
+# MAC-VLAN support
+# The following configuration can be used to create a new interface 'macvlan0'
+# linked to 'eth0'
+#macvlan_macvlan0="eth0"
+
+# MAC-VLAN mode (private, vepa, bridge, passtru)
+#mode_macvlan0="private"
+
+# IP address, MAC address, ... are configured as a normal interface
+#config_macvlan0="192.168.20.20/24"
+#mac_macvlan0="00:50:06:20:20:20"
+
 #-----------------------------------------------------------------------------
 # Bonding
 # For link bonding/trunking on 2.4 kernels, or kernels without sysfs
@@ -578,11 +623,11 @@
 
 # If any of the slaves require extra configuration - for example wireless or
 # ppp devices - we need to depend function on the bonded interfaces
-#rc_need_bond0="net.eth0 net.eth1"
+#rc_net_bond0_need="net.eth0 net.eth1"
 
 
 #-----------------------------------------------------------------------------
-# Classical IP over ATM 
+# Classical IP over ATM
 # For CLIP support emerge net-dialup/linux-atm
 
 # Ensure that you have /etc/atmsigd.conf setup correctly
@@ -620,7 +665,7 @@
 #
 # Here you should specify what pppd plugins you want to use
 # Available plugins are: pppoe, pppoa, capi, dhcpc, minconn, radius,
-#			 radattr, radrealms and winbind 
+#			 radattr, radrealms and winbind
 #plugins_ppp0="pppoe"			# Required plugin for PPPoE
 #plugins_ppp0="pppoa vc-encaps"		# Required plugin for PPPoA with an option
 #plugins_ppp0="capi"			# Required plugin for ISDN
@@ -660,7 +705,7 @@
 #	lcp-echo-interval 15	# Send a LCP echo every 15 seconds
 #	lcp-echo-failure 3	# Make peer dead after 3 consecutive
 #				# echo-requests
-#	
+#
 # Compression options - use these to completely disable compression
 #	noaccomp noccp nobsdcomp nodeflate nopcomp novj novjccomp
 #
@@ -695,7 +740,7 @@
 # If the link require extra configuration - for example wireless or
 # RFC 268 bridge - we need to depend on the bridge so they get
 # configured correctly.
-#rc_need_ppp0="net.nas0"
+#rc_net_ppp0_need="net.nas0"
 
 #WARNING: if MTU of the PPP interface is less than 1500 and you use this
 #machine as a router, you should add the following rule to your firewall
@@ -759,7 +804,7 @@
 
 #-----------------------------------------------------------------------------
 # TUN/TAP
-# For TUN/TAP support emerge net-misc/openvpn or sys-apps/usermode-utilities
+# For TUN/TAP support install iproute2, openvpn or usermode-utilities
 #
 # You must specify if we're a tun or tap device. Then you can give it any
 # name you like - such as vpn
@@ -770,6 +815,9 @@
 #tuntap_tap0="tap"
 #config_tap0="192.168.0.1/24"
 
+# Use something like this to pass custom options to iproute2 during
+# tunnel creation. This sets the user and group ownership of the node.
+#iproute2_tun1="user foo group bar"
 # For passing custom options to tunctl use something like the following.  This
 # example sets the owner to adm
 #tunctl_tun1="-u adm"
@@ -787,26 +835,40 @@
 #bridge_add_eth0="br0"
 #bridge_add_eth1="br0"
 
-# You need to configure the ports to null values so dhcp does not get started 
+# NOTE: If you want to manually start an empty bridge, and then dynamically add
+# ports to it you must set at least one of the following variables based on the
+# interface name, so that we can pick it up from your configuration. Even an
+# empty value variable is fine, but at least one of them must be set:
+# brctl_IFVAR
+
+# You need to configure the ports to null values so dhcp does not get started
 #config_eth0="null"
 #config_eth1="null"
 
-# Finally give the bridge an address - dhcp or a static IP
+# Finally give the bridge an address - dhcp or a static IP, this is assigned to
+# the bridge when the bridge is explicitly started.
 #config_br0="dhcp" # may not work when adding ports dynamically
 #config_br0="192.168.0.1/24"
 
 # If any of the ports require extra configuration - for example wireless or
 # ppp devices - we need to depend on them like so.
-#rc_need_br0="net.eth0 net.eth1"
+#rc_net_br0_need="net.eth0 net.eth1"
 
 # Below is an example of configuring the bridge
 # Consult "man brctl" for more details
-#brctl_br0="setfd 0
+#brctl_br0="setfd 15
-#sethello 0
+#sethello 2
-#stp off"
+#stp on"
+
+# You can also configure the bridge or bridge members via sysfs on 2.6 kernels
+# or newer. See the kernel bridge documentation for a description of these
+# options.
+#stp_state_br0="0"
+#forward_delay_br0="10"
+#hairpin_mode_eth0="1"
 
 #-----------------------------------------------------------------------------
-# RFC 2684 Bridge Support 
+# RFC 2684 Bridge Support
 # For RFC 2684 bridge support emerge net-misc/br2684ctl
 
 # Interface names have to be of the form nas0, nas1, nas2, etc.
@@ -841,7 +903,7 @@
 # link_6to4="eth0"		# Interface to base its addresses on
 # config_6to4="ip6to4"
 # You may want to depend on eth0 like so
-#rc_need_6to4="net.eth0"
+#rc_net_6to4_need="net.eth0"
 # To ensure that eth0 is configured before 6to4. Of course, the tunnel could be
 # any name and this also works for any configured interface.
 # NOTE: If you're not using iproute2 then your 6to4 tunnel has to be called
@@ -852,6 +914,59 @@
 #relay_6to4="192.168.3.2"
 #suffix_6to4=":ff"
 
+#-----------------------------------------------------------------------------
+# Advanced Routing
+# WARNING: For advanced routing you MUST be using sys-apps/iproute2
+#
+# This provides a means to do multi-homing and more using the Routing Policy
+# Database (RPDB).
+#
+# See the following links for background and more information.
+# http://linux-ip.net/html/ch-routing.html
+# http://linux-ip.net/html/ch-advanced-routing.html
+
+# The rules listed will be added with 'ip rule add LINE' when the interface is
+# being brought up. They will also be removed with 'ip rule delete LINE'.
+# The rules added are also stored for later removal, so if you alter your rules
+# directly before stopping, you should review your rules again after stopping.
+
+# Note in earlier versions of openrc, this was provided as an example in
+# postup/postdown, however that implementation suffered some bugs in corner
+# cases, which are now fixed with this merger. If you used the previous
+# example, you should only need to drop the relevent portions of your
+# postup/postdown functions, and review the quoting in your rules_IFACE
+# variables.
+
+# Below is a trivial example for a dual-homed connection where there is an OOB
+# management network. Only packets explicitly with an address from or to the
+# OOB are sent via eth0. All others go via eth1 as the eth1 rules have a lower
+# priority.
+
+# If you want to use names for your tables, you should put lines into
+# /etc/iproute2/rt_tables, an example follows:
+# 2 oob
+# 3 external
+#
+# IPv6 RPDB entries are to be found in the rules6_IFVAR variables:
+
+#rules_eth0="
+#from ZZZ.ZZZ.200.128/27 table oob priority 500
+#to ZZZ.ZZZ.200.128/27 table oob priority 550"
+#rules_eth1="
+#from XXX.XXX.112.0/24 table external priority 400
+#to XXX.XXX.112.0/24 table external priority 450"
+#routes_eth0="
+#ZZZ.ZZZ.200.128/27 dev eth0 table oob scope link
+#default via ZZZ.ZZZ.200.129 table oob"
+#routes_eth1="
+#XXX.XXX.112.0/24 dev eth1 table external scope link
+#default via XXX.XXX.112.1 dev eth1"
+
+# IPv6 example:
+#rules6_eth0="
+#from 2001:0DB8:AAAA:BBBB::/64 table vpn priority 100
+#to 2001:0DB8:AAAA:BBBB::/64 table vpn priority 150"
+
 
 #-----------------------------------------------------------------------------
 # System
@@ -896,10 +1011,12 @@
 # and you're done :)
 
 # By default we don't wait for netplug/ifplugd to configure the interface.
-# If you would like it to wait so that other services know that network is up
+# If you would like it to wait so that other services know that network is
-# then you can specify a timeout here.
+# up then you can specify a timeout here. A value of 0 means wait forever,
+# and a negative value means never wait.
+#plug_timeout_eth0="10"
+# If you want to set it for all interfaces:
 #plug_timeout="10"
-# A value of 0 means wait forever.
 
 # If you don't want to use netplug on a specific interface but you have it
 # installed, you can disable it for that interface via the modules statement
@@ -913,9 +1030,75 @@
 #ifplugd_eth0="--api-mode=wlan"
 # man ifplugd for more options
 
+#-----------------------------------------------------------------------------
+# Interface hardware tuning & configuration via ethtool
+# If you need to change explicit hardware settings on your network card prior
+# to bringing the interface up, the following is available.
+#
+# For a full listing of settings, please consulting ethtool(8) and the output
+# of "ethtool --help".
+#
+# Multiple entries (seperated by newlines) are supported in all of the
+# variables as some settings cannot be changed at the same time.
+#
+# Valid variable name fragments: change pause coalesce ring offload
+# change_eeprom identify nfc flash rxfh_indir ntuple
+
+# Set Wake-On-Lan to listen for SecureOn MagicPacket(tm), the message level to
+# notify us of WOL changes, and the SecureOn password to 'DE:AD:BE:EF:CA:FE'.
+#ethtool_change_eth0="wol gs
+#msglvl wol on
+#sopass DE:AD:BE:EF:CA:FE"
+
+# Disable pause auto-negotiation and explicitly enable RX and TX pause.
+#ethtool_pause_eth0="autoneg off
+#rx on tx on"
+
+# Enasble adaptive RX and TX coalescing
+#ethtool_coalesce_eth0="adaptive-rx on adaptive-tx on"
+
+# Change ring buffer settings
+#ethtool_ring_eth0=""
+
+# Enable all offload settings
+#ethtool_offload_eth0="rx on tx on sg on tso on ufo on gso on gro on lro on"
+
+# Change specific bytes in the EEPROM
+#ethtool_change_eeprom_eth0=""
+
+# Run the identify sequence on the interface for 1 second (does not return until completion)
+#ethtool_identify_eth0="1"
+
+# Configure receive network flow classification
+#ethtool_nfc_eth0="
+#rx-flow-hash tcp4 f
+#rx-flow-hash udp4 s"
+
+# Flash firmware to all regions
+#ethtool_flash_eth0="/some/path/firmware1 0"
+
+# Flash firmware to region 1
+#ethtool_flash_eth0="/some/path/firmware2 1"
+
+# Set receive flow hash indirection table for even balancing between N receive queues
+#ethtool_rxfh_indir_eth0="equal 4"
+
+# Configure Rx ntuple filters and actions
+#ethtool_ntuple_eth0=""
+
+# Additionally, there is a special control variable, if you need to change the
+# order of option processing. The default order is:
+# flash change-eeprom change pause coalesce ring offload identify nfc rxfh-indir ntuple
+
+# Set global order to default
+#ethtool_order="flash change-eeprom change pause coalesce ring offload identify nfc rxfh-indir ntuple"
+
+# Hypothetical network card that requires a change-eeprom toggle to enable flashing
+#ethtool_order_eth0="change-eeprom flash change pause coalesce ring offload nfc rxfh-indir ntuple"
+
 ##############################################################################
 # 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
@@ -933,6 +1116,17 @@
 #
 # ${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() {
 #	# Test for link on the interface prior to bringing it up.  This
@@ -941,7 +1135,7 @@
 #	if mii-tool "${IFACE}" 2> /dev/null | grep -q 'no link'; then
 #		ewarn "No link on ${IFACE}, aborting configuration"
 #		return 1
-#	fi 
+#	fi
 #
 #	# Test for link on the interface prior to bringing it up.  This
 #	# only works on some network adapters and requires the ethtool
@@ -980,33 +1174,6 @@
 #	# 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.
-
-#	# Here is an example that allows the use of iproute rules
-#	# which have been configured using the rules_eth0 variable.
-#	#rules_eth0=" \
-#	#	'from 24.80.102.112/32 to 192.168.1.0/24 table localnet priority 100' \
-#	#	'from 216.113.223.51/32 to 192.168.1.0/24 table localnet priority 100' \
-#	#"
-#	eval set -- \$rules_${IFVAR}
-#	if [ $# != 0 ]; then
-#		einfo "Adding IP policy routing rules"
-#		eindent
-#		# Ensure that the kernel supports policy routing
-#		if ! ip rule list | grep -q "^"; then
-#			eerror "You need to enable IP Policy Routing (CONFIG_IP_MULTIPLE_TABLES)"
-#			eerror "in your kernel to use ip rules"
-#		else
-#			for x; do
-#				ebegin "${x}"
-#				ip rule add ${x}
-#				eend $?
-#			done
-#		fi
-#		eoutdent
-#		# Flush the cache
-#		ip route flush cache dev "${IFACE}"
-#	fi
-
 #}
 
 #postdown() {
@@ -1014,21 +1181,6 @@
 #	# Probably a good idea to set ifdown="no" in /etc/conf.d/net
 #	# as well ;)
 #	[ "${IFACE}" != "lo" ] && ethtool -s "${IFACE}" wol g
-
-#	Automatically erase any ip rules created in the example postup above
-#	if interface_exists "${IFACE}"; then
-#		# Remove any rules for this interface
-#		local rule
-#		ip rule list | grep " iif ${IFACE}[ ]*" | {
-#			while read rule; do
-#				rule="${rule#*:}"	
-#				ip rule del ${rule}
-#			done
-#		}
-#		# Flush the route cache
-#		ip route flush cache dev "${IFACE}"
-#	fi
-
 #	# Return 0 always
 #	return 0
 #}

etc/Makefile

@@ -1,9 +1,28 @@
 DIR=	${SYSCONFDIR}
-CONF=	rc.conf
+SRCS=	rc.conf.in rc.in rc.shutdown.in
+BIN=	${BIN-${OS}}
+CONF=	rc.conf ${BIN-${OS}}
 
 CLEANFILES+=	rc.conf
 
 MK=	../mk
 include ${MK}/os.mk
-include Makefile.${OS}
+
+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 ${MK}/scripts.mk
+
+rc.conf: rc.conf.in rc.conf.${OS}
+	${SED} ${SED_REPLACE} ${SED_EXTRA} $^ > $@

etc/Makefile.FreeBSD

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

@@ -1,6 +0,0 @@
-SED_EXTRA=	-e 's:@TERM@:wsvt25:g'
-SRCS+=		rc.in rc.shutdown.in
-
-rc.conf:
-	cp rc.conf.in rc.conf
-	cat rc.conf.Linux >> rc.conf

etc/Makefile.NetBSD

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

etc/rc.conf.FreeBSD

@@ -0,0 +1,12 @@
+##############################################################################
+# FreeBSD SPECIFIC OPTIONS
+
+# This is the subsystem type. Valid options on FreeBSD:
+# ""        - nothing special
+# "jail"    - FreeBSD jails
+# 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

@@ -1,8 +1,20 @@
-
 ##############################################################################
 # LINUX SPECIFIC OPTIONS
 
+# This is the subsystem type. Valid options on Linux:
+# ""        - nothing special
+# "lxc"     - Linux Containers
+# "openvz"  - Linux OpenVZ
+# "uml"     - Usermode Linux
+# "vserver" - Linux vserver
+# "xen0"    - Xen0 Domain
+# "xenU"    - XenU Domain
+# If this is commented out, automatic detection will be used.
+#
+# This should be set to the value representing the environment this file is
+# PRESENTLY in, not the virtualization the environment is capable of.
+#rc_sys=""
+
 # This is the number of tty's used in most of the rc-scripts (like
 # consolefont, numlock, etc ...)
 rc_tty_number=12
-

etc/rc.conf.NetBSD

@@ -0,0 +1,13 @@
+##############################################################################
+# NetBSD SPECIFIC OPTIONS
+
+# This is the subsystem type. Valid options on NetBSD:
+# ""        - nothing special
+# "xen0"    - Xen0 Domain
+# "xenU"    - XenU Domain
+# If this is commented out, automatic detection will be used.
+#
+# This should be set to the value representing the environment this file is
+# PRESENTLY in, not the virtualization the environment is capable of.
+#rc_sys=""
+

etc/rc.conf.in

@@ -11,7 +11,8 @@
 
 # Set rc_interactive to "YES" and you'll be able to press the I key during
 # boot so you can choose to start specific services. Set to "NO" to disable
-# this feature.
+# this feature. This feature is automatically disabled if rc_parallel is
+# set to YES.
 #rc_interactive="YES"
 
 # If we need to drop to a shell, you can specify it here.
@@ -20,7 +21,7 @@
 # Linux users could specify /sbin/sulogin
 #rc_shell=/bin/sh
 
-# Do we allow any started service in the runlevel to satisfy the depedency
+# Do we allow any started service in the runlevel to satisfy the dependency
 # or do we want all of them regardless of state? For example, if net.eth0
 # and net.eth1 are in the default runlevel then with rc_depend_strict="NO"
 # both will be started, but services that depend on 'net' will work if either
@@ -46,6 +47,10 @@
 # logging can take place and as such cannot log the sysinit runlevel.
 #rc_logger="YES"
 
+# Through rc_log_path you can specify a custom log file.
+# The default value is: /var/log/rc.log
+#rc_log_path="/var/log/rc.log"
+
 # By default we filter the environment for our running scripts. To allow other
 # variables through, add them here. Use a * to allow all variables through.
 #rc_env_allow="VAR1 VAR2"
@@ -75,8 +80,14 @@
 # Set unicode to YES to turn on unicode support for keyboards and screens.
 #unicode="NO"
 
-# Network fstypes. Below is the default.
+# Below is the default list of network fstypes.
-net_fs_list="afs cifs coda davfs fuse fuse.sshfs gfs glusterfs lustre ncpfs nfs nfs4 ocfs2 shfs smbfs"
+#
+# afs cifs coda davfs fuse fuse.sshfs gfs glusterfs lustre ncpfs
+# nfs nfs4 ocfs2 shfs smbfs
+#
+# If you would like to add to this list, you can do so by adding your
+# own fstypes to the following variable.
+#extra_net_fs_list=""
 
 ##############################################################################
 # SERVICE CONFIGURATION VARIABLES
@@ -88,7 +99,7 @@ net_fs_list="afs cifs coda davfs fuse fuse.sshfs gfs glusterfs lustre ncpfs nfs
 # We can set some things on a per service basis, like the nicelevel.
 #export SSD_NICELEVEL="-19"
 
-# Pass ulimit parameters 
+# Pass ulimit parameters
 #rc_ulimit="-u 30"
 
 # It's possible to define extra dependencies for services like so
@@ -108,3 +119,4 @@ net_fs_list="afs cifs coda davfs fuse fuse.sshfs gfs glusterfs lustre ncpfs nfs
 # 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

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

etc/rc.in

@@ -1,12 +1,12 @@
 #!@SHELL@
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 # If $TERM is not set then assume default of @TERM@
 # This gives us a nice colour boot :)
 [ -z "$TERM" -o "$TERM" = "dumb" ] && export TERM="@TERM@"
 
-# Handle interrupts 
+# Handle interrupts
 trap : SIGINT
 trap "echo 'Boot interrupted'; exit 1" SIGQUIT
 

etc/rc.shutdown.in

@@ -1,8 +1,8 @@
 #!@SHELL@
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
-# Handle interrupts 
+# Handle interrupts
 trap : SIGINT SIGQUIT
 
 # Try and use stuff in /lib over anywhere else so we can shutdown

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

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

init.d.misc/Makefile.Linux

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

init.d.misc/Makefile.NetBSD

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

init.d.misc/avahi-dnsconfd.in

@@ -1,6 +1,6 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 command=@PKG_PREFIX@/sbin/avahi-dnsconfd
 command_args="$avahi_dnsconfd_args -D"

init.d.misc/avahid.in

@@ -1,6 +1,6 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 command=@PKG_PREFIX@/sbin/avahi-daemon
 command_args="$avahid_args -D"

init.d.misc/dbus.in

@@ -1,6 +1,6 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 command=@PKG_PREFIX@/bin/dbus-daemon
 pidfile=@VARBASE@/run/dbus/pid

init.d.misc/dhcpcd.in

@@ -1,6 +1,6 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2009 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 command=/sbin/dhcpcd
 pidfile=/var/run/dhcpcd.pid

init.d.misc/dnsmasq.in

@@ -1,6 +1,6 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 command=@PKG_PREFIX@/sbin/dnsmasq
 command_args=$dnsmasq_args
@@ -10,7 +10,7 @@ required_files=/etc/dnsmasq.conf
 extra_started_commands="reload"
 
 depend()
-{	
+{
 	provide dns
 	need localmount net
 	after bootmisc

init.d.misc/hald.in

@@ -1,6 +1,6 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 command=@PKG_PREFIX@/sbin/hald
 pidfile=@VARBASE@/run/hald/hald.pid

init.d.misc/named.in

@@ -1,6 +1,6 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 command=/usr/sbin/named
 command_args=$named_args

init.d.misc/ntpd.in

@@ -1,6 +1,6 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 : ${ntpd_config:=/etc/ntp.conf}
 : ${ntpd_drift:=/var/db/ntpd.drift}

init.d.misc/openvpn.in

@@ -1,6 +1,6 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 vpn=${RC_SVCNAME#*.}
 name="OpenVPN"
@@ -24,7 +24,7 @@ if yesno $openvpn_client; then
 	command_args="$command_args --up $openvpn_up"
 	command_args="$command_args --down $openvpn_down"
 	required_files="$required_files $openvpn_up $openvpn_down"
-	
+
 	in_background_fake="start stop"
 	start_inactive=YES
 fi
@@ -59,7 +59,7 @@ start_pre()
 			sysctl -a | grep -q '\.tap\.' || kldload if_tap
 		fi
 	fi
-	
+
 	# If the config file does not specify the cd option, we do
 	if ! grep -q "^[ \t]*cd[ \t].*" "$openvpn_config"; then
 		command_args="$command_args --cd $openvpn_dir"

init.d.misc/polkitd.in

@@ -1,6 +1,6 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 command=@PKG_PREFIX@/sbin/polkitd
 pidfile=@VARBASE@/run/polkitd/polkitd.pid

init.d.misc/sshd.in

@@ -1,6 +1,6 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 command=/usr/sbin/sshd
 command_args=$sshd_args
@@ -31,5 +31,5 @@ start_pre()
 		eend $? || return 1
 	fi
 
-	$command -t	
+	$command -t
 }

init.d.misc/wpa_supplicant.in

@@ -1,6 +1,6 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2009 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 command=/usr/sbin/wpa_supplicant
 : ${wpa_supplicant_conf:=/etc/wpa_supplicant.conf}
@@ -43,7 +43,7 @@ find_wireless()
 		done
 		;;
 	esac
-	
+
 	return 1
 }
 

init.d/.gitignore

@@ -11,6 +11,7 @@ network
 root
 savecache
 swap
+swapfiles
 sysctl
 urandom
 devfs

init.d/Makefile

@@ -1,27 +1,42 @@
 DIR=	${INITDIR}
 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 \
+	network.in root.in savecache.in staticroute.in swap.in swapfiles.in \
-	sysctl.in urandom.in
+	swclock.in sysctl.in urandom.in ${SRCS-${OS}}
 BIN=	${OBJS}
 
-# Build our old net foo or not
+INSTALLAFTER=	_installafter_net.lo
-_OLDNET_SH=	case "${MKOLDNET}" in \
+CLEANFILES+=	net.lo
-		[Yy][Ee][Ss]) echo "net.lo";; \
+TARGETS+=	net.lo
-		*) echo "";; \
-		esac
-_OLDNET!=	${_OLDNET_SH}
-_NET_LO=	${_OLDNET}$(shell ${_OLDNET_SH})
-
-INSTALLAFTER=	_installafter_${_NET_LO}
-CLEANFILES+=	${_NET_LO}
-TARGETS+=	${_NET_LO}
 
 MK=	../mk
 include ${MK}/os.mk
-include Makefile.${OS}
+
+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
+# These are FreeBSD specific
+SRCS-FreeBSD+=	adjkerntz.in devd.in dumpon.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
+
+NET_LO-NetBSD=	net.lo0
+# Generic BSD scripts
+SRCS-NetBSD=	hostid.in moused.in newsyslog.in pf.in rarpd.in rc-enabled.in \
+		rpcbind.in savecore.in syslogd.in
+# These are NetBSD specific
+SRCS-NetBSD+=	devdb.in swap-blk.in ttys.in wscons.in
+
+%.in: %${SFX}
+	sed ${SED_REPLACE} ${SED_EXTRA} $< > $@
+
 include ${MK}/scripts.mk
 
 _installafter_: realinstall
 
 _installafter_net.lo: realinstall
-	${INSTALL} -m ${BINMODE} net.lo ${DESTDIR}/${INITDIR}/${NET_LO}
+	${INSTALL} -m ${BINMODE} net.lo ${DESTDIR}/${INITDIR}/${NET_LO-${OS}}

init.d/Makefile.FreeBSD

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

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

@@ -1,12 +0,0 @@
-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,10 +1,10 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 extra_commands="save"
 
-description="Sets the local clock to UTC or Local Time." 
+description="Sets the local clock to UTC or Local Time."
 description_save="Saves the current time in the BIOS."
 
 : ${clock:=${CLOCK:-UTC}}
@@ -22,11 +22,11 @@ depend()
 	   [ "$clock" != "UTC" -a ! -e /etc/wall_cmos_clock ]; then
 		need root
 	fi
-	keyword -jail -prefix
+	keyword -jail
 }
 
 start()
-{	
+{
 	ebegin "Starting the System Clock Adjuster [${utc}]"
 	if [ "$clock" != "UTC" ]; then
 		echo >/etc/wall_cmos_clock

init.d/bootmisc.in

@@ -1,22 +1,17 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 depend()
 {
-	use hostname
 	need localmount
 	before logger
 	after clock sysctl
-	keyword -prefix
+	keyword -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()
 {
@@ -25,40 +20,41 @@ cleanup_tmp_dir()
 	if ! [ -d "$dir" ]; then
 		mkdir -p "$dir" || return $?
 	fi
-	dir_writeable "$dir" || return 1
+	checkpath -W "$dir" || return 1
-	chmod a+rwt "$dir"
+	chmod a+rwt "$dir" 2> /dev/null
-	cd "$dir"
+	cd "$dir" || return 1
 	if yesno $wipe_tmp; then
 		ebegin "Wiping $dir directory"
-		local startopts="-x . -depth"
-		[ "$RC_UNAME" = Linux ] && startopts=". -xdev -depth"
 
-		# Faster than find
+		# Faster than raw find
-		rm -rf -- [^ajlq\.]*
+		if ! rm -rf -- [^ajlq\.]* 2>/dev/null ; then
+			# Blah, too many files
+			find . -maxdepth 1 -name '[^ajlq\.]*' -exec rm -rf -- {} +
+		fi
 
-		find $startopts ! -name . \
+		# pam_mktemp creates a .private directory within which
-			! -path "./lost+found" \
+		# each user gets a private directory with immutable
-			! -path "./lost+found/*" \
+		# bit set; remove the immutable bit before trying to
-			! -path "./quota.user" \
+		# remove it.
-			! -path "./quota.user/*" \
+		[ -d /tmp/.private ] && chattr -R -a /tmp/.private 2> /dev/null
-			! -path "./aquota.user" \
+
-			! -path "./aquota.user/*" \
+		# Prune the paths that are left
-			! -path "./quota.group" \
+		find . -maxdepth 1 \
-			! -path "./quota.group/*" \
+			! -name . \
-			! -path "./aquota.group" \
+			! -name lost+found \
-			! -path "./aquota.group/*" \
+			! -name quota.user \
-			! -path "./journal" \
+			! -name aquota.user \
-			! -path "./journal/*" \
+			! -name quota.group \
-			! -path "./.private" \
+			! -name aquota.group \
-			! -path "./.private/*" \
+			! -name journal \
-			-exec rm -rf {} \;
+			-exec rm -rf -- {} +
 		eend 0
 	else
 		ebegin "Cleaning $dir directory"
-		rm -rf -- "$dir"/.X*-lock "$dir"/esrv* "$dir"/kio* \
+		rm -rf -- .X*-lock esrv* kio* \
-			"$dir"/jpsock.* "$dir"/.fam* "$dir"/.esd* \
+			jpsock.* .fam* .esd* \
-			"$dir"/orbit-* "$dir"/ssh-* "$dir"/ksocket-* \
+			orbit-* ssh-* ksocket-* \
-			"$dir"/.*-unix
+			.*-unix
 		eend 0
 	fi
 }
@@ -71,24 +67,57 @@ 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
+}
+
 start()
 {
 	# Remove any added console dirs
-	rm -rf "$RC_LIBEXECDIR"/console
+	rm -rf "$RC_LIBEXECDIR"/console/*
 
 	local logw=false runw=false extra=
 	# Ensure that our basic dirs exist
-	[ "$RC_UNAME" = Linux ] && extra=/var/lib/misc # Satisfy Linux FHS
+	if [ "$RC_UNAME" = Linux ]; then
-	for x in /var/log /var/run /tmp $extra; do
+		# 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
 		if ! [ -d $x ]; then
 			if ! mkdir -p $x; then
 				eend 1 "failed to create needed directory $x"
 				return 1
 			fi
-		fi 
+		fi
 	done
 
-	if dir_writeable /var/run; then
+	if [ "$RC_UNAME" = Linux -a -d /run ] && false; then
+		migrate_to_run	/var/lock /run/lock
+		migrate_to_run	/var/run /run
+	fi
+
+	if checkpath -W /var/run; then
 		ebegin "Creating user login records"
 		local xtra=
 		[ "$RC_UNAME" = NetBSD ] && xtra=x
@@ -130,11 +159,11 @@ start()
 		cleanup_tmp_dir "$tmp"
 	done
 
-	if dir_writeable /tmp; then
+	if checkpath -W /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
-		rm -rf /tmp/.ICE-unix /tmp/.X11-unix 
+		rm -rf /tmp/.ICE-unix /tmp/.X11-unix
 		mkdir -p /tmp/.ICE-unix /tmp/.X11-unix
 		chmod 1777 /tmp/.ICE-unix /tmp/.X11-unix
 		if [ -x /sbin/restorecon ]; then
@@ -142,15 +171,16 @@ start()
 		fi
 	fi
 
-	if $logw || dir_writeable /var/log; then
+	if yesno $log_dmesg; then
-		# Create an 'after-boot' dmesg log
+		if $logw || checkpath -W /var/log; then
-		if [ "$RC_SYS" != VSERVER -a "$RC_SYS" != OPENVZ ]; then
+			# Create an 'after-boot' dmesg log
-			dmesg > /var/log/dmesg
+			if [ "$RC_SYS" != VSERVER -a "$RC_SYS" != OPENVZ ]; then
-			chmod 640 /var/log/dmesg
+				dmesg > /var/log/dmesg
+				chmod 640 /var/log/dmesg
+			fi
 		fi
 	fi
 
-	[ -w /etc/nologin ] && rm -f /etc/nologin
 	return 0
 }
 

init.d/consolefont.in

@@ -1,6 +1,6 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 description="Sets a font for the consoles."
 
@@ -8,7 +8,7 @@ depend()
 {
 	need localmount termencoding
 	after hotplug bootmisc
-	keyword -openvz -prefix -uml -vserver -xenu -lxc
+	keyword -openvz -uml -vserver -xenu -lxc
 }
 
 start()
@@ -49,24 +49,18 @@ start()
 			retval=1
 			break
 		fi
-		x=$(($x + 1))
+		: $(( x += 1 ))
 	done
 	eend $retval
 
 	# Store the last font so we can use it ASAP on boot
-	if [ $retval -eq 0 -a -w "$RC_LIBEXECDIR" ]; then
+	if [ $retval -eq 0 ] && checkpath -W "$RC_LIBEXECDIR"; then
 		mkdir -p "$RC_LIBEXECDIR"/console
 		for font in /usr/share/consolefonts/"$consolefont".*; do
 			:
 		done
 		cp "$font" "$RC_LIBEXECDIR"/console
 		echo "${font##*/}" >"$RC_LIBEXECDIR"/console/font
-		if yesno ${unicode:-${UNICODE}}; then
-			echo "" > "$RC_LIBEXECDIR"/console/unicode
-		else
-			rm -f "$RC_LIBEXECDIR"/console/unicode
-		fi
-
 	fi
 
 	return $retval

init.d/devd.in

@@ -1,6 +1,6 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 command=/sbin/devd
 command_args=$devd_args
@@ -10,7 +10,7 @@ depend() {
 	need localmount
 	after bootmisc
 	before net.lo0
-	keyword -jail -prefix
+	keyword -jail
 }
 
 start_pre() {

init.d/devdb.in

@@ -1,6 +1,6 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2008 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 description="Creates the dev database"
 
@@ -11,7 +11,7 @@ depend()
 
 start()
 {
-	ebegin "Bulding the dev database"
+	ebegin "Building the dev database"
 	if [ /var/run/dev.db -nt /dev ]; then
 		:
 	else

init.d/devfs.in

@@ -1,12 +1,12 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 description="Mount system critical filesystems in /dev."
 
 depend() {
 	use dev
-	keyword -prefix -vserver
+	keyword -vserver
 }
 
 start() {

init.d/dmesg.in

@@ -1,6 +1,6 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 description="Set the dmesg level for a cleaner boot"
 

init.d/dumpon.in

@@ -1,12 +1,12 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 description="Configures a specific kernel dump device."
 
 depend() {
 	need swap
-	keyword -jail -prefix
+	keyword -jail
 }
 
 start() {
@@ -19,7 +19,7 @@ start() {
 }
 
 stop() {
-	ebegin "Deactiving kernel core dump device"
+	ebegin "Deactivating kernel core dump device"
 	dumpon off
 	eend $?
 }

init.d/fsck.in

@@ -1,6 +1,6 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 description="Check and repair filesystems according to /etc/fstab"
 _IFS="
@@ -9,7 +9,7 @@ _IFS="
 depend()
 {
 	use dev clock modules
-	keyword -jail -openvz -prefix -timeout -vserver -lxc
+	keyword -jail -openvz -timeout -vserver -lxc
 }
 
 _abort() {
@@ -48,8 +48,13 @@ 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
@@ -58,10 +63,16 @@ 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
 		fsck_opts="$fsck_opts -C0 -T"
-		if [ -z "$fsck_passno" ]; then
+		if [ -z "$fsck_passno" -a -z "$fsck_mnt" ]; then
 			fsck_args=${fsck_args--A -p}
 			if echo 2>/dev/null >/.test.$$; then
 				rm -f /.test.$$
@@ -91,7 +102,7 @@ start()
 			_reboot
 		fi;;
 	8)	ewend 1 "Operational error"; return 0;;
-	12)	ewend 1 "fsck interupted";;
+	12)	ewend 1 "fsck interrupted";;
 	*)	eend 2 "Filesystems couldn't be fixed";;
 	esac
 	_abort || return 1

init.d/hostid.in

@@ -1,6 +1,6 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 extra_commands="reset"
 : ${hostid_file:=/etc/hostid}
@@ -9,7 +9,7 @@ depend()
 {
 	use root
 	before devd net
-	keyword -jail -prefix
+	keyword -jail
 }
 
 _set()
@@ -68,7 +68,7 @@ reset()
 start()
 {
 	if [ -r "$hostid_file" ]; then
-		_set $(cat "$hostid_file") 
+		_set $(cat "$hostid_file")
 	else
 		reset
 	fi

init.d/hostname.in

@@ -1,11 +1,11 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 description="Sets the hostname of the machine."
 
 depend() {
-	keyword -prefix
+	keyword -lxc
 }
 
 start()

init.d/hwclock.in

@@ -1,10 +1,10 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 extra_commands="save show"
 
-description="Sets the local clock to UTC or Local Time." 
+description="Sets the local clock to UTC or Local Time."
 description_save="Saves the current time in the BIOS."
 description_show="Displays the current time in the BIOS."
 
@@ -28,7 +28,7 @@ depend()
 	else
 		before *
 	fi
-	keyword -openvz -prefix -uml -vserver -xenu -lxc
+	keyword -openvz -uml -vserver -xenu -lxc
 }
 
 setupopts()
@@ -85,19 +85,23 @@ 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
 	# as that's the default
 	if [ "$PREVLEVEL" != N -o \
-		"$utc_cmd}" != --utc -o \
+		"$utc_cmd" != --utc -o \
 		-n "$clock_args" ];
 	then
-		_hwclock --hctosys $utc_cmd $clock_args
+		if yesno ${clock_hctosys:-YES}; then
-		retval=$(($retval + $?))
+			_hwclock --hctosys $utc_cmd $clock_args
+		else
+			_hwclock --systz $utc_cmd $clock_args
+		fi
+		: $(( retval += $? ))
 	fi
-	
+
 	eend $retval "Failed to set the system clock"
 
 	return 0
@@ -107,7 +111,7 @@ stop()
 {
 	# Don't tweak the hardware clock on LiveCD halt.
 	[ -n "$CDBOOT" ] && return 0
-	yesno $clock_systohc || return 0
+	yesno ${clock_systohc:-YES} || return 0
 
 	local retval=0 errstr=""
 	setupopts
@@ -126,7 +130,7 @@ stop()
 	_hwclock --systohc $utc_cmd $clock_args
 	retval=$?
 
-	eend $retval "Failed to sync clocks" 
+	eend $retval "Failed to sync clocks"
 }
 
 save()

init.d/ipfw.in

@@ -1,6 +1,6 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 # This is based on /etc/rc.firewall and /etc/rc.firewall6 from FreeBSD
 
@@ -40,11 +40,11 @@ init() {
 	ipfw add deny all from any to 127.0.0.0/8
 	ipfw add deny ip from 127.0.0.0/8 to any
 
-	if have_ip6; then 
+	if have_ip6; then
 		ipfw add pass ip6 from any to any via lo0
 		ipfw add deny ip6 from any to ::1
 		ipfw add deny ip6 from ::1 to any
-	
+
 		ipfw add pass ip6 from :: to ff02::/16 proto ipv6-icmp
 		ipfw add pass ip6 from fe80::/10 to fe80::/10 proto ipv6-icmp
 		ipfw add pass ip6 from fe80::/10 to ff02::/16 proto ipv6-icmp
@@ -59,7 +59,7 @@ start() {
 		return 1
 	fi
 
-	# Use a statefull firewall
+	# Use a stateful firewall
 	ipfw add check-state
 	ipfw add pass tcp from me to any established
 
@@ -78,7 +78,7 @@ start() {
 	ipfw add pass udp  from 0.0.0.0 68 to 255.255.255.255 67 out
 	ipfw add pass udp  from any 67     to me 68 in
 	ipfw add pass udp  from any 67     to 255.255.255.255 68 in
-	# Some servers will ping the IP while trying to decide if it's 
+	# Some servers will ping the IP while trying to decide if it's
 	# still in use.
 	ipfw add pass icmp from any to any icmptype 8
 
@@ -88,11 +88,11 @@ start() {
 	if have_ip6; then
 		# Allow ICMPv6 destination unreach
 		ipfw add pass ip6 from any to any icmp6types 1 proto ipv6-icmp
-	
+
 		# Allow NS/NA/toobig (don't filter it out)
 		ipfw add pass ip6 from any to any icmp6types 2,135,136 proto ipv6-icmp
 	fi
-	
+
 	# Add permits for this workstations published services below
 	# Only IPs and nets in firewall_allowservices is allowed in.
 	for i in $ipfw_ip_in; do
@@ -107,7 +107,7 @@ start() {
 	for i in $ipfw_ip_trust; do
 		ipfw add pass ip from $i to me
 	done
-	
+
 	ipfw add 65000 count ip from any to any
 
 	# Drop packets to ports where we don't want logging
@@ -117,13 +117,13 @@ start() {
 
 	# Broadcasts and muticasts
 	ipfw add deny ip from any to 255.255.255.255
-	ipfw add deny ip from any to 224.0.0.0/24 
+	ipfw add deny ip from any to 224.0.0.0/24
 
 	# Noise from routers
 	ipfw add deny udp from any to any 520 in
 
 	# Noise from webbrowsing.
-	# The statefull filter is a bit agressive, and will cause some
+	# The stateful filter is a bit aggressive, 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,6 +1,6 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 description="Applies a keymap for the consoles."
 
@@ -8,7 +8,7 @@ depend()
 {
 	need localmount termencoding
 	after bootmisc
-	keyword -openvz -prefix -uml -vserver -xenu -lxc
+	keyword -openvz -uml -vserver -xenu -lxc
 }
 
 start()
@@ -17,7 +17,7 @@ start()
 	: ${unicode:=$UNICODE}
 	: ${keymap:=$KEYMAP}
 	: ${extended_keymaps:=$EXTENDED_KEYMAPS}
-	: ${windowkeys:=$SET_WINDOWSKEYS} 
+	: ${windowkeys:=$SET_WINDOWSKEYS}
 	: ${fix_euro:=$FIX_EURO}
 	: ${dumpkeys_charset:=${DUMPKEYS_CHARSET}}
 
@@ -47,7 +47,7 @@ start()
 	n=1
 	while [ $n -le $ttyn ]; do
 		kbd_mode $kmode -C $ttydev$n
-		n=$(($n + 1))
+		: $(( n += 1 ))
 	done
 	eend 0
 
@@ -63,7 +63,7 @@ start()
 	fi
 
 	# Save the keymapping for use immediately at boot
-	if [ -w "$RC_LIBEXECDIR" ]; then
+	if checkpath -W "$RC_LIBEXECDIR"; then
 		mkdir -p "$RC_LIBEXECDIR"/console
 		dumpkeys >"$RC_LIBEXECDIR"/console/keymap
 	fi

init.d/killprocs.in

@@ -1,22 +1,17 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 description="Kill all processes so we can unmount disks cleanly."
 
-depend()
-{
-	keyword -prefix
-}
-
 start()
 {
 	ebegin "Terminating remaining processes"
-	killall5 -15
+	killall5 -15 ${killall5_opts}
 	sleep 1
 	eend 0
-	ebegin "Killing remaining processes"	
+	ebegin "Killing remaining processes"
-	killall5 -9
+	killall5 -9 ${killall5_opts}
 	sleep 1
 	eend 0
 }

init.d/local.in

@@ -1,8 +1,8 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
-description="Executes user commands in /etc/conf.d/local"
+description="Executes user programs in @SYSCONFDIR@/local.d"
 
 depend()
 {
@@ -12,32 +12,40 @@ depend()
 
 start()
 {
-	ebegin "Starting local"
+	einfo "Starting local"
+
+	local file
+	for file in @SYSCONFDIR@/local.d/*.start ; do
+		[ -x "$file" ] && "$file"
+	done
 
 	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 scripts with an .start extension"
+		ewarn "in @SYSCONFDIR@/local.d"
 		local_start
 	fi
 
-	# Support old configs
+	eend 0
-	if [ -e @SYSCONFDIR@/conf.d/local.start ]; then
-		. @SYSCONFDIR@/conf.d/local.start
-	fi
-
-	eend $? "Failed to start local"
 }
 
 stop()
 {
-	ebegin "Stopping local"
+	einfo "Stopping local"
+
+	local file
+	for file in @SYSCONFDIR@/local.d/*.stop; do
+		[ -x "$file" ] && "$file"
+	done
 
 	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 scripts with an .stop extension"
+		ewarn "in @SYSCONFDIR@/local.d"
 		local_stop
 	fi
 
-	# Support old configs
+	eend 0
-	if [ -e @SYSCONFDIR@/conf.d/local.stop ]; then
-		. @SYSCONFDIR@/conf.d/local.stop
-	fi
-
-	eend $? "Failed to stop local"
 }

init.d/localmount.in

@@ -1,6 +1,6 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 description="Mounts disks and swap according to /etc/fstab."
 
@@ -8,19 +8,23 @@ depend()
 {
 	need fsck
 	use lvm modules mtab
-	keyword -jail -openvz -prefix -vserver -lxc
+	after lvm modules
+	keyword -jail -openvz -vserver -lxc
 }
 
 start()
 {
 	# Mount local filesystems in /etc/fstab.
-	local types="noproc" x=
+	local types="noproc" x= no_netdev=
-	for x in $net_fs_list; do
+	for x in $net_fs_list $extra_net_fs_list; do
 		types="${types},${x}"
 	done
 
+	if [ "$RC_UNAME" = Linux ]; then
+		no_netdev="-O no_netdev"
+	fi
 	ebegin "Mounting local filesystems"
-	mount -at "$types"
+	mount -at "$types" $no_netdev
 	eend $? "Some local filesystem failed to mount"
 
 	# Always return 0 - some local mounts may not be critical for boot
@@ -30,22 +34,20 @@ start()
 stop()
 {
 	# We never unmount / or /dev or $RC_SVCDIR
-	local x= no_umounts_r="/|/dev|/dev/.*|${RC_SVCDIR}"
+
-	no_umounts_r="${no_umounts_r}|/bin|/sbin|/lib|/libexec"
+	# Bug 381783
+	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"
 	# RC_NO_UMOUNTS is an env var that can be set by plugins
-	OIFS=$IFS SIFS=${IFS-y}
+	local IFS="$IFS:"
-	IFS=$IFS:
 	for x in $no_umounts $RC_NO_UMOUNTS; do
 		no_umounts_r="$no_umounts_r|$x"
 	done
-	if [ "$SIFS" = y ]; then
-		IFS=$OIFS
-	else
-		unset IFS
-	fi
 
 	if [ "$RC_UNAME" = Linux ]; then
-		no_umounts_r="$no_umounts_r|/proc|/proc/.*|/sys|/sys/.*"
+		no_umounts_r="$no_umounts_r|/proc|/proc/.*|/run|/sys|/sys/.*"
 	fi
 	no_umounts_r="^($no_umounts_r)$"
 
@@ -54,8 +56,8 @@ stop()
 
 	. "$RC_LIBEXECDIR"/sh/rc-mount.sh
 
-	# Umount loopback devices
+	# Umount loop devices
-	einfo "Unmounting loopback devices"
+	einfo "Unmounting loop devices"
 	eindent
 	do_unmount "umount -d" --skip-point-regex "$no_umounts_r" \
 		--node-regex "^/dev/loop"
@@ -66,12 +68,12 @@ stop()
 	einfo "Unmounting filesystems"
 	eindent
 	local fs=
-	for x in $net_fs_list; do
+	for x in $net_fs_list $extra_net_fs_list; do
 		fs="$fs${fs:+|}$x"
 	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/mixer.in

@@ -1,13 +1,13 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 extra_commands="restore"
 
 depend()
 {
 	need localmount
-	keyword -jail -prefix
+	keyword -jail
 }
 
 restore()
@@ -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,13 +1,13 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 description="Loads a user defined list of kernel modules."
 
 depend()
 {
 	use isapnp
-	keyword -openvz -prefix -vserver -lxc
+	keyword -openvz -vserver -lxc
 }
 
 start()
@@ -16,18 +16,21 @@ start()
 	# support compiled in ...
 	[ ! -f /proc/modules ] && return 0
 
-	local KV=$(uname -r)
+	local KV x y kv_variant_list
-	local KV_MAJOR=${KV%%.*}
+	KV=$(uname -r)
-	local x=${KV#*.}
+	# full $KV
-	local KV_MINOR=${x%%.*}
+	kv_variant_list="${KV}"
-	x=${KV#*.*.}
+	# remove any KV_EXTRA options to just get the full version
-	local KV_MICRO=${x%%-*}
+	x=${KV%%-*}
+	# now slowly strip them
+	while [ -n "$x" ] && [ "$x" != "$y" ]; do
+		kv_variant_list="${kv_variant_list} $x"
+		y=$x
+		x=${x%.*}
+	done
 
 	local list= x= xx= y= args= mpargs= cnt=0 a=
-	for x in "$KV" \
+	for x in $kv_variant_list ; do
-		$KV_MAJOR.$KV_MINOR.$KV_MICRO \
-		$KV_MAJOR.$KV_MINOR \
-	; do
 		eval list=\$modules_$(shell_var "$x")
 		[ -n "$list" ] && break
 	done
@@ -45,10 +48,7 @@ start()
 		fi
 		aa=$(shell_var "$a")
 		xx=$(shell_var "$x")
-		for y in "$KV" \
+		for y in $kv_variant_list ; do
-			$KV_MAJOR.$KV_MINOR.$KV_MICRO \
-			$KV_MAJOR.$KV_MINOR \
-		; do
 			eval args=\$module_${aa}_args_$(shell_var "$y")
 			[ -n "${args}" ] && break
 			eval args=\$module_${xx}_args_$(shell_var "$y")
@@ -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=$(($cnt + 1))
+		eend $? "Failed to load $x" && : $(( cnt += 1 ))
 	done
 	einfo "Autoloaded $cnt module(s)"
 }

init.d/mount-ro.in

@@ -1,13 +1,13 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 description="Re-mount filesytems read-only for a clean reboot."
 
 depend()
 {
 	need killprocs savecache
-	keyword -prefix -openvz -vserver -lxc
+	keyword -openvz -vserver -lxc
 }
 
 start()
@@ -19,28 +19,26 @@ start()
 	# We need the do_unmount function
 	. "$RC_LIBEXECDIR"/sh/rc-mount.sh
 	eindent
-	local m="/dev|/dev/.*|/proc|/proc.*|/sys|/sys/.*|${RC_SVCDIR}" x= fs=
+
-	m="$m|/bin|/sbin|/lib|/libexec"
+	# 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/.*|${rc_svcdir}" x= fs=
+	m="$m|/bin|/sbin|/lib(32|64)?|/libexec"
 	# RC_NO_UMOUNTS is an env var that can be set by plugins
-	local OIFS=$IFS SIFS=${IFS-y} IFS=$IFS
+	local IFS="$IFS:"
-	IFS=$IFS:
 	for x in $no_umounts $RC_NO_UMOUNTS; do
 		m="$m|$x"
 	done
-	if [ "$SIFS" = y ]; then
-		IFS=$OIFS
-	else
-		unset IFS
-	fi
 	m="^($m)$"
 	fs=
-	for x in $net_fs_list; do
+	for x in $net_fs_list $extra_net_fs_list; do
 		fs="$fs${fs:+|}$x"
 	done
 	[ -n "$fs" ] && fs="^($fs)$"
 	do_unmount "umount -r" \
 		--skip-point-regex "$m" \
-		${fs:+--skip-fstype-regex} $fs --nonetdev
+		"${fs:+--skip-fstype-regex}" $fs --nonetdev
 	eoutdent
 	eend $?
 }

init.d/moused.in

@@ -1,6 +1,6 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 mouse=${RC_SVCNAME##*.}
 if [ -n "$mouse" -a "$mouse" != "moused" ]; then
@@ -16,18 +16,18 @@ depend()
 {
 	need localmount
 	after bootmisc
-	keyword -jail -prefix
+	keyword -jail
 }
 
 start()
 {
-	ebegin "Starting $name" 
+	ebegin "Starting $name"
 
 	if [ -z "$moused_device" ]; then
 		local dev=
 		for dev in /dev/psm[0-9]* /dev/ums[0-9]*; do
 			[ -c "$dev" ] || continue
-			[ -e /var/run/moused-"${dev##*/}".pid ] && continue 
+			[ -e /var/run/moused-"${dev##*/}".pid ] && continue
 			moused_device=$dev
 			eindent
 			einfo "Using mouse on $moused_device"
@@ -37,7 +37,7 @@ start()
 	fi
 
 	if [ -z "$moused_device" ]; then
-		eend 1 "No mouse device found" 
+		eend 1 "No mouse device found"
 		return 1
 	fi
 
@@ -49,14 +49,14 @@ start()
 		--pidfile "$pidfile" \
 		-- $args -p "$moused_device" -I "$pidfile"
 	local retval=$?
-	
+
 	if [ $retval = 0 ]; then
 		local ttyv=
 		for ttyv in /dev/ttyv*; do
 			vidcontrol < "$ttyv" -m on
-			: $((retval+= $?))
+			: $(( retval += $? ))
 		done
 	fi
-	
+
 	eend $retval "Failed to start moused"
 }

init.d/mtab.in

@@ -1,20 +1,19 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 description="Update /etc/mtab to match what the kernel knows about"
 
 depend()
 {
 	need root
-	keyword -prefix
 }
 
 start()
 {
-	# /etc/mtab could be a symlink to /proc/mounts
+	if [ -L /etc/mtab ]
-	if [ ! -w /etc/mtab -a -L /etc/mtab ]; then
+	then
-		eeinfo "Skipping mtab update (non writeable symlink)"
+		einfo "Skipping mtab update (mtab is a symbolic link)"
 		return 0
 	fi
 

init.d/net.lo.in

@@ -1,6 +1,6 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 MODULESDIR="${RC_LIBEXECDIR}/net"
 MODULESLIST="${RC_SVCDIR}/nettree"
@@ -20,12 +20,14 @@ depend()
 
 	need localmount
 	after bootmisc
-	provide net
+	keyword -jail -vserver
-	keyword -jail -prefix -vserver
 
 	case "${IFACE}" in
-		lo|lo0);;
+		lo|lo0) provide lo;;
-		*) after net.lo net.lo0;;
+		*)
+			after net.lo net.lo0 dbus
+			provide net
+			;;
 	esac
 
 	if [ "$(command -v "depend_${IFVAR}")" = "depend_${IFVAR}" ]; then
@@ -37,17 +39,32 @@ depend()
 		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}"
@@ -57,10 +74,7 @@ _get_array()
 		esac
 	fi
 
-	eval _a=\$$1
+	_array_helper $1
-	printf "%s" "${_a}"
-	printf "\n"
-	[ -n "${_a}" ]
 }
 
 # Flatten bash arrays to simple strings
@@ -69,6 +83,9 @@ _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")"
@@ -78,10 +95,7 @@ _flatten_array()
 		esac
 	fi
 
-	eval _a=\$$1
+	_array_helper $1
-	printf "%s" "${_a}"
-	printf "\n"
-	[ -n "${_a}" ]
 }
 
 _wait_for_carrier()
@@ -105,7 +119,7 @@ _wait_for_carrier()
 			eend 0
 			return 0
 		fi
-		timeout=$((${timeout} - 1))
+		: $(( timeout -= 1 ))
 		[ "${efunc}" = "einfon" ] && printf "."
 	done
 
@@ -134,9 +148,9 @@ _netmask2cidr()
 	local i= len=
 	local IFS=.
 	for i in $1; do
-		while [ ${i} != "0" ]; do
+		while [ ${i} -ne 0 ]; do
-			len=$((${len} + ${i} % 2))
+			: $(( len += i % 2 ))
-			i=$((${i} >> 1))
+			: $(( i >>= 1 ))
 		done
 	done
 
@@ -159,6 +173,36 @@ _configure_variables()
 	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}")"
@@ -180,7 +224,7 @@ _gen_module_list()
 		${update} || return 0
 	fi
 
-	einfo "Caching network module dependencies" 
+	einfo "Caching network module dependencies"
 	# Run in a subshell to protect the main script
 	(
 	after() {
@@ -215,7 +259,7 @@ _gen_module_list()
 
 	for MODULE in "${MODULESDIR}"/*.sh; do
 		sh -n "${MODULE}" || continue
-		. "${MODULE}" || continue 
+		. "${MODULE}" || continue
 		MODULE=${MODULE#${MODULESDIR}/}
 		MODULE=${MODULE%.sh}
 		eval ${MODULE}_depend
@@ -267,7 +311,7 @@ _gen_module_list()
 		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))
+		: $(( i += 1 ))
 	done
 	echo "module_${i}=" >> "${MODULESLIST}"
 	)
@@ -294,18 +338,17 @@ _load_modules()
 
 	local i=-1 x= mod= f= provides=
 	while true; do
-		i=$((${i} + 1))
+		: $(( i += 1 ))
 		eval mod=\$module_${i}
 		[ -z "${mod}" ] && break
 		[ -e "${MODULESDIR}/${mod}.sh" ] || continue
 
 		eval set -- \$module_${i}_program
 		if [ -n "$1" ]; then
-			x=
+			if ! _program_available "$@" >/dev/null; then
-			for x; do
+				vewarn "Skipping module $mod due to missing program: $@"
-				[ -x "${x}" ] && break
+				continue
-			done
+			fi
-			[ -x "${x}" ] || continue
 		fi
 		if ${starting}; then
 			eval set -- \$module_${i}_program_start
@@ -313,15 +356,10 @@ _load_modules()
 			eval set -- \$module_${i}_program_stop
 		fi
 		if [ -n "$1" ]; then
-			x=
+			if ! _program_available "$@" >/dev/null; then
-			for x; do
+				vewarn "Skipping module $mod due to missing program: $@"
-				case "${x}" in
+				continue
-					/*) [ -x "${x}" ] && break;;
+			fi
-					*) type "${x}" >/dev/null 2>&1 && break;;
-				esac
-				unset x
-			done
-			[ -n "${x}" ] || continue
 		fi
 
 		eval provides=\$module_${i}_provide
@@ -343,7 +381,7 @@ _load_modules()
 
 		# Wrap our provides
 		local f=
-		for f in pre_start start post_start; do 
+		for f in pre_start start post_start; do
 			eval "${provides}_${f}() { [ "$(command -v "${mod}_${f}")" = "${mod}_${f}" ] || return 0; ${mod}_${f} \"\$@\"; }"
 		done
 
@@ -357,7 +395,7 @@ _load_modules()
 			*" ${mod} "*)
 			eval x=\$module_${mod}_provides
 			[ -z "${x}" ] && continue
-			for f in pre_start start post_start; do 
+			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}"
@@ -379,7 +417,7 @@ _load_modules()
 			MODULES="${MODULES}${MODULES:+ }${mod}"
 		done
 	else
-		for mod in ${LIST}; do 
+		for mod in ${LIST}; do
 			MODULES="${mod}${MODULES:+ }${MODULES}"
 		done
 	fi
@@ -395,18 +433,20 @@ _load_config()
 	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.
-		case "$2" in
+		# If the NEXT argument is a v4 or v6 address, it's the next config.
-			netmask|broadcast|brd|brd+)
+		# Otherwise, it's arguments to the first config...
-				local IFS="$__IFS"
+		if [ "${2#*.*}" = "${2}" -a "${2#*:*}" = "${2}" ]; then
-				set -- ${config}
+			# Not an IPv4/IPv6
-				;;
+			local IFS="$__IFS"
-		esac
+			set -- ${config}
+		fi
 	fi
 
 	# Ensure that loopback has the correct address
@@ -415,7 +455,7 @@ _load_config()
 		   	config_0="127.0.0.1/8"
 			config_index=1
 		fi
-	else	
+	else
 		if [ -z "$1" ]; then
 			ewarn "No configuration specified; defaulting to DHCP"
 			config_0="dhcp"
@@ -428,7 +468,7 @@ _load_config()
 	# so modules can influence it
 	for cmd; do
 		eval config_${config_index}="'${cmd}'"
-		config_index=$((${config_index} + 1))
+		: $(( config_index += 1 ))
 	done
 	# Terminate the list
 	eval config_${config_index}=
@@ -436,7 +476,7 @@ _load_config()
 	config_index=0
 	for cmd in ${fallback}; do
 		eval fallback_${config_index}="'${cmd}'"
-		config_index=$((${config_index} + 1))
+		: $(( config_index += 1 ))
 	done
 	# Terminate the list
 	eval fallback_${config_index}=
@@ -476,9 +516,11 @@ interface_down()
 
 start()
 {
-	local IFACE=${RC_SVCNAME#*.} oneworked=false module=
+	local IFACE=${RC_SVCNAME#*.} oneworked=false fallback=false module=
 	local IFVAR=$(shell_var "${IFACE}") cmd= our_metric=
-	local metric=0
+	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
@@ -492,7 +534,7 @@ start()
 	# available in preup and afterwards incase the user inadvertently
 	# brings it down
 	if [ "$(command -v preup)" = "preup" ]; then
-		_up 2>/dev/null
+		yesno "${_up_before_preup:-yes}" && _up 2>/dev/null
 		ebegin "Running preup"
 		eindent
 		preup || return 1
@@ -500,7 +542,7 @@ start()
 	fi
 
 	_up 2>/dev/null
-	
+
 	for module in ${MODULES}; do
 		if [ "$(command -v "${module}_pre_start")" = "${module}_pre_start" ]; then
 			${module}_pre_start || exit $?
@@ -527,19 +569,21 @@ start()
 	_load_config
 	config_index=0
 
-	eval our_metric=\$metric_${IFVAR} 
+	eval our_metric=\$metric_${IFVAR}
 	if [ -n "${our_metric}" ]; then
 		metric=${our_metric}
 	elif [ "${IFACE}" != "lo" -a "${IFACE}" != "lo0" ]; then
-		metric=$((${metric} + $(_ifindex)))
+		: $(( metric += $(_ifindex) ))
 	fi
 
 	while true; do
 		eval config=\$config_${config_index}
-		[ -z "${config}" ] && break 
+		[ -z "${config}" ] && break
 
 		set -- ${config}
-		ebegin "$1"
+		if [ "$1" != "null" -a "$1" != "noop" ]; then
+			ebegin "$1"
+		fi
 		eindent
 		case "$1" in
 			noop)
@@ -563,16 +607,17 @@ start()
 		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))
+				: $(( config_index -= 1 ))
 			fi
 		fi
 		eoutdent
-		config_index=$((${config_index} + 1))
+		: $(( config_index += 1 ))
 	done
 
 	if ! ${oneworked}; then
@@ -585,8 +630,13 @@ start()
 		return 1
 	fi
 
-	local hidefirstroute=false first=true
+	local hidefirstroute=false first=true routes=
-	local routes="$(_get_array "routes_${IFVAR}")"
+	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
@@ -638,7 +688,7 @@ ${routes}"
 	if [ "$(command -v postup)" = "postup" ]; then
 		ebegin "Running postup"
 		eindent
-		postup 
+		postup
 		eoutdent
 	fi
 
@@ -684,7 +734,11 @@ stop()
 
 	# Only delete addresses for interfaces that exist
 	if _exists; then
-		_delete_addresses "${IFACE}"
+		# 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

init.d/netmount.in

@@ -1,6 +1,6 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 description="Mounts network shares according to /etc/fstab."
 
@@ -35,16 +35,16 @@ depend()
 	need net $pmap
 	use afc-client amd autofs openvpn
 	use dns nfs nfsmount portmap rpcbind rpc.statd rpc.lockd
-	keyword -jail -prefix -vserver
+	keyword -jail -vserver
 }
 
 start()
-{	
+{
 	local myneed= myuse= pmap="portmap" nfsmounts=
 	[ -x @SYSCONFDIR@/init.d/rpcbind ] && pmap="rpcbind"
 
-	local x= fs=
+	local x= fs= rc=
-	for x in $net_fs_list; do
+	for x in $net_fs_list $extra_net_fs_list; do
 		case "$x" in
 			nfs|nfs4)
 			# If the nfsmount script took care of the nfs
@@ -65,7 +65,12 @@ start()
 
 	ebegin "Mounting network filesystems"
 	mount -at $fs
-	ewend $? "Could not mount all network filesystems"
+	rc=$?
+	if [ "$RC_UNAME" = Linux ]; then
+		mount -a -O _netdev
+		rc=$?
+	fi
+	ewend $rc "Could not mount all network filesystems"
 	return 0
 }
 
@@ -76,7 +81,7 @@ stop()
 	ebegin "Unmounting network filesystems"
 	. "$RC_LIBEXECDIR"/sh/rc-mount.sh
 
-	for x in $net_fs_list; do
+	for x in $net_fs_list $extra_net_fs_list; do
 		fs="$fs${fs:+,}$x"
 	done
 	if [ -n "$fs" ]; then
@@ -85,7 +90,7 @@ stop()
 
 	eindent
 	fs=
-	for x in $net_fs_list; do
+	for x in $net_fs_list $extra_net_fs_list; do
 		fs="$fs${fs:+|}$x"
 	done
 	[ -n "$fs" ] && fs="^($fs)$"
@@ -93,5 +98,9 @@ stop()
 	retval=$?
 
 	eoutdent
+	if [ "$RC_UNAME" = Linux ]; then
+		umount -a -O _netdev
+		retval=$?
+	fi
 	eend $retval "Failed to unmount network filesystems"
 }

init.d/network.in

@@ -1,6 +1,6 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2009 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 # This script was inspired by the equivalent rc.d network from NetBSD.
 
@@ -13,7 +13,7 @@ depend()
 	need localmount
 	after bootmisc
 	provide net
-	keyword -jail -prefix -vserver
+	keyword -jail -vserver
 }
 
 uniqify()
@@ -219,10 +219,16 @@ start()
 		eend $?
 	fi
 
+	ewarn
+	ewarn "The $RC_SVCNAME script is deprecated and will be"
+	ewarn "removed in the future."
+	ewarn "Please use the net.* scripts to manage your network interfaces."
+	ewarn
+
 	einfo "Starting network"
 	routeflush
 	if [ "$RC_UNAME" = "Linux" ]; then
-		ifconfig lo 127.0.0.1 netmask 255.0.0.0 || cr=1 
+		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
@@ -281,13 +287,13 @@ start()
 		tentative || break
 		[ $r = 5 ] && vebegin "Waiting for tentative addresses"
 		sleep 1
-		r=$(($r - 1))
+		: $(( r -= 1 ))
 	done
 	if [ $r != 5 ]; then
 		[ $r != 0 ]
 		veend $?
 	fi
-	
+
 	if [ -n "$defaultroute" ]; then
 		ebegin "Setting default route $defaultroute"
 		route add default $defaultroute

init.d/newsyslog.in

@@ -1,13 +1,12 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 required_files="/etc/newsyslog.conf"
 
 depend()
 {
 	need localmount
-	keyword -prefix
 }
 
 start()

init.d/nscd.in

@@ -1,6 +1,6 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 command=/usr/sbin/nscd
 command_args=$nscd_args

init.d/numlock.in

@@ -1,6 +1,6 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 description="Turns numlock on for the consoles."
 
@@ -9,7 +9,7 @@ ttyn=${rc_tty_number:-${RC_TTY_NUMBER:-12}}
 depend()
 {
 	need localmount
-	keyword -openvz -prefix -vserver -lxc
+	keyword -openvz -vserver -lxc
 }
 
 _setleds()
@@ -21,7 +21,7 @@ _setleds()
 
 	while [ $i -le $ttyn ]; do
 		setleds -D "$1"num < $dev$i || retval=1
-		i=$(($i + 1))
+		: $(( i += 1 ))
 	done
 
 	return $retval

init.d/pf.in

@@ -1,6 +1,6 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 name="Packet Filter"
 : ${pf_conf:=${pf_rules:-/etc/pf.conf}}
@@ -11,7 +11,7 @@ extra_started_commands="reload"
 
 depend() {
 	need localmount
-	keyword -jail -prefix
+	keyword -jail
 }
 
 start()
@@ -44,7 +44,7 @@ reload()
 {
 	ebegin "Reloading $name rules."
 	pfctl -q -n -f "$pf_conf" && \
-	{ 
+	{
 		# Flush everything but existing state entries that way when
 		# rules are read in, it doesn't break established connections.
 		pfctl -q -Fnat -Fqueue -Frules -FSources -Finfo -FTables -Fosfp

init.d/powerd.in

@@ -1,6 +1,6 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 command=/usr/sbin/powerd
 command_args=$powerd_args
@@ -12,7 +12,7 @@ depend()
 	need localmount
 	use logger
 	after bootmisc
-	keyword -jail -prefix
+	keyword -jail
 }
 
 start_pre()

init.d/procfs.in

@@ -1,6 +1,6 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 description="Mounts misc filesystems in /proc."
 
@@ -8,18 +8,41 @@ depend()
 {
 	use modules devfs
 	need localmount
-	keyword -openvz -prefix -vserver -lxc
+	keyword -openvz -vserver -lxc
 }
 
 start()
 {
 	# Make sure we insert usbcore if it's a module
-	if [ -f /proc/modules -a ! -d /proc/bus/usb ]; then
+	if [ -f /proc/modules -a ! -d /sys/module/usbcore -a ! -d /proc/bus/usb ]; then
 		modprobe -q usbcore
 	fi
 
 	[ -e /proc/filesystems ] || return 0
 
+	# Setup Kernel Support for miscellaneous Binary Formats
+	if [ -d /proc/sys/fs/binfmt_misc -a ! -e /proc/sys/fs/binfmt_misc/register ]; then
+		if grep -qs binfmt_misc /proc/filesystems; then
+			ebegin "Mounting misc binary format filesystem"
+			mount -t binfmt_misc -o nodev,noexec,nosuid \
+				binfmt_misc /proc/sys/fs/binfmt_misc
+			if eend $? ; then
+				local fmts
+				ebegin "Loading custom binary format handlers"
+				fmts=$(grep -hsv -e '^[#;]' -e '^[[:space:]]*$' \
+					/run/binfmt.d/*.conf \
+					@SYSCONFDIR@/binfmt.d/*.conf \
+					""/usr/lib/binfmt.d/*.conf)
+				if [ -n "${fmts}" ]; then
+					echo "${fmts}" > /proc/sys/fs/binfmt_misc/register
+				fi
+				eend $?
+			fi
+		fi
+	fi
+
+	[ "$RC_SYS" == "OPENVZ" ] && return 0
+
 	# Check what USB fs the kernel support.  Currently
 	# 2.5+ kernels, and later 2.4 kernels have 'usbfs',
 	# while older kernels have 'usbdevfs'.
@@ -37,27 +60,6 @@ start()
 		fi
 	fi
 
-	# Setup Kernel Support for the NFS daemon status
-	if [ -d /proc/fs/nfsd ] && ! mountinfo -q /proc/fs/nfsd; then
-		if grep -qs nfsd /proc/filesystems; then
-			ebegin "Mounting NFS filesystem"
-			mount -t nfsd -o nodev,noexec,nosuid \
-				nfsd /proc/fs/nfsd
-			eend $?
-		fi
-	fi
-
-	# Setup Kernel Support for miscellaneous Binary Formats
-	if [ -d /proc/sys/fs/binfmt_misc ] \
-		&& ! mountinfo -q /proc/sys/fs/binfmt_misc; then
-		if grep -qs binfmt_misc /proc/filesystems; then
-			ebegin "Mounting misc binary format filesystem"
-			mount -t binfmt_misc -o nodev,noexec,nosuid \
-				binfmt_misc /proc/sys/fs/binfmt_misc
-			eend $?
-		fi
-	fi
-
 	# Setup Kernel Support for SELinux
 	if [ -d /selinux ] && ! mountinfo -q /selinux; then
 		if grep -qs selinuxfs /proc/filesystems; then

init.d/rarpd.in

@@ -1,6 +1,6 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 command=/usr/sbin/rarpd
 command_args="-f $rarpd_args"

init.d/rc-enabled.in

@@ -1,13 +1,12 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 depend()
 {
 	need localmount net
 	after *
 	before local
-	keyword -prefix
 }
 
 start()
@@ -33,7 +32,7 @@ start()
 
 		# Good to go!
 		"$svc" start && started="$started $svc"
-		: $((retval += $?))
+		: $(( retval += $? ))
 	done
 	service_set_value started "$started"
 	eend $retval "Some local rc services failed to start"
@@ -46,7 +45,7 @@ stop()
 	local svc= retval=0
 	for svc in $(rcorder $(service_get_value started) 2>/dev/null | sort -r); do
 		"$svc" stop
-		: $((retval += $?))
+		: $(( retval += $? ))
 	done
 	eend $retval "Some local rc services failed to stop"
 	return 0

init.d/root.in

@@ -1,32 +1,53 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 description="Mount the root fs read/write"
 
 depend()
 {
 	need fsck
-	keyword -jail -openvz -prefix -vserver -lxc
+	keyword -jail -openvz -vserver -lxc
 }
 
 start()
 {
 	case ",$(fstabinfo -o /)," in
-	*,ro,*) return 0;;
+		*,ro,*)
+		;;
+		*)
+			# Check if the rootfs isn't already writable.
+			if checkpath -W /; then
+				rm -f /fastboot /forcefsck
+			else
+				ebegin "Remounting root filesystem read/write"
+				case "$RC_UNAME" in
+					Linux)
+						mount -n -o remount,rw /
+					;;
+					*)
+						mount -u -o rw /
+					;;
+				esac
+				eend $? "Root filesystem could not be mounted read/write"
+				if [ $?  -eq 0 ]; then
+					rm -f /fastboot /forcefsck
+				fi
+			fi
+		;;
 	esac
 
-	if echo 2>/dev/null >/.test.$$; then
+	ebegin "Remounting filesystems"
-		rm -f /.test.$$ /fastboot /forcefsck
+	local mountpoint
-		return 0
+	for mountpoint in $(fstabinfo); do
-	fi
+		case "${mountpoint}" in
-
+			/)
-	ebegin "Remounting root filesystem read/write"
+			;;
-	case "$RC_UNAME" in
+			/*)
-		Linux)	mount -n -o remount,rw /;;
+				mountinfo -q "${mountpoint}" && \
-		*)	mount -u -o rw /;;
+					fstabinfo --remount "${mountpoint}"
-	esac
+			;;
-	if eend $? "Root filesystem could not be mounted read/write"; then
+		esac
-		rm -f /fastboot /forcefsck
+	done
-	fi
+	eend 0
 }