Release openrc-0.5.0

.gitignore

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

FEATURE-REMOVAL-SCHEDULE

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

Makefile

@@ -1,16 +1,20 @@
 # OpenRC Makefile
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# All rights reserved. Released under the 2-clause BSD license.
 
-include Makefile.inc
+NAME=		openrc
+VERSION=	0.5.0
+PKG=		${NAME}-${VERSION}
 
-SUBDIR=		conf.d etc init.d local.d man scripts sh src sysctl.d
+SUBDIR=		conf.d etc init.d man sh src
 
-# Build pkgconfig or not
-MKPKGCONFIG?=	yes
-ifeq (${MKPKGCONFIG},yes)
-SUBDIR+=	pkgconfig
-endif
+# 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})
 
 # We need to ensure that runlevels is done last
 SUBDIR+=	runlevels
@@ -25,10 +29,6 @@ include ${MK}/dist.mk
 include ${MK}/git.mk
 
 _installafter:
-ifeq (${MKPREFIX},yes)
 	${INSTALL} -d ${DESTDIR}/${LIBEXECDIR}/init.d
-else ifneq (${OS},Linux)
-	${INSTALL} -d ${DESTDIR}/${LIBEXECDIR}/init.d
-endif
 	${INSTALL} -d ${DESTDIR}/${LIBEXECDIR}/tmp
 	${ECHO} "${VERSION}${GITVER}" > ${DESTDIR}/${LIBEXECDIR}/version

Makefile.inc

@@ -1,3 +0,0 @@
-NAME=		openrc
-VERSION=	0.12.1
-PKG=		${NAME}-${VERSION}

README

@@ -4,21 +4,16 @@ OpenRC README
 Installation
 ------------
 make install
-Yup, that simple. Works with GNU make.
+Yup, that simple. Works with GNU make and BSD make.
 
 You may wish to tweak the installation with the below arguments
 PROGLDFLAGS=-static
 LIBNAME=lib64
 DESTDIR=/tmp/openrc-image
-MKNET=no
 MKPAM=pam
-MKPREFIX=yes
-MKPKGCONFIG=no
-MKSELINUX=yes
-MKSTATICLIBS=no
 MKTERMCAP=ncurses
 MKTERMCAP=termcap
-MKTOOLS=yes
+MKOLDNET=yes
 PKG_PREFIX=/usr/pkg
 LOCAL_PREFIX=/usr/local
 PREFIX=/usr/local
@@ -27,8 +22,6 @@ We don't support building a static OpenRC with PAM.
 You may need to use PROGLDFLAGS=-Wl,-Bstatic on glibc instead of just -static.
 If you debug memory under valgrind, add -DDEBUG_MEMORY to your CPPFLAGS
 so that all malloc memory should be freed at exit.
-If you are building OpenRC for a Gentoo Prefix installation, add
-MKPREFIX=yes.
 
 You can also brand OpenRC if you so wish like so
 BRANDING=\"Gentoo/$(uname -s)\"
@@ -47,7 +40,7 @@ If any of the following files exist then we do not overwrite them
 rc and rc.shutdown are the hooks from the BSD init into OpenRC.
 devd.conf is modified from FreeBSD to call /etc/rc.devd which is a generic
 hook into OpenRC.
-inittab is the same, but for SysVInit as used by most Linux distributions.
+inittab is the same, but for SysVInit as used by most Linux distrubtions.
 This can be found in the support folder.
 Obviously, if you're installing this onto a system that does not use OpenRC
 by default then you may wish to backup the above listed files, remove them
@@ -57,24 +50,21 @@ init.d.misc is not installed by default as the scripts will need
 tweaking on a per distro basis. They are also non essential to the operation
 of the system.
 
-As of OpenRC-0.12, the net.* scripts, originally from Gentoo Linux, have
-been removed. If you need these scripts, look for a package called
-netifrc, which is maintained by them.
 
 Reporting Bugs
---------------
-Since Gentoo Linux is hosting OpenRC development, Bugs should go to
-the Gentoo Bugzilla:
-	http://bugs.gentoo.org/
-They should be filed under the "Gentoo Hosted Projects" product and
-the "openrc" component.
+-------------
+If you installed OpenRC from your chosen distribution, you should report
+bugs directly to them. For example, if you use Gentoo and emerged OpenRC
+then you should reports bugs to http://bugs.gentoo.org.
+
+Otherwise, you can report them directly to me at http://bugs.marples.name
 
 
 History - by Roy Marples
 ------------------------
 I became a Gentoo/Linux developer in 2004 and wrote the modular network
 scripts for the Gentoo baselayout package. baselayout is a collection of
-bash scripts to bring up your computer and its services.
+bash scripts to bring up your computer and it's services.
 Then towards the end of 2005 I found myself as the primary maintainer
 for baselayout.
 

README.busybox

@@ -1,28 +0,0 @@
-Using Busybox as your Default Shell
------------------------------------
-
-
-If you have/bin/sh linked to busybox, you need to be aware of several
-incompatibilities between busybox's applets and the standalone
-counterparts. Since it is possible to configure busybox to not include
-these applets or to prefer the standalone counterparts, OpenRC does not
-attempt to support the busybox applets.
-
-All of these apply to busybox 1.20.2, which is the current version of
-busybox as of this writing.
-
-1. The start-stop-daemon applet is not compatible with start-stop-daemon
-in OpenRC. Please make sure CONFIG_START_STOP_DAEMON is not set to y in
-the configuration file you use to build busybox.
-
-2. The -O option for the mount applet does not support the [no]_netdev
-options from util-linux for handling network file systems.
-
-3. The umount applet does not support the -O option from util-linux.
-
-4. The swapon applet does not support the -e option from util-linux.
-
-5. the setfont applet does not support the -u option from kbd.
-
-There is work to get most of these supported by busybox, so this file
-will be updated as things change.

README.newnet

@@ -1,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

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

conf.d/.gitignore

@@ -1,2 +1 @@
 network
-staticroute

conf.d/Makefile

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

conf.d/Makefile.FreeBSD

@@ -0,0 +1,3 @@
+CONF+=	ipfw moused powerd rarpd savecore syscons
+
+network.${OS}:

conf.d/Makefile.Linux

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

conf.d/Makefile.NetBSD

@@ -0,0 +1,3 @@
+CONF+=	moused rarpd savecore
+
+network.${OS}:

conf.d/adjkerntz

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

conf.d/bootmisc

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

conf.d/consolefont

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

conf.d/dmesg

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

conf.d/fsck

@@ -13,18 +13,6 @@
 #fsck_passno=">1"
 #fsck_passno="<2"
 
-# If passno is not enough granularity, you can also specify mountpoints to
-# check. This should NOT be used for the default non-multiplexed fsck, or your
-# system might not be checked. Additionally, it is mutually exclusive with
-# the fsck_passno setting.
-#fsck_mnt=""
-#fsck_mnt="/home"
-
-# Most modern fs's don't require a full fsck on boot, but for those that do
-# it may be advisable to skip this when running on battery.
-# WARNING: Do not turn this off if you have any JFS partitions.
-fsck_on_battery="YES"
-
 # fsck_shutdown causes fsck to trigger during shutdown as well as startup.
 # The end result of this is that if any periodic non-root filesystem checks are
 # scheduled, under normal circumstances the actual check will happen during

conf.d/hwclock

@@ -1,19 +1,13 @@
-# Set CLOCK to "UTC" if your Hardware Clock is set to UTC (also known as
-# Greenwich Mean Time).  If that clock is set to the local time, then
-# set CLOCK to "local".  Note that if you dual boot with Windows, then
+# Set CLOCK to "UTC" if your system clock is set to UTC (also known as
+# Greenwich Mean Time).  If your clock is set to the local time, then 
+# set CLOCK to "local".  Note that if you dual boot with Windows, then 
 # you should set it to "local".
 clock="UTC"
 
-# If you want the hwclock script to set the system time (software clock)
-# to match the current hardware clock during bootup, leave this
-# commented out.
-# However, you can set this to "NO" ifyou are running a modern kernel
-# with CONFIG_RTC_HCTOSYS set to y and your hardware clock set to UTC.
-#clock_hctosys="YES"
-
-# If you do not want to set the hardware clock to the current system
-# time (software clock) during shutdown, set this to no.
-#clock_systohc="YES"
+# If you want to set the Hardware Clock to the current System Time 
+# during shutdown, then say "YES" here.
+# You normally don't need to do this if you run a ntp daemon.
+clock_systohc="NO"
 
 # If you 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,18 +1,16 @@
-# 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

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

conf.d/local

@@ -0,0 +1,18 @@
+# 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,10 +1,8 @@
 # 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
@@ -12,12 +10,10 @@
 #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="debug2"
-#module_ieee1394_args_2_6_23="debug3"
-#module_ieee1394_args_2_6="debug4"
-#module_ieee1394_args_2="debug5"
+#module_ieee1394_args_2_6_23_gentoo_r5="ieee1394 ohci1394"
+#module_ieee1394_args_2_6_23="tun ieee1394"
+#module_ieee1394_args_2_6="tun"
 
 # 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

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

conf.d/netmount

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

conf.d/network.BSD.in

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

conf.d/network.Linux

@@ -1,20 +1,8 @@
-
-# You can assign a default route
-#defaultroute="gw 192.168.0.1"
-#defaultroute6="gw 2001:a:b:c"
-
 # ifconfig under Linux is not that powerful and doesn't easily handle
 # multiple addresses
 # On the other hand, ip (iproute2) is quite powerful and is also supported
 #ip_eth0="192.168.0.10/24; 192.168.10.10/24"
 
-# You can also use ip to add the default route.
-#defaultiproute="via 192.168.0.1"
-#defaultiproute6="via 2001:a:b:c"
-
-# ip doesn't handle MTU like ifconfig, but we can do it like so
-#ifup_eth0="ip link set \$int mtu 1500"
-
 # Create a bonded interface
 #interfaces="bond0"
 #ifup_bond0="modprobe bonding; ifconfig \$int up; ifenslave \$int bge0"

conf.d/network.in

@@ -7,8 +7,10 @@
 # You also have ifup_eth0 and ifdown_eth0 to run other commands when
 # eth0 is started and stopped.
 # You should note that we don't stop the network at system shutdown by default.
-# If you really need this, then set keep_network=NO
+# If you really need this, then set shutdown_network=YES
 
+# You can assign a default route
+#defaultroute="192.168.0.1"
 # Lastly, the interfaces variable pulls in virtual interfaces that cannot
 # be automatically detected.
 #interfaces="br0 bond0 vlan0"
@@ -24,5 +26,3 @@
 # If you require DHCP, you should install dhcpcd and it to the boot or
 # default runlevel.
 
-# NIS users can set the domain name here
-#domainname="foobar"

conf.d/staticroute.BSD.in

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

conf.d/staticroute.Linux.in

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

conf.d/tmpfiles

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

conf.d/urandom

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

doc/.gitignore

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

doc/Makefile

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

doc/Makefile.FreeBSD

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

doc/Makefile.Linux

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

doc/Makefile.NetBSD

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

doc/net.example.BSD.in

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

etc/Makefile

@@ -1,28 +1,9 @@
 DIR=	${SYSCONFDIR}
-SRCS=	rc.conf.in rc.in rc.shutdown.in
-BIN=	${BIN-${OS}}
-CONF=	rc.conf ${BIN-${OS}}
+CONF=	rc.conf
 
 CLEANFILES+=	rc.conf
 
 MK=	../mk
 include ${MK}/os.mk
-
-SED_EXTRA-FreeBSD=	-e 's:@TERM@:cons25:g'
-BIN-FreeBSD=		rc rc.shutdown rc.devd
-CONF-FreeBSD=		devd.conf
-
-SED_EXTRA-Linux=	-e 's:@TERM@:wsvt25:g'
-BIN-Linux=
-CONF-Linux=
-
-SED_EXTRA-NetBSD=	-e 's:@TERM@:wsvt25:g'
-BIN-NetBSD=		rc rc.shutdown
-CONF-NetBSD=
-
-SED_EXTRA=	${SED_EXTRA-${OS}}
-
+include Makefile.${OS}
 include ${MK}/scripts.mk
-
-rc.conf: rc.conf.in rc.conf.${OS}
-	${SED} ${SED_REPLACE} ${SED_EXTRA} $^ > $@

etc/Makefile.FreeBSD

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

etc/Makefile.Linux

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

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

etc/rc.conf.DragonFly

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

etc/rc.conf.FreeBSD

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

etc/rc.conf.Linux

@@ -1,78 +1,8 @@
+
 ##############################################################################
 # LINUX SPECIFIC OPTIONS
 
-# This is the subsystem type. Valid options on Linux:
-# ""        - nothing special
-# "lxc"     - Linux Containers
-# "openvz"  - Linux OpenVZ
-# "prefix"  - Prefix
-# "uml"     - Usermode Linux
-# "vserver" - Linux vserver
-# "xen0"    - Xen0 Domain
-# "xenU"    - XenU Domain
-# If this is commented out, automatic detection will be used.
-#
-# This should be set to the value representing the environment this file is
-# PRESENTLY in, not the virtualization the environment is capable of.
-#rc_sys=""
-
 # This is the number of tty's used in most of the rc-scripts (like
 # consolefont, numlock, etc ...)
 rc_tty_number=12
 
-##############################################################################
-# CGROUPS RESOURCE MANAGEMENT
-
-# If you have cgroups turned on in your kernel, this switch controls
-# whether or not a group for each controller is mounted under
-# /sys/fs/cgroup.
-# None of the other options in this section work if this is set to "NO".
-#rc_controller_cgroups="YES"
-
-# The following settings allow you to set up values for the cgroup
-# controllers for your services.
-# They can be set in this file;, however, if you do this, the settings
-# will apply to all of your services.
-# If you want different settings for each service, place the settings in
-# /etc/conf.d/foo for service foo.
-# The format is to specify the names of the settings followed by their
-# values. Each variable can hold multiple settings.
-# For example, you would use this to set the cpu.shares setting in the
-# cpu controller to 512 for your service.
-# rc_cgroup_cpu="
-# cpu.shares 512
-# "
-#
-#For more information about the adjustments that can be made with
-#cgroups, see Documentation/cgroups/* in the linux kernel source tree.
-
-# Set the blkio controller settings for this service.
-#rc_cgroup_blkio=""
-
-# Set the cpu controller settings for this service.
-#rc_cgroup_cpu=""
-
-# Add this service to the cpuacct controller (any value means yes).
-#rc_cgroup_cpuacct=""
-
-# Set the cpuset controller settings for this service.
-#rc_cgroup_cpuset=""
-
-# Set the devices controller settings for this service.
-#rc_cgroup_devices=""
-
-# Set the memory controller settings for this service.
-#rc_cgroup_memory=""
-
-# Set the net_prio controller settings for this service.
-#rc_cgroup_net_prio=""
-
-# Set this to YES if yu want all of the processes in a service's cgroup
-# killed when the service is stopped or restarted.
-# This should not be set globally because it kills all of the service's
-# child processes, and most of the time this is undesirable. Please set
-# it in /etc/conf.d/<service>.
-# To perform this cleanup manually for a stopped service, you can
-# execute cgroup_cleanup with /etc/init.d/<service> cgroup_cleanup or
-# rc-service <service> cgroup_cleanup.
-# rc_cgroup_cleanup="NO"

etc/rc.conf.NetBSD

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

etc/rc.conf.in

@@ -2,7 +2,7 @@
 
 # Set to "YES" if you want the rc system to try and start services
 # in parallel for a slight speed improvement. When running in parallel we
-# prefix the service output with its name as the output will get
+# prefix the service output with it's name as the output will get
 # jumbled up.
 # WARNING: whilst we have improved parallel, it can still potentially lock
 # the boot process. Don't file bugs about this unless you can supply
@@ -11,8 +11,7 @@
 
 # Set rc_interactive to "YES" and you'll be able to press the I key during
 # boot so you can choose to start specific services. Set to "NO" to disable
-# this feature. This feature is automatically disabled if rc_parallel is
-# set to YES.
+# this feature.
 #rc_interactive="YES"
 
 # If we need to drop to a shell, you can specify it here.
@@ -21,7 +20,7 @@
 # Linux users could specify /sbin/sulogin
 #rc_shell=/bin/sh
 
-# Do we allow any started service in the runlevel to satisfy the dependency
+# Do we allow any started service in the runlevel to satisfy the depedency
 # 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
@@ -47,10 +46,6 @@
 # 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"
@@ -80,34 +75,20 @@
 # Set unicode to YES to turn on unicode support for keyboards and screens.
 #unicode="NO"
 
-# This is how long fuser should wait for a remote server to respond. The
-# default is 60 seconds, but  it can be adjusted here.
-#rc_fuser_timeout=60
-
-# Below is the default list of network fstypes.
-#
-# afs cifs coda davfs fuse fuse.sshfs gfs glusterfs lustre ncpfs
-# 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=""
+# Network fstypes. Below is the default.
+net_fs_list="afs cifs coda davfs fuse gfs ncpfs nfs nfs4 ocfs2 shfs smbfs"
 
 ##############################################################################
 # SERVICE CONFIGURATION VARIABLES
 # These variables are documented here, but should be configured in
 # /etc/conf.d/foo for service foo and NOT enabled here unless you
 # really want them to work on a global basis.
-# If your service has characters in its name which are not legal in
-# shell variable names and you configure the variables for it in this
-# file, those characters should be replaced with underscores in the
-# variable names as shown below.
 
 # Some daemons are started and stopped via start-stop-daemon.
 # We can set some things on a per service basis, like the nicelevel.
-#SSD_NICELEVEL="-19"
+#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
@@ -124,14 +105,6 @@
 #rc_foo_need="openvpn"
 #rc_foo_after="clock"
 
-# Below is an example for service foo-bar. Note that the '-' is illegal
-# in a shell variable name, so we convert it to an underscore.
-# example for service foo-bar.
-#rc_foo_bar_config="/etc/foo-bar"
-#rc_foo_bar_need="openvpn"
-#rc_foo_bar_after="clock"
-
 # You can also remove dependencies.
 # This is mainly used for saying which servies do NOT provide net.
 #rc_net_tap0_provide="!net"
-

etc/rc.devd

@@ -1,11 +1,10 @@
 #!/bin/sh
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# All rights reserved. Released under the 2-clause BSD license.
 
 # Inform RC that we are in the background and hotplugged
-IN_BACKGROUND=yes
-IN_HOTPLUG=yes
-export IN_BACKGROUND IN_HOTPLUG
+export IN_BACKGROUND=yes
+export IN_HOTPLUG=yes
 
 getmedia() {
 	ifconfig "$1" | while read line; do

etc/rc.in

@@ -1,12 +1,12 @@
 #!@SHELL@
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# All rights reserved. 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" ] && TERM="@TERM@" && export TERM
+[ -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,17 +1,17 @@
 #!@SHELL@
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# All rights reserved. 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
 # local mounts correctly.
-LD_LIBRARY_PATH="/lib${LD_LIBRARY_PATH:+:}${LDLIBRARY_PATH}" ; export LD_LIBRARY_PATH
+export LD_LIBRARY_PATH="/lib${LD_LIBRARY_PATH:+:}${LDLIBRARY_PATH}"
 
 # If $TERM is not set then assume default of @TERM@
 # This gives us a nice colour boot :)
-[ -z "$TERM" -o "$TERM" = "dumb" ] && TERM="@TERM@" && export TERM
+[ -z "$TERM" -o "$TERM" = "dumb" ] && export TERM="@TERM@"
 
 action=${1:-shutdown}
 exec /sbin/rc "${action}"

init.d.misc/.gitignore

@@ -1,11 +0,0 @@
-avahi-dnsconfd
-avahid
-dhcpcd
-dbus
-hald
-named
-ntpd
-openvpn
-polkitd
-sshd
-wpa_supplicant

init.d.misc/Makefile

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

init.d.misc/Makefile.FreeBSD

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

init.d.misc/Makefile.Linux

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

init.d.misc/Makefile.NetBSD

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

init.d.misc/avahi-dnsconfd.in

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

init.d.misc/dnsmasq.in

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

init.d.misc/ntpd.in

@@ -1,6 +1,6 @@
-#!@SBINDIR@/runscript
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# All rights reserved. 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 @@
-#!@SBINDIR@/runscript
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# All rights reserved. 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 @@
-#!@SBINDIR@/runscript
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# All rights reserved. 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 @@
-#!@SBINDIR@/runscript
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# All rights reserved. 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 @@
-#!@SBINDIR@/runscript
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# All rights reserved. Released under the 2-clause BSD license.
 
 command=/usr/sbin/wpa_supplicant
 : ${wpa_supplicant_conf:=/etc/wpa_supplicant.conf}
@@ -14,7 +14,7 @@ depend()
 	use logger
 	after bootmisc modules
 	before dns dhcpcd net
-	keyword -shutdown
+	keyword noshutdown
 }
 
 find_wireless()
@@ -24,9 +24,7 @@ find_wireless()
 	case "$RC_UNAME" in
 	Linux)
 		for iface in /sys/class/net/*; do
-			if [ -e "$iface"/wireless -o \
-				-e "$iface"/phy80211 ]
-			then
+			if [ -e "$iface"/wireless ]; then
 				echo "${iface##*/}"
 				return 0
 			fi
@@ -43,7 +41,7 @@ find_wireless()
 		done
 		;;
 	esac
-
+	
 	return 1
 }
 

init.d/.gitignore

@@ -11,7 +11,6 @@ network
 root
 savecache
 swap
-swapfiles
 sysctl
 urandom
 devfs
@@ -25,7 +24,6 @@ mount-ro
 mtab
 numlock
 procfs
-staticroute
 sysfs
 devdb
 hostid
@@ -36,9 +34,6 @@ rc-enabled
 rpcbind
 savecore
 swap-blk
-swclock
 syslogd
-termencoding
 ttys
 wscons
-tmpfiles.setup

init.d/Makefile

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

init.d/Makefile.FreeBSD

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

init.d/Makefile.Linux

@@ -0,0 +1,9 @@
+NET_LO=	net.lo
+
+SRCS+=	devfs.in dmesg.in hwclock.in consolefont.in keymaps.in killprocs.in \
+	modules.in mount-ro.in mtab.in numlock.in procfs.in sysfs.in \
+	termencoding.in
+
+.SUFFIXES:	.Linux.in
+.Linux.in:
+	sed ${SED_REPLACE} ${SED_EXTRA} $< > $@

init.d/Makefile.NetBSD

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

init.d/adjkerntz.in

@@ -1,10 +1,10 @@
-#!@SBINDIR@/runscript
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# All rights reserved. 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 nojail noprefix
 }
 
 start()
-{
+{	
 	ebegin "Starting the System Clock Adjuster [${utc}]"
 	if [ "$clock" != "UTC" ]; then
 		echo >/etc/wall_cmos_clock

init.d/bootmisc.in

@@ -1,17 +1,22 @@
-#!@SBINDIR@/runscript
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# All rights reserved. Released under the 2-clause BSD license.
 
 depend()
 {
+	use hostname
 	need localmount
 	before logger
 	after clock sysctl
-	keyword -prefix -timeout
+	keyword noprefix
+}
+
+dir_writeable()
+{
+	mkdir "$1"/.test.$$ 2>/dev/null && rmdir "$1"/.test.$$
 }
 
 : ${wipe_tmp:=${WIPE_TMP:-yes}}
-: ${log_dmesg:=${LOG_DMESG:-yes}}
 
 cleanup_tmp_dir()
 {
@@ -20,73 +25,44 @@ cleanup_tmp_dir()
 	if ! [ -d "$dir" ]; then
 		mkdir -p "$dir" || return $?
 	fi
-	checkpath -W "$dir" || return 1
-	chmod a+rwt "$dir" 2> /dev/null
-	cd "$dir" || return 1
+	dir_writeable "$dir" || return 1
+	chmod +t "$dir"
+	cd "$dir"
 	if yesno $wipe_tmp; then
 		ebegin "Wiping $dir directory"
+		local startopts="-x . -depth"
+		[ "$RC_UNAME" = Linux ] && startopts=". -xdev -depth"
 
-		# Faster than raw find
-		if ! rm -rf -- [!ajlq\.]* 2>/dev/null ; then
-			# Blah, too many files
-			find . -maxdepth 1 -name '[!ajlq\.]*' -exec rm -rf -- {} +
-		fi
+		# Faster than find
+		rm -rf -- [^ajlq\.]*
 
-		# pam_mktemp creates a .private directory within which
-		# each user gets a private directory with immutable
-		# bit set; remove the immutable bit before trying to
-		# remove it.
-		[ -d /tmp/.private ] && chattr -R -a /tmp/.private 2> /dev/null
-
-		# Prune the paths that are left
-		find . -maxdepth 1 \
-			! -name . \
-			! -name lost+found \
-			! -name quota.user \
-			! -name aquota.user \
-			! -name quota.group \
-			! -name aquota.group \
-			! -name journal \
-			-exec rm -rf -- {} +
+		find $startopts ! -name . \
+			! -path "./lost+found" \
+			! -path "./lost+found/*" \
+			! -path "./quota.user" \
+			! -path "./quota.user/*" \
+			! -path "./aquota.user" \
+			! -path "./aquota.user/*" \
+			! -path "./quota.group" \
+			! -path "./quota.group/*" \
+			! -path "./aquota.group" \
+			! -path "./aquota.group/*" \
+			! -path "./journal" \
+			! -path "./journal/*" \
+			! -path "./.private" \
+			! -path "./.private/*" \
+			-exec rm -rf {} \;
 		eend 0
 	else
 		ebegin "Cleaning $dir directory"
-		rm -rf -- .X*-lock esrv* kio* \
-			jpsock.* .fam* .esd* \
-			orbit-* ssh-* ksocket-* \
-			.*-unix
+		rm -rf -- "$dir"/.X*-lock "$dir"/esrv* "$dir"/kio* \
+			"$dir"/jpsock.* "$dir"/.fam* "$dir"/.esd* \
+			"$dir"/orbit-* "$dir"/ssh-* "$dir"/ksocket-* \
+			"$dir"/.*-unix
 		eend 0
 	fi
 }
 
-cleanup_var_run_dir()
-{
-	ebegin "Cleaning /var/run"
-	for x in $(find /var/run ! -type d ! -name utmp \
-		! -name random-seed ! -name dev.db \
-		! -name ld-elf.so.hints ! -name ld.so.hints);
-	do
-		# Clean stale sockets
-		if [ -S "$x" ]; then
-			if type fuser >/dev/null 2>&1; then
-				fuser "$x" >/dev/null 2>&1 || rm -- "$x"
-			else
-				rm -- "$x"
-			fi
-		fi
-		[ ! -f "$x" ] && continue
-		# Do not remove pidfiles of already running daemons
-		case "$x" in
-			*.pid)
-				start-stop-daemon --test --quiet \
-				--stop --pidfile "$x" && continue
-			;;
-		esac
-		rm -f -- "$x"
-	done
-	eend 0
-}
-
 mkutmp()
 {
 	: >"$1"
@@ -95,91 +71,69 @@ mkutmp()
 	chmod 0664 "$1"
 }
 
-migrate_to_run()
-{
-	src="$1"
-	dst="$2"
- 	if [ -L $src -a "$(readlink -f $src)" != $dst ]; then
- 		ewarn "$src does not point to $dst."
- 		ewarn "Setting $src to point to $dst."
- 		rm $src
- 	elif [ ! -L $src -a -d $src ]; then
- 		ebegin "Migrating $src to $dst"
- 		cp -a $src/* $dst/
- 		rm -rf $src
- 		eend $?
- 	fi
- 	# If $src doesn't exist at all, just run this
- 	if [ ! -e $src ]; then
- 		ln -s $dst $src
- 	fi
-}
-
-clean_run()
-{
-	local dir
-	dir=$(mktemp -d)
-	mount --bind / $dir
-	rm -rf $dir/run/*
-	umount $dir
-	rm -rf $dir
-}
-
 start()
 {
 	# Remove any added console dirs
-	rm -rf "$RC_LIBEXECDIR"/console/*
+	rm -rf "$RC_LIBEXECDIR"/console
 
-	local logw=false runw=false extra=
+	local logw=false runw=false
 	# Ensure that our basic dirs exist
-	if [ "$RC_UNAME" = Linux ]; then
-		# Satisfy Linux FHS
-		extra=/var/lib/misc
-		if [ ! -d /run ]; then
-			extra="/var/run $extra"
-		fi
-	else
-		extra=/var/run
-	fi
-	for x in /var/log /tmp $extra; do
+	for x in /var/log /var/run /tmp; 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 [ "$RC_UNAME" = Linux -a -d /run ]; then
-		migrate_to_run	/var/lock /run/lock
-		migrate_to_run	/var/run /run
-		clean_run
-	fi
-
-	if checkpath -W /var/run; then
+	if dir_writeable /var/run; then
 		ebegin "Creating user login records"
 		local xtra=
 		[ "$RC_UNAME" = NetBSD ] && xtra=x
 		for x in "" $xtra; do
 			mkutmp /var/run/utmp$x
 		done
-		[ -e /var/log/wtmp ] || mkutmp /var/log/wtmp
+		[ -e /var/log/wtmp ] && mkutmp /var/log/wtmp
 		eend 0
 
-		mountinfo -q -f tmpfs /var/run || cleanup_var_run_dir
+		ebegin "Cleaning /var/run"
+		for x in $(find /var/run ! -type d ! -name utmp \
+			! -name random-seed ! -name dev.db \
+			! -name ld-elf.so.hints ! -name ld.so.hints);
+		do
+			# Clean stale sockets
+			if [ -S "$x" ]; then
+				if type fuser >/dev/null 2>&1; then
+					fuser "$x" 2>/dev/null || rm -- "$x"
+				else
+					rm -- "$x"
+				fi
+			fi
+			[ ! -f "$x" ] && continue
+			# Do not remove pidfiles of already running daemons
+			case "$x" in
+				*.pid)
+					start-stop-daemon --test --quiet \
+					--stop --pidfile "$x" && continue
+				;;
+			esac
+			rm -f -- "$x"
+		done
+		eend 0
 	fi
 
 	# Clean up /tmp directories
 	local tmp=
 	for tmp in ${clean_tmp_dirs:-${wipe_tmp_dirs-/tmp}}; do
-		mountinfo -q -f tmpfs "$tmp" || cleanup_tmp_dir "$tmp"
+		cleanup_tmp_dir "$tmp"
 	done
 
-	if checkpath -W /tmp; then
+	if dir_writeable /tmp; then
 		# Make sure our X11 stuff have the correct permissions
 		# Omit the chown as bootmisc is run before network is up
 		# and users may be using lame LDAP auth #139411
-		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
@@ -187,16 +141,15 @@ start()
 		fi
 	fi
 
-	if yesno $log_dmesg; then
-		if $logw || checkpath -W /var/log; then
-			# Create an 'after-boot' dmesg log
-			if [ "$RC_SYS" != VSERVER -a "$RC_SYS" != OPENVZ -a "$RC_SYS" != LXC ]; then
-				dmesg > /var/log/dmesg
-				chmod 640 /var/log/dmesg
-			fi
+	if $logw || dir_writeable /var/log; then
+		# Create an 'after-boot' dmesg log
+		if [ "$RC_SYS" != VSERVER -a "$RC_SYS" != OPENVZ ]; then
+			dmesg > /var/log/dmesg
+			chmod 640 /var/log/dmesg
 		fi
 	fi
 
+	rm -f /etc/nologin
 	return 0
 }
 
@@ -212,5 +165,3 @@ stop()
 
 	return 0
 }
-
-# vim: ft=sh

init.d/consolefont.in

@@ -1,6 +1,6 @@
-#!@SBINDIR@/runscript
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# All rights reserved. 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 noopenvz noprefix nouml novserver noxenu
 }
 
 start()
@@ -45,18 +45,26 @@ start()
 	[ -d /dev/vc ] && ttydev=/dev/vc/
 	x=1
 	while [ $x -le $ttyn ]; do
-		if ! setfont $consolefont $param -C $ttydev$x >/dev/null; then
-			retval=1
-			break
-		fi
-		: $(( x += 1 ))
+		setfont $consolefont $param -C $ttydev$x >/dev/null 
+		retval=$(($retval + $?))
+		x=$(($x + 1))
 	done
 	eend $retval
 
-	# Store the font so we can use it ASAP on boot
-	if [ $retval -eq 0 ] && checkpath -W "$RC_LIBEXECDIR"; then
+	# Store the last font so we can use it ASAP on boot
+	if [ $retval -eq 0 -a -w "$RC_LIBEXECDIR" ]; then
 		mkdir -p "$RC_LIBEXECDIR"/console
-		setfont -O "$RC_LIBEXECDIR"/console/font
+		for font in /usr/share/consolefonts/"$consolefont".*; do
+			:
+		done
+		cp "$font" "$RC_LIBEXECDIR"/console
+		echo "${font##*/}" >"$RC_LIBEXECDIR"/console/font
+		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 @@
-#!@SBINDIR@/runscript
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# All rights reserved. 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 nojail noprefix
 }
 
 start_pre() {

init.d/devdb.in

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

init.d/devfs.in

@@ -1,19 +1,17 @@
-#!@SBINDIR@/runscript
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# All rights reserved. Released under the 2-clause BSD license.
 
 description="Mount system critical filesystems in /dev."
 
 depend() {
-	use dev-mount
-	before dev
-	keyword -prefix -vserver -lxc
+	use dev
+	keyword noprefix novserver
 }
 
 start() {
 	# Mount required stuff as user may not have then in /etc/fstab
 	for x in \
-		"mqueue /dev/mqueue 1777 ,nodev mqueue" \
 		"devpts /dev/pts 0755 ,gid=5,mode=0620 devpts" \
 		"tmpfs /dev/shm 1777 ,nodev shm" \
 	; do

init.d/dmesg.in

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

init.d/dumpon.in

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

init.d/encswap.in

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

init.d/fsck.in

@@ -1,6 +1,6 @@
-#!@SBINDIR@/runscript
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# All rights reserved. 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 nojail noopenvz noprefix notimeout novserver
 }
 
 _abort() {
@@ -30,6 +30,33 @@ _forcefsck()
 	[ -e /forcefsck ] || get_bootparam forcefsck
 }
 
+_on_ac_power()
+{
+	if [ -f /proc/acpi/ac_adapter/AC/state ]; then
+		cat /proc/acpi/ac_adapter/AC/state | while read line; do
+			case "$line" in
+			"state:"*"off-line") return 128;;
+			esac
+		done
+	elif [ -f /proc/pmu/info ]; then
+		cat /proc/pmu/info | while read line; do
+			case "$line" in
+			"AC Power"*": 0") return 128;;
+			esac
+		done
+	elif type envstat >/dev/null 2>&1; then
+		# NetBSD has envstat
+		envstat -d acpiacad0 2>/dev/null | while read line; do
+			case "$line" in
+			"connected:"*"OFF") return 128;;
+			esac
+		done
+	else
+		return 0
+	fi
+	[ $? != 128 ]
+}
+
 start()
 {
 	local fsck_opts= p= check_extra=
@@ -41,20 +68,15 @@ start()
 	if _forcefsck; then
 		fsck_opts="$fsck_opts -f"
 		check_extra="(check forced)"
-	elif ! yesno ${fsck_on_battery:-YES} && ! on_ac_power; then
+	elif ! _on_ac_power; then
 		ewarn "Skipping fsck due to not being on AC power"
 		return 0
 	fi
 
 	if [ -n "$fsck_passno" ]; then
 		check_extra="[passno $fsck_passno] $check_extra"
-		if [ -n "$fsck_mnt" ]; then
-			eerror "Only 1 of fsck_passno and fsck_mnt must be set!"
-			return 1
-		fi
 	fi
 	ebegin "Checking local filesystems $check_extra"
-	# Append passno mounts
 	for p in $fsck_passno; do
 		local IFS="$_IFS"
 		case "$p" in
@@ -63,20 +85,11 @@ start()
 		set -- "$@" $(fstabinfo --passno "$p")
 		unset IFS
 	done
-	# Append custom mounts
-	for m in $fsck_mnt ; do
-		local IFS="$_IFS"
-		set -- "$@" "$m"
-		unset IFS
-	done
 
 	if [ "$RC_UNAME" = Linux ]; then
-		local skiptypes
-		skiptypes=$(printf 'no%s,' ${net_fs_list} ${extra_net_fs_list})
-		[ "${skiptypes}" = "no," ] && skiptypes=""
-		fsck_opts="$fsck_opts -C0 -T -t ${skiptypes}noopts=_netdev"
-		if [ -z "$fsck_passno" -a -z "$fsck_mnt" ]; then
-			fsck_args=${fsck_args:--A -p}
+		fsck_opts="$fsck_opts -C0 -T"
+		if [ -z "$fsck_passno" ]; then
+			fsck_args=${fsck_args--A -p}
 			if echo 2>/dev/null >/.test.$$; then
 				rm -f /.test.$$
 				fsck_opts="$fsck_opts -R"
@@ -85,7 +98,7 @@ start()
 	fi
 
 	trap : INT QUIT
-	fsck ${fsck_args:--p} $fsck_opts "$@"
+	fsck ${fsck_args--p} $fsck_opts "$@"
 	case $? in
 	0)	eend 0; return 0;;
 	1)	ewend 1 "Filesystems repaired"; return 0;;
@@ -105,7 +118,7 @@ start()
 			_reboot
 		fi;;
 	8)	ewend 1 "Operational error"; return 0;;
-	12)	ewend 1 "fsck interrupted";;
+	12)	ewend 1 "fsck interupted";;
 	*)	eend 2 "Filesystems couldn't be fixed";;
 	esac
 	_abort || return 1

init.d/hostid.in

@@ -1,6 +1,6 @@
-#!@SBINDIR@/runscript
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# All rights reserved. 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 nojail noprefix
 }
 
 _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,18 +1,16 @@
-#!@SBINDIR@/runscript
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# All rights reserved. Released under the 2-clause BSD license.
 
 description="Sets the hostname of the machine."
 
 depend() {
-	keyword -prefix -lxc
+	keyword noprefix
 }
 
 start()
 {
-	# HOSTNAME variable used to be defined in caps in conf.d/hostname.
-	# It is also a magic variable in bash.
-	hostname=${hostname-${HOSTNAME-localhost}} # checkbashisms: false positive
+	hostname=${hostname-${HOSTNAME-localhost}}
 	ebegin "Setting hostname to $hostname"
 	hostname "$hostname"
 	eend $? "Failed to set the hostname"

init.d/hwclock.in

@@ -1,10 +1,10 @@
-#!@SBINDIR@/runscript
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# All rights reserved. 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 noopenvz noprefix nouml novserver noxenu
 }
 
 setupopts()
@@ -85,23 +85,19 @@ 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
-		if yesno ${clock_hctosys:-YES}; then
-			_hwclock --hctosys $utc_cmd $clock_args
-		else
-			_hwclock --systz $utc_cmd $clock_args
-		fi
-		: $(( retval += $? ))
+		_hwclock --hctosys $utc_cmd $clock_args
+		retval=$(($retval + $?))
 	fi
-
+	
 	eend $retval "Failed to set the system clock"
 
 	return 0
@@ -111,7 +107,7 @@ stop()
 {
 	# Don't tweak the hardware clock on LiveCD halt.
 	[ -n "$CDBOOT" ] && return 0
-	yesno ${clock_systohc:-YES} || return 0
+	yesno $clock_systohc || return 0
 
 	local retval=0 errstr=""
 	setupopts
@@ -122,7 +118,7 @@ stop()
 
 	if ! yesno $clock_adjfile; then
 		# Some implementations don't handle adjustments
-		if LC_ALL=C hwclock --help 2>&1 | grep -q "\-\-noadjfile"; then
+		if LC_ALL=C hwclock --help | grep -q "\-\-noadjfile"; then
 			utc_cmd="$utc_cmd --noadjfile"
 		fi
 	fi
@@ -130,7 +126,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 @@
-#!@SBINDIR@/runscript
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# All rights reserved. Released under the 2-clause BSD license.
 
 # This is based on /etc/rc.firewall and /etc/rc.firewall6 from FreeBSD
 
@@ -8,12 +8,12 @@ ipfw_ip_in=${ipfw_ip_in-any}
 ipfw_ports_in=${ipfw_ports_in-auth ssh}
 ipfw_ports_nolog=${ipfw_ports_nolog-135-139,445 1026,1027 1433,1434}
 
-extra_commands="panic showstatus"
+opts="panic showstatus"
 
 depend() {
 	before net
 	provide firewall
-	keyword -jail
+	keyword nojail
 }
 
 ipfw() {
@@ -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 stateful firewall
+	# Use a statefull 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 stateful filter is a bit aggressive, and will cause some
+	# The statefull filter is a bit agressive, and will cause some
 	# connection teardowns to be logged.
 	ipfw add deny tcp from any 80,443 to any 1024-65535 in
 

init.d/keymaps.in

@@ -1,6 +1,6 @@
-#!@SBINDIR@/runscript
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# All rights reserved. Released under the 2-clause BSD license.
 
 description="Applies a keymap for the consoles."
 
@@ -8,16 +8,16 @@ depend()
 {
 	need localmount termencoding
 	after bootmisc
-	keyword -openvz -prefix -uml -vserver -xenu -lxc
+	keyword noopenvz noprefix nouml novserver noxenu
 }
 
 start()
 {
 	ttyn=${rc_tty_number:-${RC_TTY_NUMBER:-12}}
 	: ${unicode:=$UNICODE}
-	: ${keymap:=$KEYMAP}
+	: =${keymap:=$KEYMAP}
 	: ${extended_keymaps:=$EXTENDED_KEYMAPS}
-	: ${windowkeys:=$SET_WINDOWSKEYS}
+	: ${windowkeys:=$SET_WINDOWSKEYS} 
 	: ${fix_euro:=$FIX_EURO}
 	: ${dumpkeys_charset:=${DUMPKEYS_CHARSET}}
 
@@ -34,36 +34,40 @@ start()
 		echo 1 > /proc/sys/dev/mac_hid/keyboard_sends_linux_keycodes
 	fi
 
-	local wkeys= kmode="-a" msg="ASCII"
+	ebegin "Loading key mappings [$keymap]"
+	local loadkeys_uni= wkeys= kmode="-a" msg="ASCII"
 	if yesno $unicode; then
+		loadkeys_uni="--unicode"
 		kmode="-u"
 		msg="UTF-8"
 	fi
 	yesno $windowkeys && wkeys="windowkeys"
-
-	# Set terminal encoding to either ASCII or UNICODE.
-	# See utf-8(7) for more information.
-	ebegin "Setting keyboard mode [$msg]"
-	n=1
-	while [ $n -le $ttyn ]; do
-		kbd_mode $kmode -C $ttydev$n
-		: $(( n += 1 ))
-	done
-	eend 0
-
-	ebegin "Loading key mappings [$keymap]"
-	loadkeys -q $wkeys $keymap $extended_keymaps
+	loadkeys -q $loadkeys_uni $wkeys $keymap $extended_keymaps
 	eend $? "Error loading key mappings" || return $?
 
 	if yesno $fix_euro; then
 		ebegin "Fixing font for euro symbol"
 		# Fix some fonts displaying the Euro, #173528.
-		echo "altgr keycode 18 = U+20AC" | loadkeys -q -
+		echo "altgr keycode 18 = U+20AC" | loadkeys -q
 		eend $?
 	fi
 
+	# Set terminal encoding to either ASCII or UNICODE.
+	# See utf-8(7) for more information.
+	ebegin "Setting keyboard mode [$msg]"
+	if yesno $unicode; then
+		dumpkeys ${dumpkeys_charset:+-c} \
+			$dumpkeys_charset | loadkeys --unicode
+	fi
+	n=1
+	while [ $n -le $ttyn ]; do
+		kbd_mode $kmode -C $ttydev$n
+		n=$(($n + 1))
+	done
+	eend 0
+
 	# Save the keymapping for use immediately at boot
-	if checkpath -W "$RC_LIBEXECDIR"; then
+	if [ -w "$RC_LIBEXECDIR" ]; then
 		mkdir -p "$RC_LIBEXECDIR"/console
 		dumpkeys >"$RC_LIBEXECDIR"/console/keymap
 	fi

init.d/killprocs.in

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

init.d/local.in

@@ -1,51 +1,43 @@
-#!@SBINDIR@/runscript
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# All rights reserved. Released under the 2-clause BSD license.
 
-description="Executes user programs in @SYSCONFDIR@/local.d"
+description="Executes user commands in /etc/conf.d/local"
 
 depend()
 {
 	after *
-	keyword -timeout
+	keyword notimeout
 }
 
 start()
 {
-	einfo "Starting local"
-
-	local file
-	for file in @SYSCONFDIR@/local.d/*.start ; do
-		[ -x "$file" ] && "$file"
-	done
+	ebegin "Starting local"
 
 	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
 
-	eend 0
+	# Support old configs
+	if [ -e @SYSCONFDIR@/conf.d/local.start ]; then
+		. @SYSCONFDIR@/conf.d/local.start
+	fi
+
+	eend $? "Failed to start local"
 }
 
 stop()
 {
-	einfo "Stopping local"
-
-	local file
-	for file in @SYSCONFDIR@/local.d/*.stop; do
-		[ -x "$file" ] && "$file"
-	done
+	ebegin "Stopping local"
 
 	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
 
-	eend 0
+	# Support old configs
+	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 @@
-#!@SBINDIR@/runscript
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# All rights reserved. Released under the 2-clause BSD license.
 
 description="Mounts disks and swap according to /etc/fstab."
 
@@ -8,26 +8,19 @@ depend()
 {
 	need fsck
 	use lvm modules mtab
-	after lvm modules
-	keyword -jail -openvz -prefix -vserver -lxc
+	keyword nojail noopenvz noprefix novserver
 }
 
 start()
 {
 	# Mount local filesystems in /etc/fstab.
-	local types="noproc" x= no_netdev=
-	for x in $net_fs_list $extra_net_fs_list; do
-		types="${types},no${x}"
+	local types="noproc" x=
+	for x in $net_fs_list; do
+		types="${types},${x}"
 	done
 
-	if [ "$RC_UNAME" = Linux ]; then
-		no_netdev="-O no_netdev"
-		if mountinfo -q /usr; then
-			touch "$RC_SVCDIR"/usr_premounted
-		fi
-	fi
 	ebegin "Mounting local filesystems"
-	mount -at "$types" $no_netdev
+	mount -at "$types"
 	eend $? "Some local filesystem failed to mount"
 
 	# Always return 0 - some local mounts may not be critical for boot
@@ -36,25 +29,23 @@ start()
 
 stop()
 {
-	yesno $RC_GOINGDOWN || return 0
 	# We never unmount / or /dev or $RC_SVCDIR
-
-	# Bug 381783
-	local rc_svcdir=$(printf '%s\n' "$RC_SVCDIR" | sed 's:/lib\(32\|64\)\?/:/lib(32|64)?/:g')
-
-	local x= no_umounts_r="/|/dev|/dev/.*|${rc_svcdir}"
-	no_umounts_r="${no_umounts_r}|/bin|/sbin|/lib(32|64)?|/libexec"
+	local x= no_umounts_r="/|/dev|/dev/.*|${RC_SVCDIR}"
+	no_umounts_r="${no_umounts_r}|/bin|/sbin|/lib|/libexec"
 	# RC_NO_UMOUNTS is an env var that can be set by plugins
-	local IFS="$IFS:"
+	OIFS=$IFS SIFS=${IFS-y}
+	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/.*|/run|/sys|/sys/.*"
-		if [ -e "$rc_svcdir"/usr_premounted ]; then
-			no_umounts_r="$no_umounts_r|/usr"
-		fi
+		no_umounts_r="$no_umounts_r|/proc|/proc/.*|/sys|/sys/.*"
 	fi
 	no_umounts_r="^($no_umounts_r)$"
 
@@ -63,8 +54,8 @@ stop()
 
 	. "$RC_LIBEXECDIR"/sh/rc-mount.sh
 
-	# Umount loop devices
-	einfo "Unmounting loop devices"
+	# Umount loopback devices
+	einfo "Unmounting loopback devices"
 	eindent
 	do_unmount "umount -d" --skip-point-regex "$no_umounts_r" \
 		--node-regex "^/dev/loop"
@@ -75,12 +66,12 @@ stop()
 	einfo "Unmounting filesystems"
 	eindent
 	local fs=
-	for x in $net_fs_list $extra_net_fs_list; do
+	for x in $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/loopback.in

@@ -1,35 +0,0 @@
-#!@SBINDIR@/runscript
-# Copyright (c) 2013 William Hubbs <w.d.hubbs@gmail.com>
-# Released under the 2-clause BSD license.
-
-description="Configures the loopback interface."
-
-depend()
-{
-	return 0
-}
-
-start()
-{
-	if [ "$RC_UNAME" = Linux ]; then
-		ebegin "Bringing up network interface lo"
-		if type ip > /dev/null 2>&1; then
-			ip addr add 127.0.0.1/8 dev lo brd + scope host
-			ip route add 127.0.0.0/8 dev lo scope host
-			ip link set lo up
-		else
-			ifconfig lo 127.0.0.1 netmask 255.0.0.0
-			route add -net 127.0.0.0 netmask 255.0.0.0 gw 127.0.0.1
-		fi
-	else
-		ebegin "Bringing up network interface lo0"
-		ifconfig lo0 127.0.0.1 netmask 255.0.0.0
-		route -q add -inet 127.0.0.0 -netmask 255.0.0.0 127.0.0.1
-	fi
-	eend $?
-}
-
-stop()
-{
-	return 0
-}

init.d/mixer.in

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

init.d/mount-ro.in

@@ -1,19 +1,17 @@
-#!@SBINDIR@/runscript
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# All rights reserved. Released under the 2-clause BSD license.
 
 description="Re-mount filesytems read-only for a clean reboot."
 
 depend()
 {
 	need killprocs savecache
-	keyword -openvz -prefix -vserver -lxc
+	keyword noprefix noopenvz novserver
 }
 
 start()
 {
-	local ret=0
-
 	# Flush all pending disk writes now
 	sync; sync
 
@@ -21,29 +19,28 @@ start()
 	# We need the do_unmount function
 	. "$RC_LIBEXECDIR"/sh/rc-mount.sh
 	eindent
-
-	# Bug 381783
-	local rc_svcdir=$(echo $RC_SVCDIR | sed 's:/lib\(32\|64\)\?/:/lib(32|64)?/:g')
-
-	local m="/dev|/dev/.*|/proc|/proc.*|/sys|/sys/.*|/run|${rc_svcdir}" x= fs=
-	m="$m|/bin|/sbin|/lib(32|64)?|/libexec"
+	local m="/dev|/dev/.*|/proc|/proc.*|/sys|/sys/.*|${RC_SVCDIR}" x= fs=
+	m="$m|/bin|/sbin|/lib|/libexec"
 	# RC_NO_UMOUNTS is an env var that can be set by plugins
-	local IFS="$IFS:"
+	local OIFS=$IFS SIFS=${IFS-y} 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 $extra_net_fs_list; do
+	for x in $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
-	ret=$?
-
+		${fs:+--skip-fstype-regex} $fs --nonetdev
 	eoutdent
-
-	eend $ret
+	eend $?
 }

init.d/moused.in

@@ -1,6 +1,6 @@
-#!@SBINDIR@/runscript
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# All rights reserved. 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 nojail noprefix
 }
 
 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,23 +1,17 @@
-#!@SBINDIR@/runscript
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# All rights reserved. Released under the 2-clause BSD license.
 
 description="Update /etc/mtab to match what the kernel knows about"
 
 depend()
 {
 	need root
-	keyword -prefix
+	keyword noprefix
 }
 
 start()
 {
-	if [ -L /etc/mtab ]
-	then
-		einfo "Skipping mtab update (mtab is a symbolic link)"
-		return 0
-	fi
-
 	ebegin "Updating /etc/mtab"
 	if ! echo 2>/dev/null >/etc/mtab; then
 		ewend 1 "/etc/mtab is not updateable"
@@ -28,7 +22,7 @@ start()
 	# makes / readonly and dismounts all tmpfs even if in use which is
 	# not good. Luckily, umount uses /etc/mtab instead of /proc/mounts
 	# which allows this hack to work.
-	grep -v "^[! ]* / tmpfs " /proc/mounts > /etc/mtab
+	grep -v "^[^ ]* / tmpfs " /proc/mounts > /etc/mtab
 
 	# Remove stale backups
 	rm -f /etc/mtab~ /etc/mtab~~

init.d/net.lo.in

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