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

@@ -2,20 +2,19 @@
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # 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
+SUBDIR=		conf.d etc init.d man sh src
 
 # Build our old net foo or not
-ifeq (${MKOLDNET},yes)
+_OLDNET_SH=	case "${MKOLDNET}" in \
-SUBDIR+=	net doc
+		[Yy][Ee][Ss]) echo "net doc";; \
-endif
+		*) echo "";; \
-
+		esac
-# Build pkgconfig or not
+_OLDNET!=	${_OLDNET_SH}
-MKPKGCONFIG?=	yes
+SUBDIR+=	${_OLDNET}$(shell ${_OLDNET_SH})
-ifeq (${MKPKGCONFIG},yes)
-SUBDIR+=	pkgconfig
-endif
 
 # We need to ensure that runlevels is done last
 SUBDIR+=	runlevels

Makefile.inc

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

README

@@ -4,16 +4,13 @@ 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
 MKPAM=pam
-MKPKGCONFIG=no
-MKRCSYS=prefix
-MKSELINUX=yes
 MKTERMCAP=ncurses
 MKTERMCAP=termcap
 MKOLDNET=yes
@@ -34,20 +31,6 @@ LOCAL_PREFIX should be set when to where user maintained packages are.
 Only set LOCAL_PREFIX if different from PKG_PREFIX.
 PREFIX should be set when OpenRC is not installed to /.
 
-MKRCSYS should be set only if you need to specify a default system
-subtype. The subtype should be set to match the type of environment the
-file is installed into, not the virtualization the environment is
-capable of handling. Here is a list of subtypes and their meanings.
-
-jail	FreeBSD jail
-lxc	Linux container
-openvz	Linux OpenVZ
-prefix	Linux and *BSD prefix system
-uml	UsermodeLinux
-vserver	Linux vserver
-xen0 Linux and NetBSD xen0 Domain
-xenU Linux and NetBSD xenU Domain
-
 If any of the following files exist then we do not overwrite them
 /etc/devd.conf
 /etc/rc
@@ -57,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
@@ -69,17 +52,19 @@ of the system.
 
 
 Reporting Bugs
---------------
+-------------
-Bugs should go to the Gentoo Bugzilla:
+If you installed OpenRC from your chosen distribution, you should report
-	http://bugs.gentoo.org/
+bugs directly to them. For example, if you use Gentoo and emerged OpenRC
-You'll want the "Gentoo Linux" product and the "baselayout" component.
+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.newnet

@@ -1,40 +0,0 @@
-The following applies only to the newnet stack, which is not presently
-maintained in OpenRC. The oldnet stack is maintained instead.
-- Robin H. Johnson <robbat2@gentoo.org>, 2011/02/21
-
-OpenRC Network Ideals
----------------------
-
-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,34 +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;
-}

TODO

@@ -1,7 +1,3 @@
 - ensure all forks block, restore and unblock signals. needs review 
 
 - add support somehow for optional translations
-
-- oldnet[bridging]: Review setting of bridge configuration on dynamic interface add
-
-- Document rc-depend binary.

conf.d/.gitignore

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

conf.d/Makefile

@@ -1,19 +1,14 @@
 DIR=	${CONFDIR}
-CONF=	bootmisc fsck hostname localmount network staticroute urandom
+CONF=	bootmisc fsck hostname local localmount network urandom
 
-TARGETS+=	network staticroute
+TARGETS+=	network
-CLEANFILES+=	network staticroute
+CLEANFILES+=	network
 
 MK=	../mk
 include ${MK}/os.mk
 include Makefile.${OS}
 include ${MK}/scripts.mk
 
-SOS?=	BSD
+network: network.in network.${OS}
-
+	cp network.in network
-network: network.in network.${SOS}
+	[ -e network.${OS} ] && cat network.${OS} >> network || true
-	cp $@.in $@
-	[ -e $@.${SOS} ] && cat $@.${SOS} >> $@ || true
-
-staticroute: staticroute.${SOS}
-	cp $@.${SOS} $@

conf.d/Makefile.FreeBSD

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

conf.d/Makefile.Linux

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

conf.d/Makefile.NetBSD

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

conf.d/consolefont

@@ -3,7 +3,7 @@
 # you shouldn't specify the trailing ".psf.gz", just the font name below.
 # To use the default console font, comment out the CONSOLEFONT setting below.
 # This setting is used by the /etc/init.d/consolefont script (NOTE: if you do
-# not want to use it, run "rc-update del consolefont boot" as root).
+# 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/fsck

@@ -13,11 +13,6 @@
 #fsck_passno=">1"
 #fsck_passno="<2"
 
-# 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,22 +1,14 @@
-# Set CLOCK to "UTC" if your Hardware Clock is set to UTC (also known as
+# Set CLOCK to "UTC" if your system clock is set to UTC (also known as
-# Greenwich Mean Time).  If that clock is set to the local time, then 
+# Greenwich Mean Time).  If 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 
-# (software clock) during shutdown, then say "YES" here.
+# during shutdown, then say "YES" here.
 # You normally don't need to do this if you run a ntp daemon.
 clock_systohc="NO"
 
-# If you want to set the system time to the current hardware clock
-# during bootup, then say "YES" here. You do not need this if you are
-# running a modern kernel with CONFIG_RTC_HCTOSYS set to y.
-# Also, be aware that if you set this to "NO", the system time will
-# never be saved to the hardware clock unless you set
-# clock_systohc="YES" above.
-clock_hctosys="YES"
- 
 # If you wish to pass any other arguments to hwclock during bootup,
 # you may do so here. Alpha users may wish to use --arc or --srm here.
 clock_args=""

conf.d/keymaps

@@ -1,11 +1,9 @@
-# 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.

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/network.BSD

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

@@ -9,6 +9,8 @@
 # You should note that we don't stop the network at system shutdown by default.
 # 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

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

@@ -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"

doc/net.example.BSD.in

@@ -12,7 +12,7 @@
 # kernel then remove the IPv6 address from your config.
 
 # If you want to use a static address or use DHCP explicitly, jump
-# down to the section labeled INTERFACE HANDLERS.
+# 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.
@@ -22,10 +22,10 @@
 #
 # We now support modular networking scripts which means we can easily
 # add support for new interface types and modules while keeping
-# compatibility with existing ones.
+# 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 its package installed
+# 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.
@@ -43,6 +43,11 @@
 #       (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)
@@ -67,12 +72,10 @@
 # If a specified module fails (like dhcp - see below), you can specify a
 # fallback like so
 #fallback_eth0="192.168.0.2 netmask 255.255.255.0"
-#fallback_routes_eth0="default via 192.168.0.1"
+#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.
-# Also, if you do not set a fallback_routes entry for an interface, the
-# routes entry will be used if that is set.
 
 # Some users may need to alter the MTU - here's how
 #mtu_eth0="1500"
@@ -98,8 +101,8 @@
 #modules="iwconfig"
 
 # ifconfig (iwconig) support is a one shot script - wpa_supplicant is daemon
-# that scans, associates and re-configures if association is lost.
+# that scans, assoicates and re-configures if assocation is lost.
-# We call it iwconfig to separate the wireless setup from ifconfig.
+# We call it iwconfig to seperate the wireless setup from ifconfig.
 ####################################
 # HINTS
 #
@@ -184,7 +187,7 @@
 #dns_servers_001122334455="192.168.0.1 192.168.0.2"
 
 # Map a MAC address to an SSID
-# This is used when the Access Point is not broadcasting its SSID
+# 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!
@@ -195,7 +198,7 @@
 # This lists the preferred SSIDs to connect to in order
 # SSID's can contain any characters here as they must match the broadcast
 # SSID exactly.
-# Surround each SSID with the " character and separate them with a space
+# 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"
@@ -210,11 +213,11 @@
 # any other available AP
 # "preferredonly" means it will only connect to visible APs in the preferred
 # list
-# "forcepreferred" means it will forcibly connect to APs in order if it does
+# "forcepreferred" means it will forceably connect to APs in order if it does
 # not find them in a scan
-# "forcepreferredonly" means it forcibly connects to the APs in order and
+# "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
+# "forceany" does the same as forcepreferred + connects to any other 
 # available AP
 # Default is "any"
 #associate_order="any"
@@ -239,12 +242,12 @@
 
 ##################################################
 # wpa_supplicant
-# emerge net-wireless/wpa_supplicant
+# emerge net-wireless/wpa-supplicant
 # Wireless options are held in /etc/wpa_supplicant/wpa_supplicant.conf
-# Consult the wpa_supplicant.conf.example that is installed in
+# Console the wpa_supplicant.conf.example that is installed in
 # /usr/share/doc/wpa_supplicant
 
-# By default we don't wait for wpa_supplicant to associate and authenticate.
+# 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.
@@ -268,13 +271,13 @@
 # won't have associated then)
 
 # If you're using anything else to configure wireless on your interface AND
-# you have installed wpa_supplicant, you need to disable wpa_supplicant
+# you have installed wpa_supplicant, you need to disable wpa_supplicant 
 #modules="!iwconfig !wpa_supplicant"
 #or
 #modules="!wireless"
 
 ##############################################################################
-# WIRELESS SSID IN VARIABLES
+# WIRELESS SSID IN VARIABLES 
 ##############################################################################
 # Remember to change SSID to your SSID.
 # Say that your SSID is My NET - the line
@@ -322,7 +325,7 @@
 # Set generic DHCP options like so
 #dhcp_eth0="release nodns nontp nonis nogateway nosendhost"
 
-# This tells the dhcp client to release its lease when it stops, not to
+# 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
@@ -370,7 +373,7 @@
 
 ##############################################################################
 # ADVANCED CONFIGURATION
-#
+# 
 # Four functions can be defined which will be called surrounding the
 # start/stop operations.  The functions are called with the interface
 # name first so that one function can control multiple adapters. An extra two

doc/net.example.Linux.in

@@ -12,7 +12,7 @@
 # kernel then remove the IPv6 address from your config.
 
 # If you want to use a static address or use DHCP explicitly, jump
-# down to the section labeled INTERFACE HANDLERS.
+# 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.
@@ -23,10 +23,10 @@
 #
 # We now support modular networking scripts which means we can easily
 # add support for new interface types and modules while keeping
-# compatibility with existing ones.
+# 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 its package installed
+# 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.
@@ -49,7 +49,7 @@
 
 ##############################################################################
 # INTERFACE HANDLERS
-#
+# 
 # We provide two interface handlers presently: ifconfig and iproute2.
 # You need one of these to do any kind of network configuration.
 # For ifconfig support, emerge sys-apps/net-tools
@@ -70,6 +70,11 @@
 #       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"
 # However, that only works with CIDR addresses, so you can't use netmask.
+# Or you can use sequence expressions
+#config_eth0="192.168.0.{2..4}/24"
+# 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)
@@ -94,12 +99,10 @@
 # If a specified module fails (like dhcp - see below), you can specify a
 # fallback like so
 #fallback_eth0="192.168.0.2/24"
-#fallback_routes_eth0="default via 192.168.0.1"
+#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.
-# Also, if you do not set a fallback_routes entry for an interface, the
-# routes entry will be used if that is set.
 
 # Some users may need to alter the MTU - here's how
 #mtu_eth0="1500"
@@ -108,7 +111,7 @@
 
 # Each module described below can set a default base metric, lower is
 # preferred over higher. This is so we can prefer a wired route over a
-# wireless route automatically. You can override this by setting
+# wireless route automaticaly. You can override this by setting
 #metric_eth0="100"
 # or on a global basis
 #metric="100"
@@ -255,7 +258,7 @@
 #key_SSID="s:foobar enc open"
 #key_SSID="1234-5678-9012 enc open"
 
-# You may want to set multiple keys - here's an example
+# You may want to set muliple keys - here's an example
 # It sets 4 keys on the card and instructs to use key 2 by default
 #key_SSID="[1] s:passkey1 key [2] s:passkey2 key [3] s:passkey3 key [4] s:passkey4 key [2]"
 
@@ -285,7 +288,7 @@
 #dns_servers_001122334455="192.168.0.1 192.168.0.2"
 
 # Map a MAC address to an SSID
-# This is used when the Access Point is not broadcasting its SSID
+# 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!
@@ -296,10 +299,10 @@
 # This lists the preferred SSIDs to connect to in order
 # SSID's can contain any characters here as they must match the broadcast
 # SSID exactly.
-# Surround each SSID with the " character and separate them with a space
+# 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"
+#preferred_aps="SSID1 SSID2" 
 
 # You can also define a preferred_aps list per interface
 #preferred_aps_eth0="SSID3 SSID4"
@@ -309,9 +312,9 @@
 # "any" means it will connect to visible APs in the preferred list and then any
 # other available AP
 # "preferredonly" means it will only connect to visible APs in the preferred list
-# "forcepreferred" means it will forcibly connect to APs in order if it does not find
+# "forcepreferred" means it will forceably connect to APs in order if it does not find
 # them in a scan
-# "forcepreferredonly" means it forcibly connects to the APs in order and does not bother
+# "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"
@@ -338,16 +341,16 @@
 
 ############################################################
 # wpa_supplicant
-# emerge net-wireless/wpa_supplicant
+# emerge net-wireless/wpa-supplicant
 # Wireless options are held in /etc/wpa_supplicant/wpa_supplicant.conf
-# Consult the wpa_supplicant.conf.example that is installed in
+# Console the wpa_supplicant.conf.example that is installed in
 # /usr/share/doc/wpa_supplicant
 # To configure wpa_supplicant
 #wpa_supplicant_ath0="-Dmadwifi" # For Atheros based cards
 # Consult wpa_supplicant for more drivers - the default is -Dwext which should
 # work for most cards.
 
-# By default we don't wait for wpa_supplicant to associate and authenticate.
+# By default we don't wait for wpa_suppliant to associate and authenticate.
 # If you need to change this behaviour then you don't know how our scripts work
 # and setting this value could cause strange things to happen.
 # If you would like to, so can specify how long in seconds.
@@ -373,13 +376,13 @@
 # won't have associated then)
 
 # If you're using anything else to configure wireless on your interface AND
-# you have installed wpa_supplicant, you need to disable wpa_supplicant
+# you have installed wpa_supplicant, you need to disable wpa_supplicant 
 #modules="!iwconfig !wpa_supplicant"
 #or
 #modules="!wireless"
 
 ##############################################################################
-# WIRELESS SSID IN VARIABLES
+# WIRELESS SSID IN VARIABLES 
 ##############################################################################
 # Remember to change SSID to your SSID.
 # Say that your SSID is My NET - the line
@@ -414,7 +417,7 @@
 # dhclient: emerge net-misc/dhcp
 # dhcpcd:   emerge net-misc/dhcpcd
 # pump:     emerge net-misc/pump
-# udhcpc:   emerge sys-apps/busybox
+# udhcpc:   emerge net-misc/udhcp
 
 # If you have more than one DHCP client installed, you need to specify which
 # one to use - otherwise we default to dhcpcd if available.
@@ -423,7 +426,7 @@
 # Notes:
 # - All clients send the current hostname to the DHCP server by default
 # - dhcpcd does not daemonize when the lease time is infinite
-# - udhcp-0.9.3-r3 and earlier do not support getting NTP servers
+# - udhcp-0.9.3-r3 and earlier do not support getting NTP servers 
 # - pump does not support getting NIS servers
 # - DHCP tends to erase any existing device information - so add
 #   static addresses after dhcp if you need them
@@ -450,7 +453,7 @@
 # Set generic DHCP options like so
 #dhcp_eth0="release nodns nontp nonis nogateway nosendhost"
 
-# This tells the dhcp client to release its lease when it stops, not to
+# 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
@@ -469,7 +472,7 @@
 #fallback_eth0="apipa"
 
 #-----------------------------------------------------------------------------
-# ARPING Gateway configuration
+# ARPING Gateway configuration 
 # and
 # Automatic Private IP Addressing (APIPA)
 # For arpingnet / apipa support, emerge net-misc/iputils or net-analyzer/arping
@@ -529,8 +532,7 @@
 
 #-----------------------------------------------------------------------------
 # VLAN (802.1q support)
-# For VLAN support, emerge sys-apps/iproute2
+# For VLAN support, emerge net-misc/vconfig
-# The old vconfig based VLAN support is no longer available.
 
 # Specify the VLAN numbers for the interface like so
 # Please ensure your VLAN IDs are NOT zero-padded
@@ -540,27 +542,10 @@
 # need it up.
 #config_eth0="null"
 
-# You can also configure the VLAN - see for ip man page for more details
+# You can also configure the VLAN - see for vconfig man page for more details
-# To change the vlan interface name. If not set, the standard "iface.vlanid"
+#vconfig_eth0="set_name_type VLAN_PLUS_VID_NO_PAD"
-# will be used. This is the replacement for the old 'vconfig set_name_type'
+#vconfig_vlan1="set_flag 1
-# functionality.
+#set_egress_map 2 6"
-#vlan1_name="vlan1"
-#vlan2_name="eth0.2"
-
-# The following shows the old set_name_type setting and what new option to set:
-# Using eth9 & VLAN VID 26 as an example.
-# VLAN_PLUS_VID         vlan26_name="vlan0026"
-# VLAN_PLUS_VID_NO_PAD  vlan26_name="vlan26"
-# DEV_PLUS_VID          vlan26_name="eth9.0026"
-# DEV_PLUS_VID_NO_PAD   vlan26_name="eth9.26"
-
-# Set the vlan flags
-#vlan1_flags="reorder_hdr off gvrp on loose_binding on"
-
-# Configure in/egress maps
-#vlan1_ingress="2:6 3:5"
-#vlan1_egress="1:2"
-
 #config_vlan1="172.16.3.1/23"
 #config_vlan2="172.16.2.1/23"
 
@@ -573,7 +558,8 @@
 # This means you do not need to create init scripts in /etc/init.d for each
 # vlan, you must need to create one for the physical interface.
 # If you wish to control the configuration of each vlan through a separate
-# script then you need to do this.
+# script, or wish to rename the vlan interface to something that vconfig
+# cannot then you need to do this.
 #vlan_start_eth0="no"
 
 # If you do the above then you may want to depend on eth0 like so
@@ -591,7 +577,7 @@
 #config_bond0="null" # You may not want to assign an IP the the bond
 
 # You can also configure the bond here, which must be done via sysfs on 2.6
-# kernels or newer. See the kernel bonding documentation for a description of
+# kernels or newer. See the kernel bonding documention for a description of
 # these options.
 #arp_ip_target_bond0="+26.0.0.0"
 
@@ -601,7 +587,7 @@
 
 
 #-----------------------------------------------------------------------------
-# Classical IP over ATM
+# Classical IP over ATM 
 # For CLIP support emerge net-dialup/linux-atm
 
 # Ensure that you have /etc/atmsigd.conf setup correctly
@@ -639,7 +625,7 @@
 #
 # Here you should specify what pppd plugins you want to use
 # Available plugins are: pppoe, pppoa, capi, dhcpc, minconn, radius,
-#			 radattr, radrealms and winbind
+#			 radattr, radrealms and winbind 
 #plugins_ppp0="pppoe"			# Required plugin for PPPoE
 #plugins_ppp0="pppoa vc-encaps"		# Required plugin for PPPoA with an option
 #plugins_ppp0="capi"			# Required plugin for ISDN
@@ -677,9 +663,9 @@
 #
 # Dead peer detection
 #	lcp-echo-interval 15	# Send a LCP echo every 15 seconds
-#	lcp-echo-failure 3	# Make peer dead after 3 consecutive
+#	lcp-echo-failure 3	# Make peer dead after 3 consective
 #				# echo-requests
-#
+#	
 # Compression options - use these to completely disable compression
 #	noaccomp noccp nobsdcomp nodeflate nopcomp novj novjccomp
 #
@@ -806,18 +792,11 @@
 #bridge_add_eth0="br0"
 #bridge_add_eth1="br0"
 
-# NOTE: If you want to manually start an empty bridge, and then dynamically add
+# You need to configure the ports to null values so dhcp does not get started 
-# ports to it you must set at least one of the following variables based on the
-# interface name, so that we can pick it up from your configuration. Even an
-# empty value variable is fine, but at least one of them must be set:
-# brctl_IFVAR
-
-# You need to configure the ports to null values so dhcp does not get started
 #config_eth0="null"
 #config_eth1="null"
 
-# Finally give the bridge an address - dhcp or a static IP, this is assigned to
+# Finally give the bridge an address - dhcp or a static IP
-# the bridge when the bridge is explicitly started.
 #config_br0="dhcp" # may not work when adding ports dynamically
 #config_br0="192.168.0.1/24"
 
@@ -831,15 +810,8 @@
 #sethello 0
 #stp off"
 
-# You can also configure the bridge or bridge members via sysfs on 2.6 kernels
-# or newer. See the kernel bridge documentation for a description of these
-# options.
-#stp_state_br0="0"
-#forward_delay_br0="10"
-#hairpin_mode_eth0="1"
-
 #-----------------------------------------------------------------------------
-# RFC 2684 Bridge Support
+# RFC 2684 Bridge Support 
 # For RFC 2684 bridge support emerge net-misc/br2684ctl
 
 # Interface names have to be of the form nas0, nas1, nas2, etc.
@@ -855,8 +827,8 @@
 #config_nas0="'192.168.0.1/24'"
 
 #-----------------------------------------------------------------------------
-# Tunneling
+# Tunnelling
-# WARNING: For tunneling it is highly recommended that you
+# WARNING: For tunnelling it is highly recommended that you
 # emerge sys-apps/iproute2
 #
 # For GRE tunnels
@@ -871,7 +843,7 @@
 
 # 6to4 Tunnels allow IPv6 to work over IPv4 addresses, provided you
 # have a non-private address configured on an interface.
-# link_6to4="eth0"		# Interface to base its addresses on
+# link_6to4="eth0"		# Interface to base it's addresses on
 # config_6to4="ip6to4"
 # You may want to depend on eth0 like so
 #rc_need_6to4="net.eth0"
@@ -881,56 +853,10 @@
 # sit0 - otherwise use a different name like 6to4 in the example above.
 
 # You can also specify a relay and suffix if you like.
-# The default relay is 192.88.99.1 and the default suffix is :1
+# The default relay is 192.88.99.1 and the defualt suffix is :1
 #relay_6to4="192.168.3.2"
 #suffix_6to4=":ff"
 
-#-----------------------------------------------------------------------------
-# Advanced Routing
-# WARNING: For advanced routing you MUST be using sys-apps/iproute2
-#
-# This provides a means to do multi-homing and more using the Routing Policy
-# Database (RPDB).
-#
-# See the following links for background and more information.
-# http://linux-ip.net/html/ch-routing.html
-# http://linux-ip.net/html/ch-advanced-routing.html
-
-# The rules listed will be added with 'ip rule add LINE' when the interface is
-# being brought up. They will also be removed with 'ip rule delete LINE'.
-# The rules added are also stored for later removal, so if you alter your rules
-# directly before stopping, you should review your rules again after stopping.
-
-# Note in earlier versions of openrc, this was provided as an example in
-# postup/postdown, however that implementation suffered some bugs in corner
-# cases, which are now fixed with this merger. If you used the previous
-# example, you should only need to drop the relevent portions of your
-# postup/postdown functions, and review the quoting in your rules_IFACE
-# variables.
-
-# Below is a trivial example for a dual-homed connection where there is an OOB
-# management network. Only packets explicitly with an address from or to the
-# OOB are sent via eth0. All others go via eth1 as the eth1 rules have a lower
-# priority.
-
-# If you want to use names for your tables, you should put lines into
-# /etc/iproute2/rt_tables, an example follows:
-# 2 oob
-# 3 external
-
-#rules_eth0="
-#from ZZZ.ZZZ.200.128/27 table oob priority 500
-#to ZZZ.ZZZ.200.128/27 table oob priority 550"
-#rules_eth1="
-#from XXX.XXX.112.0/24 table external priority 400
-#to XXX.XXX.112.0/24 table external priority 450"
-#routes_eth0="
-#ZZZ.ZZZ.200.128/27 dev eth0 table oob scope link
-#default via ZZZ.ZZZ.200.129 table oob"
-#routes_eth1="
-#XXX.XXX.112.0/24 dev eth1 table external scope link
-#default via XXX.XXX.112.1 dev eth1"
-
 
 #-----------------------------------------------------------------------------
 # System
@@ -975,12 +901,10 @@
 # and you're done :)
 
 # By default we don't wait for netplug/ifplugd to configure the interface.
-# If you would like it to wait so that other services know that network is
+# If you would like it to wait so that other services now that network is up
-# up then you can specify a timeout here. A value of 0 means wait forever,
+# then you can specify a timeout here.
-# and a negative value means never wait.
-#plug_timeout_eth0="10"
-# If you want to set it for all interfaces:
 #plug_timeout="10"
+# A value of 0 means wait forever.
 
 # If you don't want to use netplug on a specific interface but you have it
 # installed, you can disable it for that interface via the modules statement
@@ -994,75 +918,9 @@
 #ifplugd_eth0="--api-mode=wlan"
 # man ifplugd for more options
 
-#-----------------------------------------------------------------------------
-# Interface hardware tuning & configuration via ethtool
-# If you need to change explicit hardware settings on your network card prior
-# to bringing the interface up, the following is available.
-#
-# For a full listing of settings, please consulting ethtool(8) and the output
-# of "ethtool --help".
-#
-# Multiple entries (seperated by newlines) are supported in all of the
-# variables as some settings cannot be changed at the same time.
-#
-# Valid variable name fragments: change pause coalesce ring offload
-# change_eeprom identify nfc flash rxfh_indir ntuple
-
-# Set Wake-On-Lan to listen for SecureOn MagicPacket(tm), the message level to
-# notify us of WOL changes, and the SecureOn password to 'DE:AD:BE:EF:CA:FE'.
-#ethtool_change_eth0="wol gs
-#msglvl wol on
-#sopass DE:AD:BE:EF:CA:FE"
-
-# Disable pause auto-negotiation and explicitly enable RX and TX pause.
-#ethtool_pause_eth0="autoneg off
-#rx on tx on"
-
-# Enasble adaptive RX and TX coalescing
-#ethtool_coalesce_eth0="adaptive-rx on adaptive-tx on"
-
-# Change ring buffer settings
-#ethtool_ring_eth0=""
-
-# Enable all offload settings
-#ethtool_offload_eth0="rx on tx on sg on tso on ufo on gso on gro on lro on"
-
-# Change specific bytes in the EEPROM
-#ethtool_change_eeprom_eth0=""
-
-# Run the identify sequence on the interface for 1 second (does not return until completion)
-#ethtool_identify_eth0="1"
-
-# Configure receive network flow classification
-#ethtool_nfc_eth0="
-#rx-flow-hash tcp4 f
-#rx-flow-hash udp4 s"
-
-# Flash firmware to all regions
-#ethtool_flash_eth0="/some/path/firmware1 0"
-
-# Flash firmware to region 1
-#ethtool_flash_eth0="/some/path/firmware2 1"
-
-# Set receive flow hash indirection table for even balancing between N receive queues
-#ethtool_rxfh_indir_eth0="equal 4"
-
-# Configure Rx ntuple filters and actions
-#ethtool_ntuple_eth0=""
-
-# Additionally, there is a special control variable, if you need to change the
-# order of option processing. The default order is:
-# flash change-eeprom change pause coalesce ring offload identify nfc rxfh-indir ntuple
-
-# Set global order to default
-#ethtool_order="flash change-eeprom change pause coalesce ring offload identify nfc rxfh-indir ntuple"
-
-# Hypothetical network card that requires a change-eeprom toggle to enable flashing
-#ethtool_order_eth0="change-eeprom flash change pause coalesce ring offload nfc rxfh-indir ntuple"
-
 ##############################################################################
 # ADVANCED CONFIGURATION
-#
+# 
 # Four functions can be defined which will be called surrounding the
 # start/stop operations.  The functions are called with the interface
 # name first so that one function can control multiple adapters. An extra two
@@ -1083,12 +941,12 @@
 
 #preup() {
 #	# Test for link on the interface prior to bringing it up.  This
-#	# only works on some network adapters and requires the
+#	# only works on some network adapters and requires the mii-diag
-#	# sys-apps/net-tools package to be installed.
+#	# package to be installed.
 #	if mii-tool "${IFACE}" 2> /dev/null | grep -q 'no link'; then
 #		ewarn "No link on ${IFACE}, aborting configuration"
 #		return 1
-#	fi
+#	fi 
 #
 #	# Test for link on the interface prior to bringing it up.  This
 #	# only works on some network adapters and requires the ethtool
@@ -1127,6 +985,33 @@
 #	# This function could be used, for example, to register with a
 #	# dynamic DNS service.  Another possibility would be to
 #	# send/receive mail once the interface is brought up.
+
+#	# Here is an example that allows the use of iproute rules
+#	# which have been configured using the rules_eth0 variable.
+#	#rules_eth0=" \
+#	#	'from 24.80.102.112/32 to 192.168.1.0/24 table localnet priority 100' \
+#	#	'from 216.113.223.51/32 to 192.168.1.0/24 table localnet priority 100' \
+#	#"
+#	eval set -- $\rules_${IFVAR}
+#	if [ $# != 0 ]; then
+#		einfo "Adding IP policy routing rules"
+#		eindent
+#		# Ensure that the kernel supports policy routing
+#		if ! ip rule list | grep -q "^"; then
+#			eerror "You need to enable IP Policy Routing (CONFIG_IP_MULTIPLE_TABLES)"
+#			eerror "in your kernel to use ip rules"
+#		else
+#			for x; do
+#				ebegin "${x}"
+#				ip rule add ${x} dev "${IFACE}"
+#				eend $?
+#			done
+#		fi
+#		eoutdent
+#		# Flush the cache
+#		ip route flush cache dev "${IFACE}"
+#	fi
+
 #}
 
 #postdown() {
@@ -1134,6 +1019,21 @@
 #	# Probably a good idea to set ifdown="no" in /etc/conf.d/net
 #	# as well ;)
 #	[ "${IFACE}" != "lo" ] && ethtool -s "${IFACE}" wol g
+
+#	Automatically erase any ip rules created in the example postup above
+#	if interface_exists "${IFACE}"; then
+#		# Remove any rules for this interface
+#		local rule
+#		ip rule list | grep " iif ${IFACE}[ ]*" | {
+#			while read rule; do
+#				rule="${rule#*:}"	
+#				ip rule del ${rule}
+#			done
+#		}
+#		# Flush the route cache
+#		ip route flush cache dev "${IFACE}"
+#	fi
+
 #	# Return 0 always
 #	return 0
 #}

etc/Makefile

@@ -7,15 +7,3 @@ MK=	../mk
 include ${MK}/os.mk
 include Makefile.${OS}
 include ${MK}/scripts.mk
-
-# We can't use "ifndef" here because that treats set-but-empty
-# as not-set which is not what we want
-MKRCSYS ?= automagicplease
-ifeq ($(MKRCSYS),automagicplease)
-# If the user isn't picking a default, then have the
-# config go with runtime automagic detection #357247
-rc.conf: SED_EXTRA += -e '/^rc_sys=""/s:^:\#:'
-MKRCSYS =
-endif
-rc.conf: rc.conf.in rc.conf.${OS}
-	${SED} ${SED_REPLACE} ${SED_EXTRA} $^ > $@

etc/Makefile.Linux

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

etc/rc.conf.FreeBSD

@@ -1,14 +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 attempted.
-# Note that automatic detection does not work in a prefix environment.
-#
-# This should be set to the value representing the environment this file is
-# PRESENTLY in, not the virtualization the environment is capable of.
-rc_sys="@RC_SYS_DEFAULT@"
-

etc/rc.conf.Linux

@@ -1,23 +1,7 @@
+
 ##############################################################################
 # 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 attempted.
-# Note that autodetection will not work in a prefix environment or in a
-# linux container.
-#
-# This should be set to the value representing the environment this file is
-# PRESENTLY in, not the virtualization the environment is capable of.
-rc_sys="@RC_SYS_DEFAULT@"
-
 # This is the number of tty's used in most of the rc-scripts (like
 # consolefont, numlock, etc ...)
 rc_tty_number=12

etc/rc.conf.NetBSD

@@ -1,15 +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 attempted.
-# Note that automatic detection does not work in a prefix environment.
-#
-# This should be set to the value representing the environment this file is
-# PRESENTLY in, not the virtualization the environment is capable of.
-rc_sys="@RC_SYS_DEFAULT@"
-

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
+# this feature.
-# set to YES.
 #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
@@ -76,14 +75,8 @@
 # Set unicode to YES to turn on unicode support for keyboards and screens.
 #unicode="NO"
 
-# Below is the default list of network fstypes.
+# Network fstypes. Below is the default.
-#
+net_fs_list="afs cifs coda davfs fuse gfs ncpfs nfs nfs4 ocfs2 shfs smbfs"
-# afs cifs coda davfs fuse fuse.sshfs gfs glusterfs lustre ncpfs
-# nfs nfs4 ocfs2 shfs smbfs
-#
-# If you would like to add to this list, you can do so by adding your
-# own fstypes to the following variable.
-#extra_net_fs_list=""
 
 ##############################################################################
 # SERVICE CONFIGURATION VARIABLES
@@ -95,7 +88,7 @@
 # We can set some things on a per service basis, like the nicelevel.
 #export SSD_NICELEVEL="-19"
 
-# Pass ulimit parameters
+# Pass ulimit parameters 
 #rc_ulimit="-u 30"
 
 # It's possible to define extra dependencies for services like so
@@ -115,4 +108,3 @@
 # You can also remove dependencies.
 # This is mainly used for saying which servies do NOT provide net.
 #rc_net_tap0_provide="!net"
-

etc/rc.in

@@ -6,7 +6,7 @@
 # This gives us a nice colour boot :)
 [ -z "$TERM" -o "$TERM" = "dumb" ] && export TERM="@TERM@"
 
-# Handle interrupts
+# Handle interrupts 
 trap : SIGINT
 trap "echo 'Boot interrupted'; exit 1" SIGQUIT
 

etc/rc.shutdown.in

@@ -2,7 +2,7 @@
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # 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

init.d.misc/.gitignore

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

init.d.misc/dnsmasq.in

@@ -10,7 +10,7 @@ required_files=/etc/dnsmasq.conf
 extra_started_commands="reload"
 
 depend()
-{
+{	
 	provide dns
 	need localmount net
 	after bootmisc

init.d.misc/openvpn.in

@@ -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/sshd.in

@@ -31,5 +31,5 @@ start_pre()
 		eend $? || return 1
 	fi
 
-	$command -t
+	$command -t	
 }

init.d.misc/wpa_supplicant.in

@@ -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 \
+			if [ -e "$iface"/wireless ]; then
-				-e "$iface"/phy80211 ]
-			then
 				echo "${iface##*/}"
 				return 0
 			fi
@@ -43,7 +41,7 @@ find_wireless()
 		done
 		;;
 	esac
-
+	
 	return 1
 }
 

init.d/.gitignore

@@ -24,7 +24,6 @@ mount-ro
 mtab
 numlock
 procfs
-staticroute
 sysfs
 devdb
 hostid
@@ -35,8 +34,6 @@ rc-enabled
 rpcbind
 savecore
 swap-blk
-swclock
 syslogd
-termencoding
 ttys
 wscons

init.d/Makefile

@@ -1,14 +1,15 @@
 DIR=	${INITDIR}
 SRCS=	bootmisc.in fsck.in hostname.in local.in localmount.in netmount.in \
-	network.in root.in savecache.in staticroute.in swap.in swclock.in \
+	network.in root.in savecache.in swap.in sysctl.in urandom.in
-	sysctl.in urandom.in
 BIN=	${OBJS}
 
 # Build our old net foo or not
-ifeq (${MKOLDNET},yes)
+_OLDNET_SH=	case "${MKOLDNET}" in \
-_OLDNET=	net.lo
+		[Yy][Ee][Ss]) echo "net.lo";; \
-endif
+		*) echo "";; \
-_NET_LO=	${_OLDNET}
+		esac
+_OLDNET!=	${_OLDNET_SH}
+_NET_LO=	${_OLDNET}$(shell ${_OLDNET_SH})
 
 INSTALLAFTER=	_installafter_${_NET_LO}
 CLEANFILES+=	${_NET_LO}

init.d/adjkerntz.in

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

@@ -4,10 +4,11 @@
 
 depend()
 {
+	use hostname
 	need localmount
 	before logger
 	after clock sysctl
-	keyword -prefix -timeout
+	keyword noprefix
 }
 
 dir_writeable()
@@ -25,40 +26,39 @@ cleanup_tmp_dir()
 		mkdir -p "$dir" || return $?
 	fi
 	dir_writeable "$dir" || return 1
-	chmod a+rwt "$dir" 2> /dev/null
+	chmod +t "$dir"
-	cd "$dir" || return 1
+	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
+		# Faster than find
-		if ! rm -rf -- [^ajlq\.]* 2>/dev/null ; then
+		rm -rf -- [^ajlq\.]*
-			# Blah, too many files
-			find . -maxdepth 1 -name '[^ajlq\.]*' -exec rm -rf -- {} +
-		fi
 
-		# pam_mktemp creates a .private directory within which
+		find $startopts ! -name . \
-		# each user gets a private directory with immutable
+			! -path "./lost+found" \
-		# bit set; remove the immutable bit before trying to
+			! -path "./lost+found/*" \
-		# remove it.
+			! -path "./quota.user" \
-		[ -d /tmp/.private ] && chattr -R -a /tmp/.private 2> /dev/null
+			! -path "./quota.user/*" \
-
+			! -path "./aquota.user" \
-		# Prune the paths that are left
+			! -path "./aquota.user/*" \
-		find . -maxdepth 1 \
+			! -path "./quota.group" \
-			! -name . \
+			! -path "./quota.group/*" \
-			! -name lost+found \
+			! -path "./aquota.group" \
-			! -name quota.user \
+			! -path "./aquota.group/*" \
-			! -name aquota.user \
+			! -path "./journal" \
-			! -name quota.group \
+			! -path "./journal/*" \
-			! -name aquota.group \
+			! -path "./.private" \
-			! -name journal \
+			! -path "./.private/*" \
-			-exec rm -rf -- {} +
+			-exec rm -rf {} \;
 		eend 0
 	else
 		ebegin "Cleaning $dir directory"
-		rm -rf -- .X*-lock esrv* kio* \
+		rm -rf -- "$dir"/.X*-lock "$dir"/esrv* "$dir"/kio* \
-			jpsock.* .fam* .esd* \
+			"$dir"/jpsock.* "$dir"/.fam* "$dir"/.esd* \
-			orbit-* ssh-* ksocket-* \
+			"$dir"/orbit-* "$dir"/ssh-* "$dir"/ksocket-* \
-			.*-unix
+			"$dir"/.*-unix
 		eend 0
 	fi
 }
@@ -74,18 +74,17 @@ mkutmp()
 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
-	[ "$RC_UNAME" = Linux ] && extra=/var/lib/misc # Satisfy Linux FHS
+	for x in /var/log /var/run /tmp; do
-	for x in /var/log /var/run /tmp $extra; do
 		if ! [ -d $x ]; then
 			if ! mkdir -p $x; then
 				eend 1 "failed to create needed directory $x"
 				return 1
 			fi
-		fi
+		fi 
 	done
 
 	if dir_writeable /var/run; then
@@ -95,7 +94,7 @@ start()
 		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
 
 		ebegin "Cleaning /var/run"
@@ -106,7 +105,7 @@ start()
 			# Clean stale sockets
 			if [ -S "$x" ]; then
 				if type fuser >/dev/null 2>&1; then
-					fuser "$x" >/dev/null 2>&1 || rm -- "$x"
+					fuser "$x" 2>/dev/null || rm -- "$x"
 				else
 					rm -- "$x"
 				fi
@@ -134,7 +133,7 @@ start()
 		# 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
@@ -150,7 +149,7 @@ start()
 		fi
 	fi
 
-	[ -w /etc/nologin ] && rm -f /etc/nologin
+	rm -f /etc/nologin
 	return 0
 }
 

init.d/consolefont.in

@@ -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,10 +45,8 @@ start()
 	[ -d /dev/vc ] && ttydev=/dev/vc/
 	x=1
 	while [ $x -le $ttyn ]; do
-		if ! setfont $consolefont $param -C $ttydev$x >/dev/null; then
+		setfont $consolefont $param -C $ttydev$x >/dev/null 
-			retval=1
+		retval=$(($retval + $?))
-			break
-		fi
 		x=$(($x + 1))
 	done
 	eend $retval
@@ -61,6 +59,12 @@ start()
 		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

@@ -10,7 +10,7 @@ depend() {
 	need localmount
 	after bootmisc
 	before net.lo0
-	keyword -jail -prefix
+	keyword nojail noprefix
 }
 
 start_pre() {

init.d/devfs.in

@@ -6,7 +6,7 @@ description="Mount system critical filesystems in /dev."
 
 depend() {
 	use dev
-	keyword -prefix -vserver
+	keyword noprefix novserver
 }
 
 start() {

init.d/dmesg.in

@@ -7,7 +7,7 @@ description="Set the dmesg level for a cleaner boot"
 depend()
 {
 	before dev modules
-	keyword -vserver
+	keyword novserver
 }
 
 start()

init.d/dumpon.in

@@ -6,7 +6,7 @@ description="Configures a specific kernel dump device."
 
 depend() {
 	need swap
-	keyword -jail -prefix
+	keyword nojail noprefix
 }
 
 start() {

init.d/fsck.in

@@ -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,7 +68,7 @@ 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

init.d/hostid.in

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

@@ -5,7 +5,7 @@
 description="Sets the hostname of the machine."
 
 depend() {
-	keyword -prefix -lxc
+	keyword noprefix
 }
 
 start()

init.d/hwclock.in

@@ -4,7 +4,7 @@
 
 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()
@@ -87,21 +87,17 @@ start()
 		_hwclock --adjust $utc_cmd
 		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; then
+		_hwclock --hctosys $utc_cmd $clock_args
-			_hwclock --hctosys $utc_cmd $clock_args
-		else
-			_hwclock --systz $utc_cmd $clock_args
-		fi
 		retval=$(($retval + $?))
 	fi
-
+	
 	eend $retval "Failed to set the system clock"
 
 	return 0
@@ -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

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

init.d/keymaps.in

@@ -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,25 +34,15 @@ 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"
-
+	loadkeys -q $loadkeys_uni $wkeys $keymap $extended_keymaps
-	# 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=$(($n + 1))
-	done
-	eend 0
-
-	ebegin "Loading key mappings [$keymap]"
-	loadkeys -q $wkeys $keymap $extended_keymaps
 	eend $? "Error loading key mappings" || return $?
 
 	if yesno $fix_euro; then
@@ -62,6 +52,20 @@ start()
 		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 [ -w "$RC_LIBEXECDIR" ]; then
 		mkdir -p "$RC_LIBEXECDIR"/console

init.d/killprocs.in

@@ -6,7 +6,7 @@ description="Kill all processes so we can unmount disks cleanly."
 
 depend()
 {
-	keyword -prefix
+	keyword noprefix
 }
 
 start()
@@ -15,7 +15,7 @@ start()
 	killall5 -15
 	sleep 1
 	eend 0
-	ebegin "Killing remaining processes"
+	ebegin "Killing remaining processes"	
 	killall5 -9
 	sleep 1
 	eend 0

init.d/local.in

@@ -2,50 +2,42 @@
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # 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"
+	ebegin "Starting local"
-
-	local file
-	for file in @SYSCONFDIR@/local.d/*.start ; do
-		[ -x "$file" ] && "$file"
-	done
 
 	if type local_start >/dev/null 2>&1; then
-		ewarn "@SYSCONFDIR@/conf.d/local should be removed."
-		ewarn "Please move the code from the local_start function"
-		ewarn "to scripts with an .start extension"
-		ewarn "in @SYSCONFDIR@/local.d"
 		local_start
 	fi
 
-	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"
+	ebegin "Stopping local"
-
-	local file
-	for file in @SYSCONFDIR@/local.d/*.stop; do
-		[ -x "$file" ] && "$file"
-	done
 
 	if type local_start >/dev/null 2>&1; then
-		ewarn "@SYSCONFDIR@/conf.d/local should be removed."
-		ewarn "Please move the code from the local_stop function"
-		ewarn "to scripts with an .stop extension"
-		ewarn "in @SYSCONFDIR@/local.d"
 		local_stop
 	fi
 
-	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

@@ -8,23 +8,19 @@ depend()
 {
 	need fsck
 	use lvm modules mtab
-	after lvm modules
+	keyword nojail noopenvz noprefix novserver
-	keyword -jail -openvz -prefix -vserver -lxc
 }
 
 start()
 {
 	# Mount local filesystems in /etc/fstab.
-	local types="noproc" x= no_netdev=
+	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"
-	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
@@ -49,7 +45,7 @@ stop()
 	fi
 
 	if [ "$RC_UNAME" = Linux ]; then
-		no_umounts_r="$no_umounts_r|/proc|/proc/.*|/run|/sys|/sys/.*"
+		no_umounts_r="$no_umounts_r|/proc|/proc/.*|/sys|/sys/.*"
 	fi
 	no_umounts_r="^($no_umounts_r)$"
 
@@ -58,8 +54,8 @@ stop()
 
 	. "$RC_LIBEXECDIR"/sh/rc-mount.sh
 
-	# Umount loop devices
+	# Umount loopback devices
-	einfo "Unmounting loop devices"
+	einfo "Unmounting loopback devices"
 	eindent
 	do_unmount "umount -d" --skip-point-regex "$no_umounts_r" \
 		--node-regex "^/dev/loop"

init.d/mixer.in

@@ -7,7 +7,7 @@ extra_commands="restore"
 depend()
 {
 	need localmount
-	keyword -jail -prefix
+	keyword nojail noprefix
 }
 
 restore()

init.d/modules.in

@@ -7,7 +7,7 @@ description="Loads a user defined list of kernel modules."
 depend()
 {
 	use isapnp
-	keyword -openvz -prefix -vserver -lxc
+	keyword noopenvz noprefix novserver
 }
 
 start()

init.d/mount-ro.in

@@ -7,7 +7,7 @@ description="Re-mount filesytems read-only for a clean reboot."
 depend()
 {
 	need killprocs savecache
-	keyword -prefix -openvz -vserver -lxc
+	keyword noprefix noopenvz novserver
 }
 
 start()

init.d/moused.in

@@ -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,7 +49,7 @@ start()
 		--pidfile "$pidfile" \
 		-- $args -p "$moused_device" -I "$pidfile"
 	local retval=$?
-
+	
 	if [ $retval = 0 ]; then
 		local ttyv=
 		for ttyv in /dev/ttyv*; do
@@ -57,6 +57,6 @@ start()
 			: $((retval+= $?))
 		done
 	fi
-
+	
 	eend $retval "Failed to start moused"
 }

init.d/mtab.in

@@ -7,17 +7,11 @@ description="Update /etc/mtab to match what the kernel knows about"
 depend()
 {
 	need root
-	keyword -prefix
+	keyword noprefix
 }
 
 start()
 {
-	# /etc/mtab could be a symlink to /proc/mounts
-	if [ ! -w /etc/mtab -a -L /etc/mtab ]; then
-		eeinfo "Skipping mtab update (non writeable symlink)"
-		return 0
-	fi
-
 	ebegin "Updating /etc/mtab"
 	if ! echo 2>/dev/null >/etc/mtab; then
 		ewend 1 "/etc/mtab is not updateable"

init.d/net.lo.in

@@ -21,7 +21,7 @@ depend()
 	need localmount
 	after bootmisc
 	provide net
-	keyword -jail -prefix -vserver
+	keyword nojail noprefix novserver
 
 	case "${IFACE}" in
 		lo|lo0);;
@@ -180,7 +180,7 @@ _gen_module_list()
 		${update} || return 0
 	fi
 
-	einfo "Caching network module dependencies"
+	einfo "Caching network module dependencies" 
 	# Run in a subshell to protect the main script
 	(
 	after() {
@@ -215,7 +215,7 @@ _gen_module_list()
 
 	for MODULE in "${MODULESDIR}"/*.sh; do
 		sh -n "${MODULE}" || continue
-		. "${MODULE}" || continue
+		. "${MODULE}" || continue 
 		MODULE=${MODULE#${MODULESDIR}/}
 		MODULE=${MODULE%.sh}
 		eval ${MODULE}_depend
@@ -343,7 +343,7 @@ _load_modules()
 
 		# Wrap our provides
 		local f=
-		for f in pre_start start post_start; do
+		for f in pre_start start post_start; do 
 			eval "${provides}_${f}() { [ "$(command -v "${mod}_${f}")" = "${mod}_${f}" ] || return 0; ${mod}_${f} \"\$@\"; }"
 		done
 
@@ -357,7 +357,7 @@ _load_modules()
 			*" ${mod} "*)
 			eval x=\$module_${mod}_provides
 			[ -z "${x}" ] && continue
-			for f in pre_start start post_start; do
+			for f in pre_start start post_start; do 
 				eval "${x}_${f}() { [ "$(command -v "${mod}_${f}")" = "${mod}_${f}" ] || return 0; ${mod}_${f} \"\$@\"; }"
 			done
 			eval module_${x}_providedby="${mod}"
@@ -379,7 +379,7 @@ _load_modules()
 			MODULES="${MODULES}${MODULES:+ }${mod}"
 		done
 	else
-		for mod in ${LIST}; do
+		for mod in ${LIST}; do 
 			MODULES="${mod}${MODULES:+ }${MODULES}"
 		done
 	fi
@@ -395,14 +395,14 @@ _load_config()
 	config_index=0
 	local IFS="$__IFS"
 	set -- ${config}
-
+	
 	# We should support a space separated array for cidr configs
 	if [ $# = 1 ]; then
 		unset IFS
 		set -- ${config}
 		# Of course, we may have a single address added old style.
 		case "$2" in
-			netmask|broadcast|brd|brd+|peer|pointopoint)
+			netmask|broadcast|brd|brd+)
 				local IFS="$__IFS"
 				set -- ${config}
 				;;
@@ -415,7 +415,7 @@ _load_config()
 		   	config_0="127.0.0.1/8"
 			config_index=1
 		fi
-	else
+	else	
 		if [ -z "$1" ]; then
 			ewarn "No configuration specified; defaulting to DHCP"
 			config_0="dhcp"
@@ -476,7 +476,7 @@ interface_down()
 
 start()
 {
-	local IFACE=${RC_SVCNAME#*.} oneworked=false fallback=false module=
+	local IFACE=${RC_SVCNAME#*.} oneworked=false module=
 	local IFVAR=$(shell_var "${IFACE}") cmd= our_metric=
 	local metric=0
 
@@ -500,7 +500,7 @@ start()
 	fi
 
 	_up 2>/dev/null
-
+	
 	for module in ${MODULES}; do
 		if [ "$(command -v "${module}_pre_start")" = "${module}_pre_start" ]; then
 			${module}_pre_start || exit $?
@@ -527,7 +527,7 @@ start()
 	_load_config
 	config_index=0
 
-	eval our_metric=\$metric_${IFVAR}
+	eval our_metric=\$metric_${IFVAR} 
 	if [ -n "${our_metric}" ]; then
 		metric=${our_metric}
 	elif [ "${IFACE}" != "lo" -a "${IFACE}" != "lo0" ]; then
@@ -536,7 +536,7 @@ start()
 
 	while true; do
 		eval config=\$config_${config_index}
-		[ -z "${config}" ] && break
+		[ -z "${config}" ] && break 
 
 		set -- ${config}
 		ebegin "$1"
@@ -563,7 +563,6 @@ start()
 		else
 			eval config=\$fallback_${config_index}
 			if [ -n "${config}" ]; then
-				fallback=true
 				eoutdent
 				ewarn "Trying fallback configuration ${config}"
 				eindent
@@ -586,13 +585,8 @@ start()
 		return 1
 	fi
 
-	local hidefirstroute=false first=true routes=
+	local hidefirstroute=false first=true
-	if ${fallback}; then
+	local routes="$(_get_array "routes_${IFVAR}")"
-		routes="$(_get_array "fallback_routes_${IFVAR}")"
-	fi
-	if [ -z "${routes}" ]; then
-		routes="$(_get_array "routes_${IFVAR}")"
-	fi
 	if [ "${IFACE}" = "lo" -o "${IFACE}" = "lo0" ]; then
 		if [ "${config_0}" != "null" ]; then
 			routes="127.0.0.0/8 via 127.0.0.1
@@ -644,7 +638,7 @@ ${routes}"
 	if [ "$(command -v postup)" = "postup" ]; then
 		ebegin "Running postup"
 		eindent
-		postup
+		postup 
 		eoutdent
 	fi
 
@@ -690,11 +684,7 @@ stop()
 
 	# Only delete addresses for interfaces that exist
 	if _exists; then
-		# PPP can manage it's own addresses when IN_BACKGROUND
+		_delete_addresses "${IFACE}"
-		# Important in case "demand" set on the ppp link
-		if ! (yesno ${IN_BACKGROUND} && is_ppp) ; then
-			_delete_addresses "${IFACE}"
-		fi
 	fi
 
 	for module in ${MODULES}; do

init.d/netmount.in

@@ -35,15 +35,15 @@ depend()
 	need net $pmap
 	use afc-client amd autofs openvpn
 	use dns nfs nfsmount portmap rpcbind rpc.statd rpc.lockd
-	keyword -jail -prefix -vserver
+	keyword nojail noprefix novserver
 }
 
 start()
-{
+{	
 	local myneed= myuse= pmap="portmap" nfsmounts=
 	[ -x @SYSCONFDIR@/init.d/rpcbind ] && pmap="rpcbind"
 
-	local x= fs= rc=
+	local x= fs=
 	for x in $net_fs_list; do
 		case "$x" in
 			nfs|nfs4)
@@ -65,12 +65,7 @@ start()
 
 	ebegin "Mounting network filesystems"
 	mount -at $fs
-	rc=$?
+	ewend $? "Could not mount all network filesystems"
-	if [ "$RC_UNAME" = Linux ]; then
-		mount -a -O _netdev
-		rc=$?
-	fi
-	ewend $rc "Could not mount all network filesystems"
 	return 0
 }
 
@@ -98,9 +93,5 @@ stop()
 	retval=$?
 
 	eoutdent
-	if [ "$RC_UNAME" = Linux ]; then
-		umount -a -O _netdev
-		retval=$?
-	fi
 	eend $retval "Failed to unmount network filesystems"
 }

init.d/network.in

@@ -13,7 +13,7 @@ depend()
 	need localmount
 	after bootmisc
 	provide net
-	keyword -jail -prefix -vserver
+	keyword nojail noprefix novserver
 }
 
 uniqify()
@@ -57,32 +57,6 @@ sys_interfaces()
 	esac
 }
 
-tentative()
-{
-	local inet= address= rest=
-
-	case "$RC_UNAME" in
-	Linux)
-		[ -x /sbin/ip ] || [ -x /bin/ip ] || return 1
-		[ -n "$(ip -f inet6 addr show tentative)" ]
-		;;
-	*)
-		local inet= address= rest=
-		LC_ALL=C ifconfig -a | while read inet address rest; do
-	 		case "${inet}" in
-			inet6)
-				case "${rest}" in
-				*" "tentative*) return 2;;
-				esac
-				;;
-			esac
-		done
-		[ $? = 2 ]
-		;;
-	esac
-}
-
-
 auto_interfaces()
 {
 	local ifs= c= f=
@@ -129,28 +103,13 @@ dumpargs()
 	esac
 }
 
-intup=false
 runip()
 {
 	local int="$1" err=
+
 	shift
-
-	# Ensure we have a valid broadcast address
-	case "$@" in
-	*" broadcast "*|*" brd "*) ;;
-	*:*) ;; # Ignore IPv6
-	*) set -- "$@" brd +;;
-	esac
-
 	err=$(LC_ALL=C ip address add "$@" dev "$int" 2>&1)
-	if [ -z "$err" ]; then
+	[ -z "$err" ] && return 0
-		# ip does not bring up the interface when adding addresses
-		if ! $intup; then
-			ip link set "$int" up
-			intup=true
-		fi
-		return 0
-	fi
 	if [ "$err" = "RTNETLINK answers: File exists" ]; then
 		ip address del "$@" dev "$int" 2>/dev/null
 	fi
@@ -161,9 +120,8 @@ runip()
 routeflush()
 {
 	if [ "$RC_UNAME" = Linux ]; then
-		if [ -x /sbin/ip ] || [ -x /bin/ip ]; then
+		if [ -x /sbin/ip ]; then
 			ip route flush scope global
-			ip route delete default 2>/dev/null
 		else
 			# Sadly we also delete some link routes, but
 			# this cannot be helped
@@ -183,8 +141,6 @@ routeflush()
 				esac
 				route del $flags $dest $netmask $xtra
 			done
-			# Erase any default dev eth0 routes
-			route del default 2>/dev/null
 		fi
 	else
 		route -qn flush
@@ -209,20 +165,12 @@ runargs()
 start()
 {
 	local cr=0 r= int= intv= cmd= args= upcmd=
-
-	if [ -z "$domainname" -a -s /etc/defaultdomain ]; then
-		domainname=$(cat /etc/defaultdomain)
-	fi
-	if [ -n "$domainname" ]; then
-		ebegin "Setting NIS domainname: $domainname"
-		domainname "$domainname"
-		eend $?
-	fi
-
 	einfo "Starting network"
 	routeflush
 	if [ "$RC_UNAME" = "Linux" ]; then
-		ifconfig lo 127.0.0.1 netmask 255.0.0.0 || cr=1
+		ifconfig lo 127.0.0.1 netmask 255.0.0.0 || cr=1 
+		route add -net 127.0.0.0 netmask 255.0.0.0 \
+			gw 127.0.0.1 2>/dev/null
 		route add -net 127.0.0.0 netmask 255.0.0.0 \
 			gw 127.0.0.1 reject 2>/dev/null
 	else
@@ -246,7 +194,7 @@ start()
 			-f /etc/ifup."$int" -o -f "$cf" ] || continue
 		veinfo "$int"
 		case "$func" in
-		ip)	func=runip; intup=false;;
+		ip)	func=runip;;
 		esac
 		eindent
 		runargs /etc/ifup."$int" "$upcmd"
@@ -275,41 +223,13 @@ start()
 	eoutdent
 	eend $cr
 
-	# Wait for any inet6 tentative addresses
-	r=5
-	while [ $r -gt 0 ]; do
-		tentative || break
-		[ $r = 5 ] && vebegin "Waiting for tentative addresses"
-		sleep 1
-		r=$(($r - 1))
-	done
-	if [ $r != 5 ]; then
-		[ $r != 0 ]
-		veend $?
-	fi
-
 	if [ -n "$defaultroute" ]; then
 		ebegin "Setting default route $defaultroute"
-		route add default $defaultroute
-		eend $?
-	elif [ -n "$defaultiproute" ]; then
-		ebegin "Setting default route $defaultiproute"
-		ip route add default $defaultiproute
-		eend $?
-	fi
-
-	if [ -n "$defaultroute6" ]; then
-		ebegin "Setting default route $defaultroute6"
 		if [ "$RC_UNAME" = Linux ]; then
-			routecmd="route -A inet6 add"
+			route add default gw $defaultroute
 		else
-			routecmd="route -inet6 add"
+			route add default $defaultroute
 		fi
-		$routecmd default $defaultroute6
-		eend $?
-	elif [ -n "$defaultiproute6" ]; then
-		ebegin "Setting default route $defaultiproute6"
-		ip -f inet6 route add default $defaultiproute6
 		eend $?
 	fi
 
@@ -338,11 +258,6 @@ stop()
 		then
 			veinfo "$int"
 			runargs /etc/ifdown."$int" "$downcmd"
-			if [ -x /sbin/ip ] || [ -x /bin/ip ]; then
-				# We need to do this, otherwise we may
-				# fail to add things correctly on restart
-				ip address flush dev "$int" 2>/dev/null
-			fi
 			ifconfig "$int" down 2>/dev/null
 			ifconfig "$int" destroy 2>/dev/null
 		fi

init.d/newsyslog.in

@@ -7,7 +7,7 @@ required_files="/etc/newsyslog.conf"
 depend()
 {
 	need localmount
-	keyword -prefix
+	keyword noprefix
 }
 
 start()

init.d/numlock.in

@@ -9,7 +9,7 @@ ttyn=${rc_tty_number:-${RC_TTY_NUMBER:-12}}
 depend()
 {
 	need localmount
-	keyword -openvz -prefix -vserver -lxc
+	keyword noopenvz noprefix novserver
 }
 
 _setleds()

init.d/pf.in

@@ -11,7 +11,7 @@ extra_started_commands="reload"
 
 depend() {
 	need localmount
-	keyword -jail -prefix
+	keyword nojail noprefix
 }
 
 start()
@@ -44,7 +44,7 @@ reload()
 {
 	ebegin "Reloading $name rules."
 	pfctl -q -n -f "$pf_conf" && \
-	{
+	{ 
 		# Flush everything but existing state entries that way when
 		# rules are read in, it doesn't break established connections.
 		pfctl -q -Fnat -Fqueue -Frules -FSources -Finfo -FTables -Fosfp

init.d/powerd.in

@@ -12,7 +12,7 @@ depend()
 	need localmount
 	use logger
 	after bootmisc
-	keyword -jail -prefix
+	keyword nojail noprefix
 }
 
 start_pre()

init.d/procfs.in

@@ -8,13 +8,13 @@ depend()
 {
 	use modules devfs
 	need localmount
-	keyword -openvz -prefix -vserver -lxc
+	keyword noopenvz noprefix novserver
 }
 
 start()
 {
-	# Make sure we insert usbcore if it's a module
+	# Make sure we insert usbcore if its a module
-	if [ -f /proc/modules -a ! -d /sys/module/usbcore -a ! -d /proc/bus/usb ]; then
+	if [ -f /proc/modules -a ! -d /proc/bus/usb ]; then
 		modprobe -q usbcore
 	fi
 

init.d/rc-enabled.in

@@ -7,7 +7,7 @@ depend()
 	need localmount net
 	after *
 	before local
-	keyword -prefix
+	keyword noprefix
 }
 
 start()

init.d/root.in

@@ -7,7 +7,7 @@ description="Mount the root fs read/write"
 depend()
 {
 	need fsck
-	keyword -jail -openvz -prefix -vserver -lxc
+	keyword nojail noopenvz noprefix novserver
 }
 
 start()

init.d/savecache.in

@@ -8,34 +8,25 @@ start()
 {
 	if [ -e "$RC_SVCDIR"/clock-skewed ]; then
 		ewarn "WARNING: clock skew detected!"
-		if ! yesno "${RC_GOINGDOWN}"; then
+		if ! yesno "savecache_skewed"; then
 			eerror "Not saving deptree cache"
 			return 1
 		fi
 	fi
 	ebegin "Saving dependency cache"
-	local rc=
 	if [ ! -d "$RC_LIBEXECDIR"/cache ]; then
 		rm -rf "$RC_LIBEXECDIR"/cache
 		if ! mkdir "$RC_LIBEXECDIR"/cache; then
-			rc=$?
+			eend $?
-			if yesno "${RC_GOINGDOWN}"; then
+			return $?
-				rc=0
-			fi
-			eend $rc
-			return $rc
 		fi
 	fi
 	local save=
-	for x in deptree depconfig shutdowntime softlevel nettree rc.log; do
+	for x in deptree depconfig softlevel nettree rc.log; do
 		[ -e "$RC_SVCDIR/$x" ] && save="$save $RC_SVCDIR/$x"
 	done
 	if [ -n "$save" ]; then
 		cp -p $save "$RC_LIBEXECDIR"/cache 2>/dev/null
 	fi
-	rc=$?
+	eend $?
-	if yesno "${RC_GOINGDOWN}"; then
-		rc=0
-	fi
-	eend $rc
 }

init.d/savecore.in

@@ -7,7 +7,7 @@ description="Saves a kernel dump."
 depend()
 {
 	need localmount
-	keyword -jail -prefix
+	keyword nojail noprefix
 }
 
 start()

init.d/staticroute.in

@@ -1,104 +0,0 @@
-#!@PREFIX@/sbin/runscript
-# Copyright (c) 2009 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
-
-# This script was inspired by the equivalent rc.d staticroute from NetBSD.
-
-description="Configures static routes."
-__nl="
-"
-
-depend()
-{
-	provide net
-	use network
-	keyword -jail -prefix -vserver
-}
-
-pre_flight_checks()
-{
-	route=route
-	[ -s /etc/route.conf ] && return 0
-
-	if [ -n "$staticiproute" ]; then
-		route="ip route"
-		staticroute="$staticiproute"
-	fi
-}
-
-dump_args()
-{
-	# Route configuration file, as used by the NetBSD RC system
-	if [ -s /etc/route.conf ]; then
-		cat /etc/route.conf
-		return $?
-	fi
-
-	case "$staticroute" in
-	*"$__nl"*)
-		echo "$staticroute"
-		;;
-	*)
-		(
-			set -o noglob
-			IFS=';'; set -- $staticroute
-			IFS="$__nl"; echo "$*"
-		)
-		;;
-	esac
-}
-
-do_routes()
-{
-	local xtra= family=
-	[ "$RC_UNAME" != Linux ] && xtra=-q
-
-	ebegin "$1 static routes"
-	eindent
-	pre_flight_checks
-	dump_args | while read args; do
-		[ -z "$args" ] && continue
-		case "$args" in
-		"#"*)
-			;;
-		"+"*)
-			[ $2 = "add" ] && eval ${args#*+}
-			;;
-		"-"*)
-			[ $2 = "del" -o $2 = "delete" ] && eval ${args#*-}
-			;;
-		*)
-			veinfo "$args"
-			case "$route" in
-			"ip route")
-				ip route $2 $args
-				;;
-			*)
-				# Linux route does cannot work it out ...
-				if [ "$RC_UNAME" = Linux ]; then
-					case "$args" in
-					*:*) family="-A inet6";;
-					*) family=;;
-					esac
-				fi
-				route $family $xtra $2 -$args
-				;;
-			esac
-			veend $?
-		esac
-	done
-	eoutdent
-	eend 0
-}
-
-start()
-{
-	do_routes "Adding" "add"
-}
-
-stop()
-{
-	local cmd="delete"
-	[ "$RC_UNAME" = Linux ] && cmd="del"
-	do_routes "Deleting" "$cmd"
-}

init.d/swap-blk.in

@@ -5,7 +5,7 @@
 depend()
 {
 	before fsck
-	keyword -jail -prefix
+	keyword nojail noprefix
 }
 
 start()
@@ -13,11 +13,11 @@ start()
 	ebegin "Activating block swap devices"
 	swapctl -A -t blk >/dev/null
 	eend 0 # If swapon has nothing todo it errors, so always return 0
-}
+}	
 
 stop()
 {
 	ebegin "Deactivating block swap devices"
 	swapctl -U -t blk >/dev/null
-	eend 0
+	eend 0 
 }

init.d/swap.in

@@ -5,7 +5,7 @@
 depend()
 {
 	need localmount
-	keyword -jail -openvz -prefix -vserver -lxc
+	keyword nojail noopenvz noprefix novserver
 }
 
 start()
@@ -16,7 +16,7 @@ start()
 		*)		swapon -a >/dev/null;;
 	esac
 	eend 0 # If swapon has nothing todo it errors, so always return 0
-}
+}	
 
 stop()
 {
@@ -31,5 +31,5 @@ stop()
 		NetBSD|OpenBSD)	swapctl -U -t noblk >/dev/null;;
 		*)		swapoff -a >/dev/null;;
 	esac
-	eend 0
+	eend 0 
 }

init.d/swclock.in

@@ -1,28 +0,0 @@
-#!@PREFIX@/sbin/runscript
-# Copyright (c) 2009 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
-
-description="Sets the local clock to the mtime of a given file."
-
-depend()
-{
-	before *
-	provide clock
-	keyword -openvz -prefix -uml -vserver -xenu -lxc
-}
-
-# swclock is an OpenRC built in
-
-start()
-{
-	ebegin "Setting the local clock based on last shutdown time"
-	swclock --warn
-	eend $?
-}
-
-stop()
-{
-	ebegin "Saving the shutdown time"
-	swclock --save
-	eend $?
-}

init.d/syscons.in

@@ -4,7 +4,7 @@
 
 depend() {
 	need localmount
-	keyword -jail -prefix
+	keyword nojail noprefix
 }
 
 start() {
@@ -15,13 +15,13 @@ start() {
 		done
 		eend $?
 	fi
-
+	
 	if [ -n "$keymap" ]; then
 		ebegin "Setting keymap to $keymap"
 		kbdcontrol -l $keymap </dev/console
 		eend $?
 	fi
-
+	
 	if [ -n "$keyrate" ]; then
 		ebegin "Setting keyrate to $keyrate"
 		kbdcontrol -r $keyrate </dev/console
@@ -40,7 +40,7 @@ start() {
 		done
 		eoutdent
 	fi
-
+	
 	if [ -n "$cursor" ]; then
 		ebegin "Setting cursor"
 		vidcontrol -c $cursor

init.d/sysctl.BSD.in

@@ -4,28 +4,21 @@
 
 depend()
 {
+	use hostname
 	before bootmisc logger
-	keyword -prefix
+	keyword noprefix
 }
 
 start()
 {
 	[ -e /etc/sysctl.conf ] || return 0
-	local retval=0 var= comments= conf=
+	local retval=0 var= comments=
 	ebegin "Configuring kernel parameters"
-	eindent
+	while read var comments; do
-	for conf in /etc/sysctl.d/*.conf /etc/sysctl.conf; do
+		case "$var" in
-		if [ -r "$conf" ]; then
+			""|"#"*) continue;;
-			vebegin "applying $conf"
+		esac
-			while read var comments; do
+		sysctl -w "$var" >/dev/null || retval=1
-				case "$var" in
+	done < /etc/sysctl.conf
-				""|"#"*) continue;;
-				esac
-				sysctl -w "$var" >/dev/null || retval=1
-			done < "$conf"
-			veend $retval
-		fi
-	done
-	eoutdent
 	eend $retval "Some errors were encountered"
 }

init.d/sysctl.Linux.in

@@ -4,31 +4,15 @@
 
 depend()
 {
+	use hostname
 	before bootmisc logger
-	keyword -prefix -vserver
+	keyword noopenvz noprefix novserver
 }
 
 start()
 {
-	local conf= retval=0 err errs
+	[ -e /etc/sysctl.conf ] || return 0
-
 	ebegin "Configuring kernel parameters"
-	eindent
+	sysctl -p >/dev/null
-
+	eend $? "Some errors were encountered"
-	for conf in /etc/sysctl.d/*.conf /etc/sysctl.conf; do
-		if [ -r "$conf" ]; then
-			vebegin "applying $conf"
-			if ! err=$(sysctl -q -p "$conf" 2>&1) ; then
-				errs="${errs} ${err}"
-				sysctl -q -e -p "${conf}"
-			fi
-			veend $? || retval=1
-		fi
-	done
-
-	eoutdent
-	if [ ${retval} -eq 0 ] && [ -n "${errs}" ] ; then
-		ewarn "Unknown keys:${errs}"
-	fi
-	eend $retval "Some errors were encountered: ${errs}"
 }

init.d/sysfs.in

@@ -6,7 +6,7 @@ description="Mount the sys filesystem."
 
 depend()
 {
-	keyword -prefix -vserver
+	keyword noprefix novserver
 }
 
 mount_sys()

init.d/syslogd.in

@@ -16,5 +16,5 @@ depend()
 	use net newsyslog
 	need localmount
 	after bootmisc
-	keyword -prefix
+	keyword noprefix
 }

init.d/termencoding.in

@@ -9,9 +9,7 @@ ttyn=${rc_tty_number:-${RC_TTY_NUMBER:-12}}
 
 depend()
 {
-	keyword -openvz -prefix -uml -vserver -xenu
+	keyword noopenvz noprefix nouml novserver noxenu
-	need root
-	after bootmisc
 }
 
 start()
@@ -33,16 +31,5 @@ start()
 		printf "\033%s" "$termencoding" >$ttydev$n
 		n=$(($n + 1))
 	done
-
-	# Save the encoding for use immediately at boot
-	if [ -w "$RC_LIBEXECDIR" ]; then
-		mkdir -p "$RC_LIBEXECDIR"/console
-		if yesno ${unicode:-${UNICODE}}; then
-			echo "" > "$RC_LIBEXECDIR"/console/unicode
-		else
-			rm -f "$RC_LIBEXECDIR"/console/unicode
-		fi
-	fi
-
 	eend 0
 }

init.d/ttys.in

@@ -2,10 +2,10 @@
 # Copyright (c) 2008 Roy Marples <roy@marples.name>
 # All rights reserved. Released under the 2-clause BSD license.
 
-depend()
+depend() 
 {
 	after fsck
-	keyword -prefix
+	keyword noprefix
 }
 
 start()
@@ -13,7 +13,7 @@ start()
 	ebegin "Setting tty flags"
 	ttyflags -a
 	eend $? || return $?
-
+	
 	if [ -c /dev/ttyp0 ]; then
 		chmod 666 /dev/tty[p-uw-zP-T][0-9a-zA-Z]
 	fi

init.d/urandom.in

@@ -8,7 +8,7 @@ description="Initializes the random number generator."
 depend()
 {
 	need localmount
-	keyword -jail -openvz -prefix
+	keyword nojail noprefix
 }
 
 save_seed()

init.d/wscons.in

@@ -5,7 +5,7 @@
 depend()
 {
 	need localmount
-	keyword -prefix
+	keyword noprefix
 }
 
 start()
@@ -27,10 +27,10 @@ start()
 			font)
 				cmd=$wsfld
 				[ "$arg2" != "-" ] && cmd="$cmd -w $arg2"
-				[ "$arg3" != "-" ] && cmd="$cmd -h $arg3"
+				[ "$arg3" != "-" ] && cmd="$cmd -h $arg3" 
 				[ "$arg4" != "-" ] && cmd="$cmd -e $arg4"
 				cmd="$cmd -N $arg1 $arg5"
-				eval "$cmd"
+				eval "$cmd"				
 				;;
 
 			screen)

local.d/Makefile

@@ -1,6 +0,0 @@
-DIR=	${LOCALDIR}
-CONF=	README
-
-MK=		../mk
-include ${MK}/os.mk
-include ${MK}/scripts.mk

local.d/README

@@ -1,9 +0,0 @@
-This directory should contain programs or scripts which are to be run
-when the local service is started or stopped.
-
-If a file in this directory is executable and it has a .start extension,
-it will be run when the local service is started. If a file is
-executable and it has a .stop extension, it will be run when the local
-service is stopped.
-
-All files are processed in lexical order.

man/einfo.3

@@ -39,7 +39,7 @@
 .Nm eprefix
 .Nd colorful informational output
 .Sh LIBRARY
-Enhanced Information output library (libeinfo, -leinfo)
+Enhanced Informatation output library (libeinfo, -leinfo)
 .Sh SYNOPSIS
 .In einfo.h
 .Ft int Fn einfo "const char * restrict format" ...

man/rc-status.8

@@ -36,7 +36,7 @@
 .Nm
 gathers and displays information about the status of services 
 in different runlevels.  The default behavior is to show information 
-about the current runlevel and any unassigned services that are not stopped,
+about the current runlevel and any unassgined services that are not stopped,
 but any runlevel can be quickly examined.
 .Pp
 The options are as follows:
@@ -62,10 +62,6 @@ Show information only for the named
 .Sh EXIT STATUS
 .Nm
 exits 0, except when checking for crashed services and it doesn't find any.
-.Sh IMPLEMENTATION NOTES
-.Nm
-tries to list services within each runlevel in the presently resolved
-dependency order if the dependency tree is available.
 .Sh SEE ALSO
 .Xr rc 8 ,
 .Xr rc-update 8

man/rc_find_pids.3

@@ -54,7 +54,7 @@ owned by
 .Fa uid ,
 all of which are optional.
 .Pp
-The returned list should be freed when done.
+The retuned list should be freed when done.
 .Sh IMPLEMENTATION NOTES
 On BSD systems we use
 .Lb libkvm

man/rc_plugin_hook.3

@@ -42,7 +42,7 @@ is set to the hook running, and
 .Fa name
 is set to the name of the runlevel or name of the service.
 .Pp
-Plugins can affect the parent environment by writing NULL separated strings to
+Plugins can affect the parent environemnt by writing NULL separated strings to
 .Va rc_environ_fd .
 .Sh SEE ALSO
 .Xr rc 8 ,

man/runscript.8

@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd November 4, 2009
+.Dd April 30, 2009
 .Dt RUNSCRIPT 8 SMM
 .Os OpenRC
 .Sh NAME
@@ -39,8 +39,8 @@
 .Nm
 is basically an interpreter for shell scripts which provide an easy interface
 to the often complex system commands and daemons.
-When a service runs a command it first loads its multiplexed configuration
+When a service runs a command it first loads it's mulitplexed configuration
-file, then its master configuration file, then
+file, then it's master configuration file, then
 .Pa /etc/rc.conf
 and finally the script itself. At this point
 .Nm
@@ -79,7 +79,7 @@ Ignore all dependency information the service supplies.
 Only run the command if the service has been started.
 .It Fl q , -quiet
 Turns off all informational output the service generates.
-Output from any non OpenRC commands is not affected.
+Output from any non OpenRC comands is not affected.
 .It Fl v , -verbose
 Turns on any extra informational output the service generates.
 .It Fl Z , -dry-run
@@ -90,9 +90,9 @@ or stopping them.
 The following variables affect the service script:
 .Bl -tag -width "RC_DEFAULTLEVEL"
 .It Ar extra_commands
-Space separated list of extra commands the service defines.
+Space seperated list of extra commands the service defines.
 .It Ar extra_started_commands
-Space separated list of extra commands the service defines. These only work if
+Space seperated list of extra commands the service defines. These only work if
 the service has already been started.
 .It Ar description
 String describing the service.
@@ -128,7 +128,7 @@ will refuse to stop until any services that need it have stopped.
 The service will attempt to start any services we use that have been added
 to the runlevel.
 .It Ic after
-The service will start after these services and stop before these services.
+The service will start after thse services and stop before these services.
 .It Ic before
 The service will start before these services and stop after these services.
 .It Ic provide
@@ -138,38 +138,30 @@ We should recalculate our dependencies if the listed files have changed.
 .It Ic keyword
 Tags a service with a keyword. Here's the keywords we currently understand:-
 .Bl -tag -width indent
-.It Dv -shutdown
+.It Dv nojail
+When in a jail, exclude this service from any dependencies. The service can
+still be run directly.
+.It Dv noopenvz
+Same as nojail, but for OpenVZ systems.
+.It Dv noshutdown
 Don't stop this service when shutting the system down.
 This normally quite safe as remaining daemons will be sent a SIGTERM just
 before final shutdown.
 Network related services such as the network and dhcpcd init scripts normally
 have this keyword.
-.It Dv -stop
+.It Dv nostop
 Don't stop this service when changing runlevels, even if not present.
 This includes shutting the system down.
-.It Dv -timeout
+.It Dv notimeout
-Other services should wait indefinitely for this service to start. Use
+Do not time out waiting for that service.
-this keyword if your service may take longer than 60 seconds to start.
+.It Dv nouml
-.It Dv -jail
+Same as nojail, but for UML systems.
-When in a jail, exclude this service from any dependencies. The service can
+.It Dv novserver
-still be run directly. Set via 
+Same as nojail, but for VServer systems.
-.Ic rc_sys 
+.It Dv noxen0
-in 
+Same as nojail, but for Xen DOM0 systems.
-.Pa /etc/rc.conf
+.It Dv noxenu
-.It Dv -lxc
+Same as nojail, but for Xen DOMU systems.
-Same as -jail, but for Linux Resource Containers (LXC).
-.It Dv -openvz
-Same as -jail, but for OpenVZ systems.
-.It Dv -prefix
-Same as -jail, but for Prefix systems.
-.It Dv -uml
-Same as -jail, but for UML systems.
-.It Dv -vserver
-Same as -jail, but for VServer systems.
-.It Dv -xen0
-Same as -jail, but for Xen DOM0 systems.
-.It Dv -xenu
-Same as -jail, but for Xen DOMU systems.
 .El
 .El
 .Pp
@@ -231,7 +223,7 @@ is newer than
 return 0, otherwise 1.
 If
 .Ar file2
-is a directory, then check all its contents too.
+is a directory, then check all it's contents too.
 .It Ic is_older_than Ar file1 Ar file2 ...
 If
 .Ar file1
@@ -240,7 +232,7 @@ is newer than
 return 0, otherwise 1.
 If
 .Ar file2
-is a directory, then check all its contents too.
+is a directory, then check all it's contents too.
 .It Ic service_set_value Ar name Ar value
 Saves the
 .Ar name
@@ -326,7 +318,7 @@ Configuration files, relative to the location of the service.
 If a file ending with .${RC_RUNLEVEL} exists then we use that instead.
 .Bl -ohang
 .It Pa ../conf.d/${RC_SVCNAME%%.*}
-multiplexed configuration file.
+mulitplexed configuration file.
 Example: if ${RC_SVCNAME} is net.eth1 then look for
 .Pa ../conf.d/net .
 .It Pa ../conf.d/${RC_SVCNAME}

man/start-stop-daemon.8

@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd December 14, 2009
+.Dd April 22, 2009
 .Dt START-STOP-DAEMON 8 SMM
 .Os OpenRC
 .Sh NAME
@@ -43,7 +43,7 @@
 .Ar daemon
 .Sh DESCRIPTION
 .Nm
-provides a consistent method of starting, stopping and signaling daemons.
+provides a consistent method of starting, stopping and signalling daemons.
 If neither
 .Fl K , -stop
 nor
@@ -85,7 +85,7 @@ then
 .Nm
 matches the process
 .D1 /usr/bin/perl -w foo
-If an interpreted daemon changes its process name then this won't work.
+If an interpreted daemon changes it's process name then this won't work.
 .It Fl u , -user Ar user Ns Op : Ns Ar group
 Start the daemon as the
 .Ar user
@@ -98,8 +98,6 @@ Print the action(s) that would be taken, but don't actually do anything.
 The return value is set as if the command was taken and worked.
 .It Fl v , -verbose
 Print the action(s) that are taken just before doing them.
-.It Fl P , -progress
-Echo a . to the console for each second elapsed whilst waiting.
 .El
 .Pp
 These options are only used for starting daemons:
@@ -136,10 +134,6 @@ option. Only useful when used with daemons that run in the foreground and
 forced into the background with the
 .Fl -b , -background
 option.
-.It Fl I , -ionice Ar class Ns Op : Ns Ar data
-Modifies the IO scheduling priority of the daemon.
-Class can be 0 for none, 1 for real time, 2 for best effort and 3 for idle.
-Data can be from 0 to 7 inclusive.
 .It Fl N , -nice Ar level
 Modifies the scheduling priority of the daemon.
 .It Fl 1 , -stdout Ar logfile
@@ -148,9 +142,9 @@ Redirect the standard output of the process to logfile when started with
 Must be an absolute pathname, but relative to the path optionally given with
 .Fl r , -chroot .
 The logfile can also be a named pipe.
-.It Fl w , -wait Ar milliseconds
+.It Fl w , -wait Ar seconds
 Wait
-.Ar milliseconds
+.Ar seconds
 after starting and check that daemon is still running.
 Useful for daemons that check configuration after forking or stopping race
 conditions where the pidfile is written out after forking.

mk/cc.mk

@@ -1,13 +1,13 @@
 # Copyright (c) 2008 Roy Marples <roy@marples.name>
 
 # Setup some good default CFLAGS
-CFLAGS?=	-O2 -g
+CFLAGS?=	-O2
 
 # Default to using the C99 standard
 CSTD?=		c99
-ifneq (${CSTD},)
+_CSTD_SH=	if test -n "${CSTD}"; then echo "-std=${CSTD}"; else echo ""; fi
-CFLAGS+=	-std=${CSTD}
+_CSTD!=		${_CSTD_SH}
-endif
+CFLAGS+=	${_CSTD}$(shell ${_CSTD_SH})
 
 # Try and use some good cc flags if we're building from git
 # We don't use -pedantic as it will warn about our perfectly valid
@@ -29,7 +29,5 @@ _CC_FLAGS_SH=	for f in ${_CCFLAGS}; do \
 		${CC} $$f -S -xc -o /dev/null - ; \
 		then printf "%s" "$$f "; fi \
 		done;
-_CC_FLAGS:=	$(shell ${_CC_FLAGS_SH})
+_CC_FLAGS!=	${_CC_FLAGS_SH}
-CFLAGS+=	${_CC_FLAGS}
+CFLAGS+=	${_CC_FLAGS}$(shell ${_CC_FLAGS_SH})
-
-include ${MK}/debug.mk

mk/debug.mk

@@ -3,14 +3,14 @@
 # All rights reserved. Released under the 2-clause BSD license.
 
 _RC_DEBUG_SH=	case "${DEBUG}" in "") echo "";; *) echo "-DRC_DEBUG";; esac
-_RC_DEBUG:=	$(shell ${_RC_DEBUG_SH})
+_RC_DEBUG!=	${_RC_DEBUG_SH}
-CPPFLAGS+=	${_RC_DEBUG}
+CPPFLAGS+=	${_RC_DEBUG}$(shell ${_RC_DEBUG_SH})
 
 # Should we enable this with a different flag?
 _LD_DEBUG_SH=	case "${DEBUG}" in "") echo "";; *) echo "-Wl,--rpath=../librc -Wl,--rpath=../libeinfo";; esac
-_LD_DEBUG:=	$(shell ${_LD_DEBUG_SH})
+_LD_DEBUG!=	${_LD_DEBUG_SH}
-LDFLAGS+=	${_LD_DEBUG}
+LDFLAGS+=	${_LD_DEBUG}$(shell ${_LD_DEBUG_SH})
 
 _GGDB_SH=	case "${DEBUG}" in "") echo "";; *) echo "-ggdb";; esac
-_GGDB:=		$(shell ${_GGDB_SH})
+_GGDB!=		${_GGDB_SH}
-CFLAGS+=	${_GGDB}
+CFLAGS+=	${_GGDB}$(shell ${_GGDB_SH})

mk/depend-.mk

@@ -0,0 +1,2 @@
+# This space left intentionally blank because gmake does not load .depend
+# by default

mk/depend-gmake.mk

@@ -0,0 +1,3 @@
+# Tell gmake to include the optional dependency file.
+# This sucks, but I don't know any other way of portably making this work.
+-include .depend

mk/depend.mk

@@ -10,4 +10,9 @@ IGNOREFILES+=	.depend
 
 depend: .depend extra_depend
 
--include .depend
+# Nasty hack. depend-.mk is a blank file, depend-gmake.mk has a gmake specific
+# command to optionally include .depend.
+# Someone should patch gmake to optionally include .depend if it exists.
+_INC_DEP=	$(shell if ${MAKE} --version | grep -q "^GNU "; then \
+		echo "gmake"; else echo ""; fi)
+include ${MK}/depend-${_INC_DEP}.mk