release openrc-0.8.2

This is being done because these dependency changes caused a regression.
We will need to revisit the previously mentioned bug.

X-Gentoo-Bug: 363693
X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=363693

FEATURE-REMOVAL-SCHEDULE

@@ -0,0 +1,70 @@
+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: rc_sys automatic detection code
+      - Functions for removal: rc_sys_v1, rc_sys_v2
+
+When: 2011/03/01
+
+Why: The original automatic sub-system detection is flawed in that it cannot
+	 safely detect some variables (Using cgroups confused it to think you were
+	 using LXC, and Prefix cannot be detect by definition). Also, almost all of
+	 the detection requires that /proc is available and readable. During early
+	 boot, /proc may not be mounted yet, leading to mis-detection. The readable
+	 condition can also fail under some hardened kernels when running as an
+	 unprivileged user.
+
+	 The new rc_sys_v2 function uses the rc_sys variable from rc.conf. After
+	 the removal, the contents of the rc_sys_v2 function will move into the
+	 rc_sys function.
+
+Who:  Robin H. Johnson <robbat2@gentoo.org>
+
+---------------------------
+
+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

@@ -4,23 +4,18 @@
 
 include Makefile.inc
 
-SUBDIR=		conf.d etc init.d man scripts sh src
+SUBDIR=		conf.d etc init.d local.d man scripts sh src
 
 # Build our old net foo or not
-_OLDNET_SH=	case "${MKOLDNET}" in \
-		[Yy][Ee][Ss]) echo "net doc";; \
-		*) echo "";; \
-		esac
-_OLDNET!=	${_OLDNET_SH}
-SUBDIR+=	${_OLDNET}$(shell ${_OLDNET_SH})
+ifeq (${MKOLDNET},yes)
+SUBDIR+=	net doc
+endif
 
 # Build pkgconfig or not
-_PKGCONFIG_SH=	case "${MKPKGCONFIG}" in \
-		[Yy][Ee][Ss]|"") echo "pkgconfig";; \
-		*) echo "";; \
-		esac
-_PKGCONFIG!=	${_PKGCONFIG_SH}
-SUBDIR+=	${_PKGCONFIG}$(shell ${_PKGCONFIG_SH})
+MKPKGCONFIG?=	yes
+ifeq (${MKPKGCONFIG},yes)
+SUBDIR+=	pkgconfig
+endif
 
 # We need to ensure that runlevels is done last
 SUBDIR+=	runlevels

Makefile.inc

@@ -1,3 +1,3 @@
 NAME=		openrc
-VERSION=	0.6.2
+VERSION=	0.8.2
 PKG=		${NAME}-${VERSION}

README

@@ -4,7 +4,7 @@ OpenRC README
 Installation
 ------------
 make install
-Yup, that simple. Works with GNU make and BSD make.
+Yup, that simple. Works with GNU make.
 
 You may wish to tweak the installation with the below arguments
 PROGLDFLAGS=-static
@@ -12,6 +12,8 @@ LIBNAME=lib64
 DESTDIR=/tmp/openrc-image
 MKPAM=pam
 MKPKGCONFIG=no
+MKRCSYS=prefix
+MKSELINUX=yes
 MKTERMCAP=ncurses
 MKTERMCAP=termcap
 MKOLDNET=yes
@@ -32,6 +34,20 @@ LOCAL_PREFIX should be set when to where user maintained packages are.
 Only set LOCAL_PREFIX if different from PKG_PREFIX.
 PREFIX should be set when OpenRC is not installed to /.
 
+MKRCSYS should be set only if you need to specify a default system
+subtype. The subtype should be set to match the type of environment the
+file is installed into, not the virtualization the environment is
+capable of handling. Here is a list of subtypes and their meanings.
+
+jail	FreeBSD jail
+lxc	Linux container
+openvz	Linux OpenVZ
+prefix	Linux and *BSD prefix system
+uml	UsermodeLinux
+vserver	Linux vserver
+xen0 Linux and NetBSD xen0 Domain
+xenU Linux and NetBSD xenU Domain
+
 If any of the following files exist then we do not overwrite them
 /etc/devd.conf
 /etc/rc
@@ -53,13 +69,10 @@ of the system.
 
 
 Reporting Bugs
--------------
-If you installed OpenRC from your chosen distribution, you should report
-bugs directly to them. For example, if you use Gentoo and emerged OpenRC
-then you should reports bugs to http://bugs.gentoo.org.
-
-Otherwise, you can report them directly to me at
-http://roy.marples.name/projects/openrc
+--------------
+Bugs should go to the Gentoo Bugzilla:
+	http://bugs.gentoo.org/
+You'll want the "Gentoo Linux" product and the "baselayout" component.
 
 
 History - by Roy Marples

README.newnet

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

STYLE

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

conf.d/Makefile

@@ -1,5 +1,5 @@
 DIR=	${CONFDIR}
-CONF=	bootmisc fsck hostname local localmount network staticroute urandom
+CONF=	bootmisc fsck hostname localmount network staticroute urandom
 
 TARGETS+=	network staticroute
 CLEANFILES+=	network staticroute

conf.d/hwclock

@@ -9,6 +9,14 @@ clock="UTC"
 # 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

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

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

doc/net.example.BSD.in

@@ -23,7 +23,7 @@
 # We now support modular networking scripts which means we can easily
 # add support for new interface types and modules while keeping
 # compatibility with existing ones.
-# 
+#
 # Modules load by default if the package they need is installed.  If
 # you specify a module here that doesn't have its package installed
 # then you get an error stating which package you need to install.
@@ -67,10 +67,12 @@
 # If a specified module fails (like dhcp - see below), you can specify a
 # fallback like so
 #fallback_eth0="192.168.0.2 netmask 255.255.255.0"
-#fallback_route_eth0="default via 192.168.0.1"
+#fallback_routes_eth0="default via 192.168.0.1"
 
 # NOTE: fallback entry must match the entry location in config_eth0
 # As such you can only have one fallback route.
+# Also, if you do not set a fallback_routes entry for an interface, the
+# routes entry will be used if that is set.
 
 # Some users may need to alter the MTU - here's how
 #mtu_eth0="1500"
@@ -212,7 +214,7 @@
 # not find them in a scan
 # "forcepreferredonly" means it forcibly connects to the APs in order and
 # does not bother to scan
-# "forceany" does the same as forcepreferred + connects to any other 
+# "forceany" does the same as forcepreferred + connects to any other
 # available AP
 # Default is "any"
 #associate_order="any"
@@ -266,13 +268,13 @@
 # won't have associated then)
 
 # If you're using anything else to configure wireless on your interface AND
-# you have installed wpa_supplicant, you need to disable wpa_supplicant 
+# you have installed wpa_supplicant, you need to disable wpa_supplicant
 #modules="!iwconfig !wpa_supplicant"
 #or
 #modules="!wireless"
 
 ##############################################################################
-# WIRELESS SSID IN VARIABLES 
+# WIRELESS SSID IN VARIABLES
 ##############################################################################
 # Remember to change SSID to your SSID.
 # Say that your SSID is My NET - the line
@@ -368,7 +370,7 @@
 
 ##############################################################################
 # ADVANCED CONFIGURATION
-# 
+#
 # Four functions can be defined which will be called surrounding the
 # start/stop operations.  The functions are called with the interface
 # name first so that one function can control multiple adapters. An extra two

doc/net.example.Linux.in

@@ -24,7 +24,7 @@
 # We now support modular networking scripts which means we can easily
 # add support for new interface types and modules while keeping
 # compatibility with existing ones.
-# 
+#
 # Modules load by default if the package they need is installed.  If
 # you specify a module here that doesn't have its package installed
 # then you get an error stating which package you need to install.
@@ -49,7 +49,7 @@
 
 ##############################################################################
 # INTERFACE HANDLERS
-# 
+#
 # We provide two interface handlers presently: ifconfig and iproute2.
 # You need one of these to do any kind of network configuration.
 # For ifconfig support, emerge sys-apps/net-tools
@@ -94,10 +94,12 @@
 # If a specified module fails (like dhcp - see below), you can specify a
 # fallback like so
 #fallback_eth0="192.168.0.2/24"
-#fallback_route_eth0="default via 192.168.0.1"
+#fallback_routes_eth0="default via 192.168.0.1"
 
 # NOTE: fallback entry must match the entry location in config_eth0
 # As such you can only have one fallback route.
+# Also, if you do not set a fallback_routes entry for an interface, the
+# routes entry will be used if that is set.
 
 # Some users may need to alter the MTU - here's how
 #mtu_eth0="1500"
@@ -297,7 +299,7 @@
 # Surround each SSID with the " character and separate them with a space
 # If the first SSID isn't found then it moves onto the next
 # If this isn't defined then it connects to the first one found
-#preferred_aps="SSID1 SSID2" 
+#preferred_aps="SSID1 SSID2"
 
 # You can also define a preferred_aps list per interface
 #preferred_aps_eth0="SSID3 SSID4"
@@ -371,13 +373,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
@@ -421,7 +423,7 @@
 # Notes:
 # - All clients send the current hostname to the DHCP server by default
 # - dhcpcd does not daemonize when the lease time is infinite
-# - udhcp-0.9.3-r3 and earlier do not support getting NTP servers 
+# - udhcp-0.9.3-r3 and earlier do not support getting NTP servers
 # - pump does not support getting NIS servers
 # - DHCP tends to erase any existing device information - so add
 #   static addresses after dhcp if you need them
@@ -467,7 +469,7 @@
 #fallback_eth0="apipa"
 
 #-----------------------------------------------------------------------------
-# ARPING Gateway configuration 
+# ARPING Gateway configuration
 # and
 # Automatic Private IP Addressing (APIPA)
 # For arpingnet / apipa support, emerge net-misc/iputils or net-analyzer/arping
@@ -527,7 +529,8 @@
 
 #-----------------------------------------------------------------------------
 # VLAN (802.1q support)
-# For VLAN support, emerge net-misc/vconfig
+# For VLAN support, emerge sys-apps/iproute2
+# The old vconfig based VLAN support is no longer available.
 
 # Specify the VLAN numbers for the interface like so
 # Please ensure your VLAN IDs are NOT zero-padded
@@ -537,10 +540,27 @@
 # need it up.
 #config_eth0="null"
 
-# You can also configure the VLAN - see for vconfig man page for more details
-#vconfig_eth0="set_name_type VLAN_PLUS_VID_NO_PAD"
-#vconfig_vlan1="set_flag 1
-#set_egress_map 2 6"
+# You can also configure the VLAN - see for ip man page for more details
+# To change the vlan interface name. If not set, the standard "iface.vlanid"
+# will be used. This is the replacement for the old 'vconfig set_name_type'
+# functionality.
+#vlan1_name="vlan1"
+#vlan2_name="eth0.2"
+
+# The following shows the old set_name_type setting and what new option to set:
+# Using eth9 & VLAN VID 26 as an example.
+# VLAN_PLUS_VID         vlan26_name="vlan0026"
+# VLAN_PLUS_VID_NO_PAD  vlan26_name="vlan26"
+# DEV_PLUS_VID          vlan26_name="eth9.0026"
+# DEV_PLUS_VID_NO_PAD   vlan26_name="eth9.26"
+
+# Set the vlan flags
+#vlan1_flags="reorder_hdr off gvrp on loose_binding on"
+
+# Configure in/egress maps
+#vlan1_ingress="2:6 3:5"
+#vlan1_egress="1:2"
+
 #config_vlan1="172.16.3.1/23"
 #config_vlan2="172.16.2.1/23"
 
@@ -553,8 +573,7 @@
 # This means you do not need to create init scripts in /etc/init.d for each
 # vlan, you must need to create one for the physical interface.
 # If you wish to control the configuration of each vlan through a separate
-# script, or wish to rename the vlan interface to something that vconfig
-# cannot then you need to do this.
+# script 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
@@ -582,7 +601,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
@@ -620,7 +639,7 @@
 #
 # Here you should specify what pppd plugins you want to use
 # Available plugins are: pppoe, pppoa, capi, dhcpc, minconn, radius,
-#			 radattr, radrealms and winbind 
+#			 radattr, radrealms and winbind
 #plugins_ppp0="pppoe"			# Required plugin for PPPoE
 #plugins_ppp0="pppoa vc-encaps"		# Required plugin for PPPoA with an option
 #plugins_ppp0="capi"			# Required plugin for ISDN
@@ -660,7 +679,7 @@
 #	lcp-echo-interval 15	# Send a LCP echo every 15 seconds
 #	lcp-echo-failure 3	# Make peer dead after 3 consecutive
 #				# echo-requests
-#	
+#
 # Compression options - use these to completely disable compression
 #	noaccomp noccp nobsdcomp nodeflate nopcomp novj novjccomp
 #
@@ -787,11 +806,18 @@
 #bridge_add_eth0="br0"
 #bridge_add_eth1="br0"
 
-# You need to configure the ports to null values so dhcp does not get started 
+# NOTE: If you want to manually start an empty bridge, and then dynamically add
+# ports to it you must set at least one of the following variables based on the
+# interface name, so that we can pick it up from your configuration. Even an
+# empty value variable is fine, but at least one of them must be set:
+# brctl_IFVAR
+
+# You need to configure the ports to null values so dhcp does not get started
 #config_eth0="null"
 #config_eth1="null"
 
-# Finally give the bridge an address - dhcp or a static IP
+# Finally give the bridge an address - dhcp or a static IP, this is assigned to
+# the bridge when the bridge is explicitly started.
 #config_br0="dhcp" # may not work when adding ports dynamically
 #config_br0="192.168.0.1/24"
 
@@ -805,8 +831,15 @@
 #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.
@@ -852,6 +885,52 @@
 #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
@@ -913,9 +992,75 @@
 #ifplugd_eth0="--api-mode=wlan"
 # man ifplugd for more options
 
+#-----------------------------------------------------------------------------
+# Interface hardware tuning & configuration via ethtool
+# If you need to change explicit hardware settings on your network card prior
+# to bringing the interface up, the following is available.
+#
+# For a full listing of settings, please consulting ethtool(8) and the output
+# of "ethtool --help".
+#
+# Multiple entries (seperated by newlines) are supported in all of the
+# variables as some settings cannot be changed at the same time.
+#
+# Valid variable name fragments: change pause coalesce ring offload
+# change_eeprom identify nfc flash rxfh_indir ntuple
+
+# Set Wake-On-Lan to listen for SecureOn MagicPacket(tm), the message level to
+# notify us of WOL changes, and the SecureOn password to 'DE:AD:BE:EF:CA:FE'.
+#ethtool_change_eth0="wol gs
+#msglvl wol on
+#sopass DE:AD:BE:EF:CA:FE"
+
+# Disable pause auto-negotiation and explicitly enable RX and TX pause.
+#ethtool_pause_eth0="autoneg off
+#rx on tx on"
+
+# Enasble adaptive RX and TX coalescing
+#ethtool_coalesce_eth0="adaptive-rx on adaptive-tx on"
+
+# Change ring buffer settings
+#ethtool_ring_eth0=""
+
+# Enable all offload settings
+#ethtool_offload_eth0="rx on tx on sg on tso on ufo on gso on gro on lro on"
+
+# Change specific bytes in the EEPROM
+#ethtool_change_eeprom_eth0=""
+
+# Run the identify sequence on the interface for 1 second (does not return until completion)
+#ethtool_identify_eth0="1"
+
+# Configure receive network flow classification
+#ethtool_nfc_eth0="
+#rx-flow-hash tcp4 f
+#rx-flow-hash udp4 s"
+
+# Flash firmware to all regions
+#ethtool_flash_eth0="/some/path/firmware1 0"
+
+# Flash firmware to region 1
+#ethtool_flash_eth0="/some/path/firmware2 1"
+
+# Set receive flow hash indirection table for even balancing between N receive queues
+#ethtool_rxfh_indir_eth0="equal 4"
+
+# Configure Rx ntuple filters and actions
+#ethtool_ntuple_eth0=""
+
+# Additionally, there is a special control variable, if you need to change the
+# order of option processing. The default order is:
+# flash change-eeprom change pause coalesce ring offload identify nfc rxfh-indir ntuple
+
+# Set global order to default
+#ethtool_order="flash change-eeprom change pause coalesce ring offload identify nfc rxfh-indir ntuple"
+
+# Hypothetical network card that requires a change-eeprom toggle to enable flashing
+#ethtool_order_eth0="change-eeprom flash change pause coalesce ring offload nfc rxfh-indir ntuple"
+
 ##############################################################################
 # ADVANCED CONFIGURATION
-# 
+#
 # Four functions can be defined which will be called surrounding the
 # start/stop operations.  The functions are called with the interface
 # name first so that one function can control multiple adapters. An extra two
@@ -941,7 +1086,7 @@
 #	if mii-tool "${IFACE}" 2> /dev/null | grep -q 'no link'; then
 #		ewarn "No link on ${IFACE}, aborting configuration"
 #		return 1
-#	fi 
+#	fi
 #
 #	# Test for link on the interface prior to bringing it up.  This
 #	# only works on some network adapters and requires the ethtool
@@ -980,33 +1125,6 @@
 #	# This function could be used, for example, to register with a
 #	# dynamic DNS service.  Another possibility would be to
 #	# send/receive mail once the interface is brought up.
-
-#	# Here is an example that allows the use of iproute rules
-#	# which have been configured using the rules_eth0 variable.
-#	#rules_eth0=" \
-#	#	'from 24.80.102.112/32 to 192.168.1.0/24 table localnet priority 100' \
-#	#	'from 216.113.223.51/32 to 192.168.1.0/24 table localnet priority 100' \
-#	#"
-#	eval set -- \$rules_${IFVAR}
-#	if [ $# != 0 ]; then
-#		einfo "Adding IP policy routing rules"
-#		eindent
-#		# Ensure that the kernel supports policy routing
-#		if ! ip rule list | grep -q "^"; then
-#			eerror "You need to enable IP Policy Routing (CONFIG_IP_MULTIPLE_TABLES)"
-#			eerror "in your kernel to use ip rules"
-#		else
-#			for x; do
-#				ebegin "${x}"
-#				ip rule add ${x}
-#				eend $?
-#			done
-#		fi
-#		eoutdent
-#		# Flush the cache
-#		ip route flush cache dev "${IFACE}"
-#	fi
-
 #}
 
 #postdown() {
@@ -1014,21 +1132,6 @@
 #	# Probably a good idea to set ifdown="no" in /etc/conf.d/net
 #	# as well ;)
 #	[ "${IFACE}" != "lo" ] && ethtool -s "${IFACE}" wol g
-
-#	Automatically erase any ip rules created in the example postup above
-#	if interface_exists "${IFACE}"; then
-#		# Remove any rules for this interface
-#		local rule
-#		ip rule list | grep " iif ${IFACE}[ ]*" | {
-#			while read rule; do
-#				rule="${rule#*:}"	
-#				ip rule del ${rule}
-#			done
-#		}
-#		# Flush the route cache
-#		ip route flush cache dev "${IFACE}"
-#	fi
-
 #	# Return 0 always
 #	return 0
 #}

etc/Makefile

@@ -7,3 +7,15 @@ 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,6 +1,2 @@
 SED_EXTRA=	-e 's:@TERM@:wsvt25:g'
-SRCS+=		rc.in rc.shutdown.in
-
-rc.conf:
-	cp rc.conf.in rc.conf
-	cat rc.conf.Linux >> rc.conf
+SRCS+=		rc.conf.in rc.in rc.shutdown.in

etc/rc.conf.FreeBSD

@@ -0,0 +1,11 @@
+# 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,3 +1,19 @@
+# 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@"
 
 ##############################################################################
 # LINUX SPECIFIC OPTIONS

etc/rc.conf.NetBSD

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

@@ -11,7 +11,8 @@
 
 # Set rc_interactive to "YES" and you'll be able to press the I key during
 # boot so you can choose to start specific services. Set to "NO" to disable
-# this feature.
+# this feature. This feature is automatically disabled if rc_parallel is
+# set to YES.
 #rc_interactive="YES"
 
 # If we need to drop to a shell, you can specify it here.
@@ -20,7 +21,7 @@
 # Linux users could specify /sbin/sulogin
 #rc_shell=/bin/sh
 
-# Do we allow any started service in the runlevel to satisfy the depedency
+# Do we allow any started service in the runlevel to satisfy the dependency
 # or do we want all of them regardless of state? For example, if net.eth0
 # and net.eth1 are in the default runlevel then with rc_depend_strict="NO"
 # both will be started, but services that depend on 'net' will work if either
@@ -75,8 +76,14 @@
 # Set unicode to YES to turn on unicode support for keyboards and screens.
 #unicode="NO"
 
-# Network fstypes. Below is the default.
-net_fs_list="afs cifs coda davfs fuse fuse.sshfs gfs glusterfs lustre ncpfs nfs nfs4 ocfs2 shfs smbfs"
+# Below is the default list of network fstypes.
+#
+# afs cifs coda davfs fuse fuse.sshfs gfs glusterfs lustre ncpfs
+# nfs nfs4 ocfs2 shfs smbfs
+#
+# If you would like to add to this list, you can do so by adding your
+# own fstypes to the following variable.
+#extra_net_fs_list=""
 
 ##############################################################################
 # SERVICE CONFIGURATION VARIABLES
@@ -88,7 +95,7 @@ net_fs_list="afs cifs coda davfs fuse fuse.sshfs gfs glusterfs lustre ncpfs nfs
 # We can set some things on a per service basis, like the nicelevel.
 #export SSD_NICELEVEL="-19"
 
-# Pass ulimit parameters 
+# Pass ulimit parameters
 #rc_ulimit="-u 30"
 
 # It's possible to define extra dependencies for services like so
@@ -108,3 +115,4 @@ net_fs_list="afs cifs coda davfs fuse fuse.sshfs gfs glusterfs lustre ncpfs nfs
 # You can also remove dependencies.
 # This is mainly used for saying which servies do NOT provide net.
 #rc_net_tap0_provide="!net"
+

etc/rc.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/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

@@ -43,7 +43,7 @@ find_wireless()
 		done
 		;;
 	esac
-	
+
 	return 1
 }
 

init.d/Makefile

@@ -5,12 +5,10 @@ SRCS=	bootmisc.in fsck.in hostname.in local.in localmount.in netmount.in \
 BIN=	${OBJS}
 
 # Build our old net foo or not
-_OLDNET_SH=	case "${MKOLDNET}" in \
-		[Yy][Ee][Ss]) echo "net.lo";; \
-		*) echo "";; \
-		esac
-_OLDNET!=	${_OLDNET_SH}
-_NET_LO=	${_OLDNET}$(shell ${_OLDNET_SH})
+ifeq (${MKOLDNET},yes)
+_OLDNET=	net.lo
+endif
+_NET_LO=	${_OLDNET}
 
 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}}
@@ -26,7 +26,7 @@ depend()
 }
 
 start()
-{	
+{
 	ebegin "Starting the System Clock Adjuster [${utc}]"
 	if [ "$clock" != "UTC" ]; then
 		echo >/etc/wall_cmos_clock

init.d/bootmisc.in

@@ -4,11 +4,10 @@
 
 depend()
 {
-	use hostname
 	need localmount
 	before logger
 	after clock sysctl
-	keyword -prefix
+	keyword -prefix -timeout
 }
 
 dir_writeable()
@@ -26,39 +25,40 @@ cleanup_tmp_dir()
 		mkdir -p "$dir" || return $?
 	fi
 	dir_writeable "$dir" || return 1
-	chmod a+rwt "$dir"
-	cd "$dir"
+	chmod a+rwt "$dir" 2> /dev/null
+	cd "$dir" || return 1
 	if yesno $wipe_tmp; then
 		ebegin "Wiping $dir directory"
-		local startopts="-x . -depth"
-		[ "$RC_UNAME" = Linux ] && startopts=". -xdev -depth"
 
-		# Faster than find
-		rm -rf -- [^ajlq\.]*
+		# Faster than raw find
+		if ! rm -rf -- [^ajlq\.]* 2>/dev/null ; then
+			# Blah, too many files
+			find . -maxdepth 1 -name '[^ajlq\.]*' -exec rm -rf -- {} +
+		fi
 
-		find $startopts ! -name . \
-			! -path "./lost+found" \
-			! -path "./lost+found/*" \
-			! -path "./quota.user" \
-			! -path "./quota.user/*" \
-			! -path "./aquota.user" \
-			! -path "./aquota.user/*" \
-			! -path "./quota.group" \
-			! -path "./quota.group/*" \
-			! -path "./aquota.group" \
-			! -path "./aquota.group/*" \
-			! -path "./journal" \
-			! -path "./journal/*" \
-			! -path "./.private" \
-			! -path "./.private/*" \
-			-exec rm -rf {} \;
+		# pam_mktemp creates a .private directory within which
+		# each user gets a private directory with immutable
+		# bit set; remove the immutable bit before trying to
+		# remove it.
+		[ -d /tmp/.private ] && chattr -R -a /tmp/.private 2> /dev/null
+
+		# Prune the paths that are left
+		find . -maxdepth 1 \
+			! -name . \
+			! -name lost+found \
+			! -name quota.user \
+			! -name aquota.user \
+			! -name quota.group \
+			! -name aquota.group \
+			! -name journal \
+			-exec rm -rf -- {} +
 		eend 0
 	else
 		ebegin "Cleaning $dir directory"
-		rm -rf -- "$dir"/.X*-lock "$dir"/esrv* "$dir"/kio* \
-			"$dir"/jpsock.* "$dir"/.fam* "$dir"/.esd* \
-			"$dir"/orbit-* "$dir"/ssh-* "$dir"/ksocket-* \
-			"$dir"/.*-unix
+		rm -rf -- .X*-lock esrv* kio* \
+			jpsock.* .fam* .esd* \
+			orbit-* ssh-* ksocket-* \
+			.*-unix
 		eend 0
 	fi
 }
@@ -74,7 +74,7 @@ mkutmp()
 start()
 {
 	# Remove any added console dirs
-	rm -rf "$RC_LIBEXECDIR"/console
+	rm -rf "$RC_LIBEXECDIR"/console/*
 
 	local logw=false runw=false extra=
 	# Ensure that our basic dirs exist
@@ -85,7 +85,7 @@ start()
 				eend 1 "failed to create needed directory $x"
 				return 1
 			fi
-		fi 
+		fi
 	done
 
 	if dir_writeable /var/run; then
@@ -134,7 +134,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

init.d/consolefont.in

@@ -61,12 +61,6 @@ 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/hostid.in

@@ -68,7 +68,7 @@ reset()
 start()
 {
 	if [ -r "$hostid_file" ]; then
-		_set $(cat "$hostid_file") 
+		_set $(cat "$hostid_file")
 	else
 		reset
 	fi

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."
 
@@ -87,17 +87,21 @@ 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
-		_hwclock --hctosys $utc_cmd $clock_args
+		if yesno $clock_hctosys; then
+			_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
@@ -126,7 +130,7 @@ stop()
 	_hwclock --systohc $utc_cmd $clock_args
 	retval=$?
 
-	eend $retval "Failed to sync clocks" 
+	eend $retval "Failed to sync clocks"
 }
 
 save()

init.d/ipfw.in

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

@@ -17,7 +17,7 @@ start()
 	: ${unicode:=$UNICODE}
 	: ${keymap:=$KEYMAP}
 	: ${extended_keymaps:=$EXTENDED_KEYMAPS}
-	: ${windowkeys:=$SET_WINDOWSKEYS} 
+	: ${windowkeys:=$SET_WINDOWSKEYS}
 	: ${fix_euro:=$FIX_EURO}
 	: ${dumpkeys_charset:=${DUMPKEYS_CHARSET}}
 

init.d/killprocs.in

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

init.d/localmount.in

@@ -8,19 +8,23 @@ depend()
 {
 	need fsck
 	use lvm modules mtab
+	after lvm modules
 	keyword -jail -openvz -prefix -vserver -lxc
 }
 
 start()
 {
 	# Mount local filesystems in /etc/fstab.
-	local types="noproc" x=
+	local types="noproc" x= no_netdev=
 	for x in $net_fs_list; do
 		types="${types},${x}"
 	done
 
+	if [ "$RC_UNAME" = Linux ]; then
+		no_netdev="-O no_netdev"
+	fi
 	ebegin "Mounting local filesystems"
-	mount -at "$types"
+	mount -at "$types" $no_netdev
 	eend $? "Some local filesystem failed to mount"
 
 	# Always return 0 - some local mounts may not be critical for boot
@@ -54,8 +58,8 @@ stop()
 
 	. "$RC_LIBEXECDIR"/sh/rc-mount.sh
 
-	# Umount loopback devices
-	einfo "Unmounting loopback devices"
+	# Umount loop devices
+	einfo "Unmounting loop devices"
 	eindent
 	do_unmount "umount -d" --skip-point-regex "$no_umounts_r" \
 		--node-regex "^/dev/loop"

init.d/moused.in

@@ -21,13 +21,13 @@ depend()
 
 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/net.lo.in

@@ -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+)
+			netmask|broadcast|brd|brd+|peer|pointopoint)
 				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 module=
+	local IFACE=${RC_SVCNAME#*.} oneworked=false fallback=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,6 +563,7 @@ start()
 		else
 			eval config=\$fallback_${config_index}
 			if [ -n "${config}" ]; then
+				fallback=true
 				eoutdent
 				ewarn "Trying fallback configuration ${config}"
 				eindent
@@ -585,8 +586,13 @@ start()
 		return 1
 	fi
 
-	local hidefirstroute=false first=true
-	local routes="$(_get_array "routes_${IFVAR}")"
+	local hidefirstroute=false first=true routes=
+	if ${fallback}; then
+		routes="$(_get_array "fallback_routes_${IFVAR}")"
+	fi
+	if [ -z "${routes}" ]; then
+		routes="$(_get_array "routes_${IFVAR}")"
+	fi
 	if [ "${IFACE}" = "lo" -o "${IFACE}" = "lo0" ]; then
 		if [ "${config_0}" != "null" ]; then
 			routes="127.0.0.0/8 via 127.0.0.1
@@ -638,7 +644,7 @@ ${routes}"
 	if [ "$(command -v postup)" = "postup" ]; then
 		ebegin "Running postup"
 		eindent
-		postup 
+		postup
 		eoutdent
 	fi
 
@@ -684,7 +690,11 @@ stop()
 
 	# Only delete addresses for interfaces that exist
 	if _exists; then
-		_delete_addresses "${IFACE}"
+		# PPP can manage it's own addresses when IN_BACKGROUND
+		# Important in case "demand" set on the ppp link
+		if ! (yesno ${IN_BACKGROUND} && is_ppp) ; then
+			_delete_addresses "${IFACE}"
+		fi
 	fi
 
 	for module in ${MODULES}; do

init.d/netmount.in

@@ -39,11 +39,11 @@ depend()
 }
 
 start()
-{	
+{
 	local myneed= myuse= pmap="portmap" nfsmounts=
 	[ -x @SYSCONFDIR@/init.d/rpcbind ] && pmap="rpcbind"
 
-	local x= fs=
+	local x= fs= rc=
 	for x in $net_fs_list; do
 		case "$x" in
 			nfs|nfs4)
@@ -65,7 +65,12 @@ start()
 
 	ebegin "Mounting network filesystems"
 	mount -at $fs
-	ewend $? "Could not mount all network filesystems"
+	rc=$?
+	if [ "$RC_UNAME" = Linux ]; then
+		mount -a -O _netdev
+		rc=$?
+	fi
+	ewend $rc "Could not mount all network filesystems"
 	return 0
 }
 
@@ -93,5 +98,9 @@ stop()
 	retval=$?
 
 	eoutdent
+	if [ "$RC_UNAME" = Linux ]; then
+		umount -a -O _netdev
+		retval=$?
+	fi
 	eend $retval "Failed to unmount network filesystems"
 }

init.d/network.in

@@ -222,7 +222,7 @@ start()
 	einfo "Starting network"
 	routeflush
 	if [ "$RC_UNAME" = "Linux" ]; then
-		ifconfig lo 127.0.0.1 netmask 255.0.0.0 || cr=1 
+		ifconfig lo 127.0.0.1 netmask 255.0.0.0 || cr=1
 		route add -net 127.0.0.0 netmask 255.0.0.0 \
 			gw 127.0.0.1 reject 2>/dev/null
 	else
@@ -287,7 +287,7 @@ start()
 		[ $r != 0 ]
 		veend $?
 	fi
-	
+
 	if [ -n "$defaultroute" ]; then
 		ebegin "Setting default route $defaultroute"
 		route add default $defaultroute

init.d/pf.in

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

@@ -8,17 +8,22 @@ start()
 {
 	if [ -e "$RC_SVCDIR"/clock-skewed ]; then
 		ewarn "WARNING: clock skew detected!"
-		if ! yesno "savecache_skewed"; then
+		if ! yesno "${RC_GOINGDOWN}"; 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
-			eend $?
-			return $?
+			rc=$?
+			if yesno "${RC_GOINGDOWN}"; then
+				rc=0
+			fi
+			eend $rc
+			return $rc
 		fi
 	fi
 	local save=
@@ -28,5 +33,9 @@ start()
 	if [ -n "$save" ]; then
 		cp -p $save "$RC_LIBEXECDIR"/cache 2>/dev/null
 	fi
-	eend $?
+	rc=$?
+	if yesno "${RC_GOINGDOWN}"; then
+		rc=0
+	fi
+	eend $rc
 }

init.d/staticroute.in

@@ -81,7 +81,7 @@ do_routes()
 					*) family=;;
 					esac
 				fi
-				route $famly $xtra $2 -$args
+				route $family $xtra $2 -$args
 				;;
 			esac
 			veend $?

init.d/swap-blk.in

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

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

@@ -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,7 +4,6 @@
 
 depend()
 {
-	use hostname
 	before bootmisc logger
 	keyword -prefix
 }

init.d/sysctl.Linux.in

@@ -4,9 +4,8 @@
 
 depend()
 {
-	use hostname
 	before bootmisc logger
-	keyword -openvz -prefix -vserver
+	keyword -prefix -vserver
 }
 
 start()

init.d/termencoding.in

@@ -10,6 +10,8 @@ ttyn=${rc_tty_number:-${RC_TTY_NUMBER:-12}}
 depend()
 {
 	keyword -openvz -prefix -uml -vserver -xenu
+	need root
+	after bootmisc
 }
 
 start()
@@ -31,5 +33,16 @@ 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,7 +2,7 @@
 # Copyright (c) 2008 Roy Marples <roy@marples.name>
 # All rights reserved. Released under the 2-clause BSD license.
 
-depend() 
+depend()
 {
 	after fsck
 	keyword -prefix
@@ -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/wscons.in

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

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

local.d/README

@@ -0,0 +1,9 @@
+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/rc-status.8

@@ -62,6 +62,10 @@ 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/runscript.8

@@ -138,13 +138,6 @@ 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 -jail
-When in a jail, exclude this service from any dependencies. The service can
-still be run directly.
-.It Dv -openvz
-Same as -jail, but for OpenVZ systems.
-.It Dv -lxc
-Same as -jail, but for Linux Resource Containers (LXC).
 .It Dv -shutdown
 Don't stop this service when shutting the system down.
 This normally quite safe as remaining daemons will be sent a SIGTERM just
@@ -155,7 +148,20 @@ have this keyword.
 Don't stop this service when changing runlevels, even if not present.
 This includes shutting the system down.
 .It Dv -timeout
-Do not time out waiting for that service.
+Other services should wait indefinitely for this service to start. Use
+this keyword if your service may take longer than 60 seconds to start.
+.It Dv -jail
+When in a jail, exclude this service from any dependencies. The service can
+still be run directly. Set via 
+.Ic rc_sys 
+in 
+.Pa /etc/rc.conf
+.It Dv -lxc
+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

mk/cc.mk

@@ -5,9 +5,9 @@ CFLAGS?=	-O2
 
 # Default to using the C99 standard
 CSTD?=		c99
-_CSTD_SH=	if test -n "${CSTD}"; then echo "-std=${CSTD}"; else echo ""; fi
-_CSTD!=		${_CSTD_SH}
-CFLAGS+=	${_CSTD}$(shell ${_CSTD_SH})
+ifneq (${CSTD},)
+CFLAGS+=	-std=${CSTD}
+endif
 
 # 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,5 +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!=	${_CC_FLAGS_SH}
-CFLAGS+=	${_CC_FLAGS}$(shell ${_CC_FLAGS_SH})
+_CC_FLAGS:=	$(shell ${_CC_FLAGS_SH})
+CFLAGS+=	${_CC_FLAGS}

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!=	${_RC_DEBUG_SH}
-CPPFLAGS+=	${_RC_DEBUG}$(shell ${_RC_DEBUG_SH})
+_RC_DEBUG:=	$(shell ${_RC_DEBUG_SH})
+CPPFLAGS+=	${_RC_DEBUG}
 
 # 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!=	${_LD_DEBUG_SH}
-LDFLAGS+=	${_LD_DEBUG}$(shell ${_LD_DEBUG_SH})
+_LD_DEBUG:=	$(shell ${_LD_DEBUG_SH})
+LDFLAGS+=	${_LD_DEBUG}
 
 _GGDB_SH=	case "${DEBUG}" in "") echo "";; *) echo "-ggdb";; esac
-_GGDB!=		${_GGDB_SH}
-CFLAGS+=	${_GGDB}$(shell ${_GGDB_SH})
+_GGDB:=		$(shell ${_GGDB_SH})
+CFLAGS+=	${_GGDB}

mk/depend-.mk

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

mk/depend-gmake.mk

@@ -1,3 +0,0 @@
-# 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,9 +10,4 @@ IGNOREFILES+=	.depend
 
 depend: .depend extra_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
+-include .depend

mk/dist.mk

@@ -9,14 +9,21 @@ DISTFILE?=	${DISTPREFIX}.tar.bz2
 CLEANFILES+=	${NAME}-*.tar.bz2
 
 _SNAP_SH=	date -u +%Y%m%d%H%M
-_SNAP!=		${_SNAP_SH}
-SNAP=		${_SNAP}$(shell ${_SNAP_SH})
+_SNAP:=		$(shell ${_SNAP_SH})
+SNAP=		${_SNAP}
 SNAPDIR=	${DISTPREFIX}-${SNAP}
 SNAPFILE=	${SNAPDIR}.tar.bz2
 
 dist:
 	git archive --prefix=${DISTPREFIX}/ ${GITREF} | bzip2 > ${DISTFILE}
 
+distcheck: dist
+	rm -rf ${DISTPREFIX}
+	tar xf ${DISTFILE}
+	MAKEFLAGS= $(MAKE) -C ${DISTPREFIX}
+	MAKEFLAGS= $(MAKE) -C ${DISTPREFIX} check
+	rm -rf ${DISTPREFIX}
+
 snapshot:
 	rm -rf /tmp/${SNAPDIR}
 	mkdir /tmp/${SNAPDIR}

mk/git.mk

@@ -4,5 +4,5 @@ _GITVER_SH=	if git rev-parse --short HEAD >/dev/null 2>&1; then \
 		else \
 			echo ""; \
 		fi
-_GITVER!=	${_GITVER_SH}
-GITVER=		${_GITVER}$(shell ${_GITVER_SH})
+_GITVER:=	$(shell ${_GITVER_SH})
+GITVER=		${_GITVER}

mk/lib.mk

@@ -31,14 +31,12 @@ lib${LIB}.a:	${OBJS} ${STATICOBJS}
 
 ${SHLIB_NAME}: ${VERSION_MAP}
 LDFLAGS+=	-Wl,--version-script=${VERSION_MAP}
-# We need to ensure we use libraries in /lib
-LDFLAGS+=	-L/${LIBNAME} -Wl,-rpath=/${LIBNAME}
 
 ${SHLIB_NAME}:	${SOBJS}
 	@${ECHO} building shared library $@
 	@rm -f $@ ${SHLIB_LINK}
 	@ln -fs $@ ${SHLIB_LINK}
-	${CC} ${LDFLAGS} -shared -Wl,-x \
+	${CC} ${CFLAGS} ${LDFLAGS} -shared -Wl,-x \
 	-o $@ -Wl,-soname,${SONAME} \
 	${SOBJS} ${LDADD}
 

mk/ncurses.mk

@@ -1,3 +0,0 @@
-LIBTERMCAP?=	-lncurses
-CPPFLAGS+=	-DHAVE_TERMCAP
-LDADD+=		${LIBTERMCAP}

mk/os.mk

@@ -4,8 +4,8 @@
 # Generic definitions
 
 _OS_SH=		uname -s
-_OS!= 		${_OS_SH}
-OS?= 		${_OS}$(shell ${_OS_SH})
+_OS:= 		$(shell ${_OS_SH})
+OS?= 		${_OS}
 include ${MK}/os-${OS}.mk
 
 RC_LIB=		/$(LIBNAME)/rc

mk/pam.mk

@@ -1,6 +1,10 @@
+ifeq (${MKPAM},pam)
 LIBPAM?=	-lpam
 CPPFLAGS+=	-DHAVE_PAM
 LDADD+=		${LIBPAM}
 
 PAMDIR?=	/etc/pam.d
 PAMMODE?=	0644
+else ifneq (${MKPAM},)
+$(error if MKPAM is defined, it must be "pam")
+endif

mk/prog.mk

@@ -15,8 +15,8 @@ _DYNLINK_SH=		if test "${PREFIX}" = "" && test -e /libexec/ld.elf_so; then \
 			else \
 				echo ""; \
 			fi
-_DYNLINK!=		${_DYNLINK_SH}
-LDFLAGS+=		${_DYNLINK}$(shell ${_DYNLINK_SH})
+_DYNLINK:=		$(shell ${_DYNLINK_SH})
+LDFLAGS+=		${_DYNLINK}
 LDFLAGS+=		-Wl,-rpath=${PREFIX}/${LIBNAME}
 LDFLAGS+=		${PROGLDFLAGS}
 
@@ -28,7 +28,7 @@ all: depend ${PROG}
 	${CC} ${CFLAGS} ${CPPFLAGS} -c $< -o $@
 
 ${PROG}: ${SCRIPTS} ${OBJS}
-	${CC} ${LDFLAGS} -o $@ ${OBJS} ${LDADD}
+	${CC} ${CFLAGS} ${LDFLAGS} -o $@ ${OBJS} ${LDADD}
 
 clean:
 	rm -f ${CLEANFILES}

mk/scripts.mk

@@ -8,11 +8,11 @@ include ${MK}/os.mk
 OBJS+=	${SRCS:.in=}
 
 _PKG_SED_SH=		if test "${PREFIX}" = "${PKG_PREFIX}"; then echo "-e 's:@PKG_PREFIX@::g'"; else echo "-e 's:@PKG_PREFIX@:${PKG_PREFIX}:g'"; fi
-_PKG_SED!=		${_PKG_SED_SH}
+_PKG_SED:=		$(shell ${_PKG_SED_SH})
 _LCL_SED_SH=		if test "${PREFIX}" = "${LOCAL_PREFIX}"; then echo "-e 's:@LOCAL_PREFIX@::g'"; else echo "-e 's:@LOCAL_PREFIX@:${LOCAL_PREFIX}:g'"; fi
-_LCL_SED!=		${_LCL_SED_SH}
+_LCL_SED:=		$(shell ${_LCL_SED_SH})
 
-SED_REPLACE=		-e 's:@SHELL@:${SH}:g' -e 's:@LIB@:${LIBNAME}:g' -e 's:@SYSCONFDIR@:${SYSCONFDIR}:g' -e 's:@LIBEXECDIR@:${LIBEXECDIR}:g' -e 's:@PREFIX@:${PREFIX}:g' ${_PKG_SED}$(shell ${_PKG_SED_SH}) ${_LCL_SED}$(shell ${_LCL_SED_SH})
+SED_REPLACE=		-e 's:@SHELL@:${SH}:g' -e 's:@LIB@:${LIBNAME}:g' -e 's:@SYSCONFDIR@:${SYSCONFDIR}:g' -e 's:@LIBEXECDIR@:${LIBEXECDIR}:g' -e 's:@PREFIX@:${PREFIX}:g' -e 's:@RC_SYS_DEFAULT@:${MKRCSYS}:g' ${_PKG_SED} ${_LCL_SED}
 
 # Tweak our shell scripts
 .SUFFIXES:	.sh.in .in

mk/sys.mk

@@ -12,8 +12,8 @@ SH=			/bin/sh
 
 PREFIX?=	
 _UPREFIX_SH=		case "${PREFIX}" in "") echo /usr;; *) echo "${PREFIX}";; esac
-_UPREFIX!=		${_UPREFIX_SH}
-UPREFIX=		${_UPREFIX}$(shell ${_UPREFIX_SH})
+_UPREFIX:=		$(shell ${_UPREFIX_SH})
+UPREFIX=		${_UPREFIX}
 LOCAL_PREFIX=		/usr/local
 
 PICFLAG?=		-fPIC
@@ -21,6 +21,7 @@ PICFLAG?=		-fPIC
 SYSCONFDIR?=		${PREFIX}/etc
 INITDIR?=		${SYSCONFDIR}/init.d
 CONFDIR?=		${SYSCONFDIR}/conf.d
+LOCALDIR?=		${SYSCONFDIR}/local.d
 
 BINDIR?=		${PREFIX}/sbin
 BINMODE?=		0755
@@ -29,8 +30,8 @@ INCDIR?=		${UPREFIX}/include
 INCMODE?=		0444
 
 _LIBNAME_SH=		case `readlink /lib` in /lib64|lib64) echo "lib64";; *) echo "lib";; esac
-_LIBNAME!=		${_LIBNAME_SH}
-LIBNAME?=		${_LIBNAME}$(shell ${_LIBNAME_SH})
+_LIBNAME:=		$(shell ${_LIBNAME_SH})
+LIBNAME?=		${_LIBNAME}
 LIBDIR?=		${UPREFIX}/${LIBNAME}
 LIBMODE?=		0444
 SHLIBDIR?=		${PREFIX}/${LIBNAME}

mk/termcap.mk

@@ -1,3 +1,11 @@
+ifeq (${MKTERMCAP},ncurses)
+LIBTERMCAP?=	-lncurses
+CPPFLAGS+=	-DHAVE_TERMCAP
+LDADD+=		${LIBTERMCAP}
+else ifeq (${MKTERMCAP},termcap)
 LIBTERMCAP?=	-ltermcap
 CPPFLAGS+=	-DHAVE_TERMCAP
 LDADD+=		${LIBTERMCAP}
+else ifneq (${MKTERMCAP},)
+$(error If MKTERMCAP is defined, it must be ncurses or termcap)
+endif

net/Makefile.Linux

@@ -1,7 +1,7 @@
 SRCS+=		iwconfig.sh.in
 INC+=		adsl.sh apipa.sh arping.sh bonding.sh br2684ctl.sh bridge.sh \
-		ccwgroup.sh clip.sh iproute2.sh ifplugd.sh ip6to4.sh ipppd.sh \
-		iwconfig.sh netplugd.sh pppd.sh pump.sh tuntap.sh udhcpc.sh \
+		ccwgroup.sh clip.sh ethtool.sh iproute2.sh ifplugd.sh ip6to4.sh \
+		ipppd.sh iwconfig.sh netplugd.sh pppd.sh pump.sh tuntap.sh udhcpc.sh \
 		vlan.sh
 
 .SUFFIXES:	.sh.Linux.in

net/apipa.sh

@@ -21,7 +21,7 @@ apipa_start()
 	local iface="$1" i1= i2= addr= i=0
 
 	_exists true || return 1
-	
+
 	einfo "Searching for free addresses in 169.254.0.0/16"
 	eindent
 

net/arping.sh

@@ -19,7 +19,7 @@ arping_address()
 	esac
 
 	# We need to bring the interface up to test
-	_exists "${iface}" || return 1 
+	_exists "${iface}" || return 1
 	_up "${iface}"
 
 	eval w=\$arping_wait_${IFVAR}
@@ -43,7 +43,7 @@ arping_address()
 		sed -n -e 'y/abcdef/ABCDEF/' -e 's/.*\[\([^]]*\)\].*/\1/p')"
 	fi
 	[ -z "${foundmac}" ] && return 1
-	
+
 	if [ -n "${mac}" ]; then
 		if [ "${mac}" != "${foundmac}" ]; then
 			vewarn "Found ${ip} but MAC ${foundmac} does not match"
@@ -74,7 +74,7 @@ arping_start()
 	fi
 
 	eindent
-	
+
 	for x in ${gateways}; do
 		local IFS=,
 		set -- ${x}
@@ -119,7 +119,7 @@ arping_start()
 				fi
 			done
 			unset IFS
-			
+
 			_load_config
 			return 0
 		fi

net/bonding.sh

@@ -46,12 +46,27 @@ bonding_pre_start()
 		return 1
 	fi
 
-	# Configure the bond.
-	# Nice and dynamic :)
+	# Interface must be down in order to configure
+	_down
+
+	# Configure the bond mode, then we can reloop to ensure we configure
+	# All other options
+	for x in /sys/class/net/"${IFACE}"/bonding/mode; do
+		[ -f "${x}" ] || continue
+		n=${x##*/}
+		eval s=\$${n}_${IFVAR}
+		if [ -n "${s}" ]; then
+			einfo "Setting ${n}: ${s}"
+			echo "${s}" >"${x}" || \
+			eerror "Failed to configure $n (${n}_${IFVAR})"
+		fi
+	done
+	# Nice and dynamic for remaining options:)
 	for x in /sys/class/net/"${IFACE}"/bonding/*; do
 		[ -f "${x}" ] || continue
 		n=${x##*/}
 		eval s=\$${n}_${IFVAR}
+		[ "${n}" != "mode" ] || continue
 		if [ -n "${s}" ]; then
 			einfo "Setting ${n}: ${s}"
 			echo "${s}" >"${x}" || \
@@ -85,9 +100,9 @@ bonding_pre_start()
 		if [ -n "${primary}" ]; then
 			echo "+${primary}" >/sys/class/net/"${IFACE}"/bonding/slaves
 			echo "${primary}" >/sys/class/net/"${IFACE}"/bonding/primary
-			slaves="${slaves/${primary}/}"
 		fi
 		for s in ${slaves}; do
+			[ "${s}" = "${primary}" ] && continue
 			echo "+${s}" >/sys/class/net/"${IFACE}"/bonding/slaves
 		done
 	else
@@ -100,7 +115,7 @@ bonding_pre_start()
 
 bonding_stop()
 {
-	_is_bond || return 0	
+	_is_bond || return 0
 
 	local slaves= s=
 	slaves=$( \

net/br2684ctl.sh

@@ -17,7 +17,7 @@ br2684ctl_depend()
 }
 
 _config_vars="$_config_vars bridge bridge_add brctl"
-	
+
 br2684ctl_pre_start()
 {
 	local opts=
@@ -40,7 +40,7 @@ br2684ctl_pre_start()
 			return 1
 			;;
 	esac
-	
+
 	einfo "Starting RFC 2684 Bridge control on ${IFACE}"
 	start-stop-daemon --start --exec $(_br2684ctl) --background \
 		--make-pidfile --pidfile "/var/run/br2684ctl-${IFACE}.pid" \
@@ -52,7 +52,7 @@ br2684ctl_post_stop()
 {
 	local pidfile="/var/run/br2684ctl-${IFACE}.pid"
 	[ -e "${pidfile}" ] || return 0
-	
+
 	einfo "Stopping RFC 2684 Bridge control on ${IFACE}"
 	start-stop-daemon --stop --quiet --pidfile "${pidfile}"
 	eend $?

net/bridge.sh

@@ -11,34 +11,64 @@ _config_vars="$_config_vars bridge bridge_add brctl"
 
 _is_bridge()
 {
-	# Ignore header line so as to allow for bridges named 'bridge'
-	brctl show 2>/dev/null | sed '1,1d' | grep -q "^${IFACE}[[:space:]]"
+	[ -d /sys/class/net/"${1:-${IFACE}}"/bridge ]
+	return $?
+}
+
+_is_bridge_port()
+{
+	[ -d /sys/class/net/"${1:-${IFACE}}"/brport ]
+	return $?
+}
+
+_bridge_ports()
+{
+	for x in /sys/class/net/"${1:-${IFACE}}"/brif/*; do
+		n=${x##*/}
+		echo $n
+	done
 }
 
 bridge_pre_start()
 {
-	local brif= iface="${IFACE}" e= x=
+	local brif= oiface="${IFACE}" e= x=
+	# ports is for static add
 	local ports="$(_get_array "bridge_${IFVAR}")"
+	# old config options
 	local opts="$(_get_array "brctl_${IFVAR}")"
-	
+	# brif is used for dynamic add
 	eval brif=\$bridge_add_${IFVAR}
-	eval x=\${bridge_${IFVAR}-y\}
-	if [ -z "${brif}" -a -z "${opts}" ]; then
-		[ -n "${ports}" -o "${x}" != "y" ] || return 0
+
+	# we need a way to if the bridge exists in a variable name, not just the
+	# contents of a variable. Eg if somebody has only bridge_add_eth0='br0',
+	# with no other lines mentioning br0.
+	eval bridge_unset=\${bridge_${IFVAR}-y\}
+	eval brctl_unset=\${brctl_${IFVAR}-y\}
+
+	if [ -z "${brif}" -a "${brctl_unset}" = 'y' ]; then
+		if [ -z "${ports}" -a "${bridge_unset}" = "y" ]; then
+			#eerror "Misconfigured static bridge detected (see net.example)"
+			return 0
+		fi
 	fi
 
-	[ -n "${ports}" ] && bridge_post_stop
+	# If the bridge was already up, we should clear it
+	[ "${bridge_unset}" != "y" ] && bridge_post_stop
 
 	(
+	# Normalize order of variables
 	if [ -z "${ports}" -a -n "${brif}" ]; then
+		# Dynamic mode detected
 		ports="${IFACE}"
 		IFACE="${brif}"
+		IFVAR=$(shell_var "${IFACE}")
 	else
+		# Static mode detected
 		ports="${ports}"
 		metric=1000
 	fi
 
-	if ! _is_bridge; then
+	if ! _is_bridge ; then
 		ebegin "Creating bridge ${IFACE}"
 		if ! brctl addbr "${IFACE}"; then
 			eend 1
@@ -46,6 +76,12 @@ bridge_pre_start()
 		fi
 	fi
 
+	# TODO: does this reset the bridge every time we add a interface to the
+	# bridge? We should probably NOT do that.
+
+	# Old configuration set mechanism
+	# Only a very limited subset of the options are available in the old
+	# configuration method. The sysfs interface is in the next block instead.
 	local IFS="$__IFS"
 	for x in ${opts}; do
 		unset IFS
@@ -57,21 +93,50 @@ bridge_pre_start()
 	done
 	unset IFS
 
+	# New configuration set mechanism, matches bonding
+	for x in /sys/class/net/"${IFACE}"/bridge/*; do
+		[ -f "${x}" ] || continue
+		n=${x##*/}
+		eval s=\$${n}_${IFVAR}
+		if [ -n "${s}" ]; then
+			einfo "Setting ${n}: ${s}"
+			echo "${s}" >"${x}" || \
+			eerror "Failed to configure $n (${n}_${IFVAR})"
+		fi
+	done
+
 	if [ -n "${ports}" ]; then
 		einfo "Adding ports to ${IFACE}"
 		eindent
 
-		local OIFACE="${IFACE}"
+		local BR_IFACE="${IFACE}"
 		for x in ${ports}; do
 			ebegin "${x}"
 			local IFACE="${x}"
+			local IFVAR=$(shell_var "${IFACE}")
+			if ! _exists "${IFACE}" ; then
+				eerror "Cannot add non-existent interface ${IFACE} to ${BR_IFACE}"
+				return 1
+			fi
+			# The interface is known to exist now
 			_set_flag promisc
 			_up
-			if ! brctl addif "${OIFACE}" "${x}"; then
+			if ! brctl addif "${BR_IFACE}" "${x}"; then
 				_set_flag -promisc
 				eend 1
 				return 1
 			fi
+			# Per-interface bridge settings
+			for x in /sys/class/net/"${IFACE}"/brport/*; do
+				[ -f "${x}" ] || continue
+				n=${x##*/}
+				eval s=\$${n}_${IFVAR}
+				if [ -n "${s}" ]; then
+					einfo "Setting ${n}@${IFACE}: ${s}"
+					echo "${s}" >"${x}" || \
+					eerror "Failed to configure $n (${n}_${IFVAR})"
+				fi
+			done
 			eend 0
 		done
 		eoutdent
@@ -86,27 +151,24 @@ bridge_post_stop()
 {
 	local port= ports= delete=false extra=
 
-	if _is_bridge; then
+	if _is_bridge "${IFACE}"; then
 		ebegin "Destroying bridge ${IFACE}"
 		_down
-		# Ignore header line so as to allow for bridges named 'bridge'
-		ports="$(brctl show 2>/dev/null | \
-			sed -n -e '1,1d' -e '/^'"${IFACE}"'[[:space:]]/,/^\S/ { /^\('"${IFACE}"'[[:space:]]\|\t\)/s/^.*\t//p }')"
+		for x in /sys/class/net/"${IFACE}"/brif/*; do
+			[ -s $x ] || continue
+			n=${x##*/}
+			ports="${ports} ${n}"
+		done
 		delete=true
 		iface=${IFACE}
 		eindent
 	else
-		# Work out if we're added to a bridge for removal or not
-		# Ignore header line so as to allow for bridges named 'bridge'
-		eval set -- $(brctl show 2>/dev/null | sed -e '1,1d' -e "s/'/'\\\\''/g" -e "s/$/'/g" -e "s/^/'/g")
-		local line=
-		for line; do
-			set -- ${line}
-			if [ "$3" = "${IFACE}" ]; then
-				iface=$1
-				break
-			fi
-		done
+		# We are taking down an interface that is part of a bridge maybe
+		ports="${IFACE}"
+		local brport_dir="/sys/class/net/${IFACE}/brport"
+		[ -d ${brport_dir} ] || return 0
+		iface=$(readlink ${brport_dir}/bridge)
+		iface=${iface##*/}
 		[ -z "${iface}" ] && return 0
 		extra=" from ${iface}"
 	fi
@@ -124,6 +186,6 @@ bridge_post_stop()
 		brctl delbr "${iface}"
 		eend $?
 	fi
-	
+
 	return 0
 }

net/ccwgroup.sh

@@ -5,7 +5,7 @@ _config_vars="$_config_vars ccwgroup"
 
 ccwgroup_depend()
 {
-	before interface 
+	before interface
 }
 
 ccwgroup_pre_start()
@@ -42,7 +42,7 @@ ccwgroup_pre_stop()
 {
 	# Erase any existing ccwgroup to be safe
 	service_set_value ccwgroup_device ""
-	
+
 	[ ! -L /sys/class/net/"${FACE}"/driver ] && return 0
 	local driver="$(readlink /sys/class/net/"${IFACE}"/driver)"
 	case "${diver}" in
@@ -59,7 +59,7 @@ ccwgroup_post_stop()
 {
 	local device="$(service_get_value ccwgroup_device)"
 	[ -z "${device}" ] && return 0
-	
+
 	einfo "Disabling ccwgroup on ${iface}"
 	echo "0" >/sys/devices/qeth/"${device}"/online
 	echo "1" >/sys/devices/qeth/"${device}"/ungroup

net/clip.sh

@@ -97,7 +97,7 @@ clip_pre_start()
 	    	return 1
 		fi
     fi
-	
+
     local started_here=
     if ! are_atmclip_svcs_running; then
 		atmclip_svcs_start || return 1

net/ethtool.sh

@@ -0,0 +1,54 @@
+# Copyright (c) 2011 by Gentoo Foundation
+# All rights reserved. Released under the 2-clause BSD license.
+
+_ethtool() {
+	echo /usr/sbin/ethtool
+}
+
+ethtool_depend()
+{
+	program $(_ethtool)
+	before interface
+}
+
+# This is just to trim whitespace, do not add any quoting!
+_trim() {
+	echo $*
+}
+
+ethtool_pre_start() {
+	local order opt OFS="${OIFS}"
+	eval order=\$ethtool_order_${IFVAR}
+	[ -z "${order}" ] && eval order=\$ethtool_order
+	[ -z "${order}" ] && order="flash change-eeprom change pause coalesce ring offload identify nfc rxfh-indir ntuple"
+	# ethtool options not used: --driver, --register-dump, --eeprom-dump, --negotiate, --test, --statistics
+	eindent
+	for opt in ${order} ; do
+		local args
+		eval args=\$ethtool_$(echo $opt | tr - _)_${IFVAR}
+
+		# Skip everything if no arguments
+		[ -z "${args}" ] && continue
+		
+		# Split on \n
+		local IFS="$__IFS"
+
+		for p in ${args} ; do
+			IFS="${OIFS}"
+			local args_pretty="$(_trim "${p}")"
+			# Do nothing if empty
+			[ -z "${args_pretty}" ] && continue
+			args_pretty="--${opt} $IFACE ${args_pretty}"
+			args="--${opt} $IFACE ${args}"
+			ebegin "ethtool ${args_pretty}"
+			$(_ethtool) ${args}
+			rc=$?
+			eend $rc "ethtool exit code $rc"
+			# TODO: ethtool has MANY different exit codes, with no
+			# documentation as to which ones are fatal or not. For now we
+			# simply print the exit code and don't stop the start sequence.
+		done
+		IFS="${OIFS}"
+	done
+	eoutdent
+}

net/ifconfig.sh.Linux.in

@@ -139,7 +139,7 @@ _add_address()
 		return 0
 	fi
 
-	case "$1" in 
+	case "$1" in
 		*:*) ifconfig "${IFACE}" inet6 add "$@"; return $?;;
 	esac
 
@@ -172,7 +172,7 @@ _add_address()
 					cmd="${cmd} broadcast"
 				fi
 				;;
-			peer) cmd="${cmd} pointtopoint";;
+			peer) cmd="${cmd} pointopoint";;
 			*) cmd="${cmd} $1";;
 		esac
 		shift
@@ -225,7 +225,7 @@ _delete_addresses()
 	while true; do
 		local addr=$(_get_inet_address)
 		[ -z "${addr}" ] && break
-		
+
 		if [ "${addr}" = "127.0.0.1/8" ]; then
 			# Don't delete the loopback address
 			[ "${IFACE}" = "lo" -o "${IFACE}" = "lo0" ] && break
@@ -246,7 +246,7 @@ _delete_addresses()
 		einfo "${addr}"
 		ifconfig "${IFACE}" inet6 del "${addr}"
 	done
-	
+
 	return 0
 }
 

net/ifplugd.sh

@@ -57,7 +57,7 @@ ifplugd_pre_start()
 		ewarn "WARNING: infinite timeout set for ${IFACE} to come up"
 	elif [ ${timeout} -lt 0 ]; then
 		einfo "Backgrounding ..."
-		exit 1 
+		exit 1
 	fi
 
 	veinfo "Waiting for ${IFACE} to be marked as started"
@@ -84,7 +84,7 @@ ifplugd_stop()
 
 	local pidfile="/var/run/ifplugd.${IFACE}.pid"
 	[ ! -e "${pidfile}" ] && return 0
-	
+
 	ebegin "Stopping ifplugd on ${IFACE}"
 	start-stop-daemon --stop --quiet --exec /usr/sbin/ifplugd \
 		--pidfile "${pidfile}" --signal QUIT

net/ifwatchd.sh

@@ -50,7 +50,7 @@ ifwatchd_stop()
 		-- -c "${RC_LIBEXECDIR}/sh/ifwatchd-carrier.sh" \
 		-n "${RC_LIBEXECDIR}/sh/ifwatchd-nocarrier.sh" "${IFACE}" \
 		|| return 0
-	
+
 	ebegin "Stopping ifwatchd on" "${IFACE}"
 	start-stop-daemon --stop --exec /usr/sbin/ifwatchd \
 		-- -c "${RC_LIBEXECDIR}/sh/ifwatchd-carrier.sh" \

net/ip6to4.sh

@@ -56,7 +56,7 @@ ip6to4_start()
 				[ ${i} -lt 32 ] && continue
 				;;
 		esac
-	
+
 		veinfo "IPv4 address on ${host}: ${ip}/${subnet}"
 		local ipa= ip6= IFS="${IFS}."
 		for i in ${ip}; do
@@ -87,7 +87,7 @@ ip6to4_start()
 		eend $? || return 1
 		_up
 	fi
-	
+
 	# Now apply our config
 	eval config_${config_index}=\'"${new}"\'
 	config_index=$((${config_index} - 1))

net/iproute2.sh

@@ -117,9 +117,14 @@ _add_address()
 		shift; shift; shift
 		set -- "${one}/$(_netmask2cidr "${three}")" "$@"
 	fi
-	
-	#config=( "${config[@]//pointopoint/peer}" )
-	
+
+	# tunnel keyword is 'peer' in iproute2, but 'pointopoint' in ifconfig.
+	if [ "$2" = "pointopoint" ]; then
+		local one="$1"
+		shift; shift
+		set -- "${one}" "peer" "$@"
+	fi
+
 	# Always scope lo addresses as host unless specified otherwise
 	if [ "${IFACE}" = "lo" ]; then
 		set -- "$@" "scope" "host"
@@ -136,6 +141,7 @@ _add_address()
 			;;
 	esac
 
+	veinfo ip addr add "$@" dev "${IFACE}"
 	ip addr add "$@" dev "${IFACE}"
 }
 
@@ -156,7 +162,7 @@ _add_route()
 		set -- "${one}" "${two}" via "$@"
 	fi
 
-	local cmd= have_metric=false 
+	local cmd= have_metric=false
 	while [ -n "$1" ]; do
 		case "$1" in
 			metric) cmd="${cmd} $1"; have_metric=true;;
@@ -175,6 +181,7 @@ _add_route()
 		cmd="${cmd} metric ${metric}"
 	fi
 
+	veinfo ip ${family} route append ${cmd} dev "${IFACE}"
 	ip ${family} route append ${cmd} dev "${IFACE}"
 	eend $?
 }
@@ -199,6 +206,32 @@ _tunnel()
 	ip tunnel "$@"
 }
 
+# This is just to trim whitespace, do not add any quoting!
+_trim() {
+	echo $*
+}
+
+# This is our interface to Routing Policy Database RPDB
+# This allows for advanced routing tricks
+_ip_rule_runner() {
+	local cmd rules OIFS="${IFS}"
+	cmd="$1"
+	rules="$2"
+	veindent
+	local IFS="$__IFS"
+	for ru in $rules ; do
+		unset IFS
+		ruN="$(_trim "${ru}")"
+		[ -z "${ruN}" ] && continue
+		vebegin "${cmd} ${ruN}"
+		ip rule ${cmd} ${ru}
+		veend $?
+		local IFS="$__IFS"
+	done
+	IFS="${OIFS}"
+	veoutdent
+}
+
 iproute2_pre_start()
 {
 	local tunnel=
@@ -206,11 +239,16 @@ iproute2_pre_start()
 	if [ -n "${tunnel}" ]; then
 		# Set our base metric to 1000
 		metric=1000
+		# Bug#347657: If the mode is 'ipip6' or 'ip6ip6', the -6 must be passed
+		# to iproute2 during tunnel creation.
+		local ipproto=''
+		[ "${tunnel##mode ipip6}" != "${tunnel}" ] && ipproto='-6'
+		[ "${tunnel##mode ip6ip6}" != "${tunnel}" ] && ipproto='-6'
 
 		ebegin "Creating tunnel ${IFVAR}"
-		ip tunnel add ${tunnel} name "${IFACE}"
+		ip ${ipproto} tunnel add ${tunnel} name "${IFACE}"
 		eend $? || return 1
-		_up	
+		_up
 	fi
 
 	# MTU support
@@ -240,6 +278,16 @@ iproute2_post_start()
 
 	# Kernel may not have IP built in
 	if [ -e /proc/net/route ]; then
+		local rules="$(_get_array "rules_${IFVAR}")"
+		if [ -n "${rules}" ]; then
+			if ! ip rule list | grep -q "^"; then
+				eerror "IP Policy Routing (CONFIG_IP_MULTIPLE_TABLES) needed for ip rule"
+			else
+				service_set_value "ip_rule" "${rules}"
+				einfo "Adding RPDB rules"
+				_ip_rule_runner add "${rules}"
+			fi
+		fi
 		ip route flush table cache dev "${IFACE}"
 	fi
 
@@ -259,6 +307,16 @@ iproute2_post_start()
 
 iproute2_post_stop()
 {
+	# Kernel may not have IP built in
+	if [ -e /proc/net/route ]; then
+		local rules="$(service_get_value "ip_rule")"
+		if [ -n "${rules}" ]; then
+			einfo "Removing RPDB rules"
+			_ip_rule_runner del "${rules}"
+		fi
+		ip route flush table cache dev "${IFACE}"
+	fi
+
 	# Don't delete sit0 as it's a special tunnel
 	if [ "${IFACE}" != "sit0" ]; then
 		if [ -n "$(ip tunnel show "${IFACE}" 2>/dev/null)" ]; then

net/iwconfig.sh.BSD.in

@@ -477,7 +477,7 @@ iwconfig_defaults()
 	#ifconfig "${iface}" txpower 100 2>/dev/null
 	ifconfig "${IFACE}" bssid -
 	ifconfig "${IFACE}" ssid -
-	ifconfig "${IFACE}" wepkey 1:- wepkey 2:- wepkey 3:- wepkey 4:- 
+	ifconfig "${IFACE}" wepkey 1:- wepkey 2:- wepkey 3:- wepkey 4:-
 	ifconfig "${IFACE}" authmode open
 	ifconfig "${IFACE}" -mediaopt adhoc
 	ifconfig "${IFACE}" -mediaopt hostap
@@ -563,8 +563,8 @@ iwconfig_pre_start()
 		return 0
 	fi
 
-	iwconfig_defaults 
-	iwconfig_user_config 
+	iwconfig_defaults
+	iwconfig_user_config
 
 	# Set the base metric to be 2000
 	metric=2000

net/iwconfig.sh.Linux.in

@@ -47,7 +47,7 @@ _get_ssid()
 
 _get_ap_mac_address()
 {
-	local mac="$(iwgetid --raw --ap "${IFACE}")" 
+	local mac="$(iwgetid --raw --ap "${IFACE}")"
 	case "${mac}" in
 		"00:00:00:00:00:00") return 1;;
 		"44:44:44:44:44:44") return 1;;
@@ -163,7 +163,7 @@ iwconfig_setup_specific()
 	local key=$(iwconfig_get_wep_key)
 
 	iwconfig_set_mode "${mode}"
-	
+
 	# Now set the key
 	if ! eval iwconfig "${IFACE}" key "${key}"; then
 		if [ "${key}" != "off" ]; then
@@ -185,10 +185,10 @@ iwconfig_setup_specific()
 		ewarn "${IFACE} does not support setting the channel to \"${channel:-3}\""
 		return 1
 	fi
-	
+
 	# Finally apply the user Config
 	iwconfig_user_config
-	
+
 	iwconfig_report
 	return 0
 }
@@ -226,7 +226,7 @@ iwconfig_wait_for_association()
 					/proc/net/wireless)" != "0" ] && return 0
 			fi
 		fi
-		
+
 		sleep 1
 		[ ${timeout} -eq 0 ] && continue
 		i=$((${i} +  1))
@@ -281,7 +281,7 @@ iwconfig_associate()
 		iwconfig "${IFACE}" freq "${freq}"
 	fi
 	[ -n "${mac}" ] && iwconfig "${IFACE}" ap "${mac}"
-	
+
 	# Finally apply the user Config
 	iwconfig_user_config
 
@@ -377,10 +377,10 @@ iwconfig_scan()
 	for line; do
 		case "${line}" in
 			*Address:*)
-				APS=$((${APS} + 1)) 
+				APS=$((${APS} + 1))
 				eval MAC_${APS}="\""$(echo "${line#*: }" | tr '[:lower:]' '[:upper:]')"\""
 				eval QUALITY_${APS}=0
-				;;	
+				;;
 			*ESSID:*)
 				x=${line#*\"}
 				x=${x%*\"}
@@ -455,7 +455,7 @@ iwconfig_scan()
 				eval a=\$QUALITY_${i}
 				eval b=\$QUALITY_${k}
 				local u=${k}
-				# We need to split this into two tests, otherwise bash errors 
+				# We need to split this into two tests, otherwise bash errors
 				[ -n "${a}" -a -n "${b}" ] && [ "${a}" -lt "${b}" ] && u=${i}
 				unset MAC_${u} SSID_${u} MODE_${u} CHAN_${u} QUALITY_${u} ENC_${u}
 			fi
@@ -581,7 +581,7 @@ iwconfig_connect_not_preferred()
 					break
 				fi
 			done
-	
+
 			if ! ${pref}; then
 				SSID=${e}
 				eval mode=\$MODE_${i}
@@ -711,10 +711,10 @@ iwconfig_pre_start()
 	# wait if our scan returns nothing
 	LC_ALL=C iwconfig "${IFACE}" | sed -e '1d' | grep -q "Tx-Power=off"
 	local txpowerwasoff=$?
-	
+
 	iwconfig_defaults
 	iwconfig_user_config
-	
+
 	# Set the base metric to be 2000
 	metric=2000
 

net/macchanger.sh

@@ -24,7 +24,7 @@ macchanger_pre_start()
 
 	# The interface needs to be up for macchanger to work most of the time
 	_down
-	
+
 	mac=$(echo "${mac}" | tr '[:upper:]' '[:lower:]')
 	local hex="[0-9a-f][0-9a-f]"
 	case "${mac}" in

net/netplugd.sh

@@ -59,7 +59,7 @@ netplugd_pre_start()
 		ewarn "WARNING: infinite timeout set for ${IFACE} to come up"
 	elif [ ${timeout} -lt 0 ]; then
 		einfo "Backgrounding ..."
-		exit 1 
+		exit 1
 	fi
 
 	veinfo "Waiting for ${IFACE} to be marked as started"
@@ -86,7 +86,7 @@ netplugd_stop()
 
 	local pidfile="/var/run/netplugd-${IFACE}.pid"
 	[ ! -e "${pidfile}" ] && return 0
-	
+
 	ebegin "Stopping netplug on" "${IFACE}"
 	start-stop-daemon --stop --quiet --exec /sbin/netplugd \
 		--pidfile "${pidfile}"

net/pppd.sh

@@ -31,7 +31,7 @@ pppd_pre_start()
 	if yesno ${IN_BACKGROUND}; then
 		local config=
 		eval config=\$config_${IFVAR}
-		# If no config for ppp then don't default to DHCP 
+		# If no config for ppp then don't default to DHCP
 		if [ -z "${config}" ]; then
 			eval config_${IFVAR}=null
 		fi
@@ -39,7 +39,7 @@ pppd_pre_start()
 	fi
 
 	local link= i= unit="${IFACE#ppp}" opts=
-	
+
 	# PPP requires a link to communicate over - normally a serial port
 	# PPPoE communicates over Ethernet
 	# PPPoA communicates over ATM
@@ -92,7 +92,7 @@ pppd_pre_start()
 	&& [ -n "${password}" -o -z "${passwordset}" ]; then
 		opts="plugin passwordfd.so ${opts} passwordfd 0"
 	fi
-	
+
 	if ! ${hasdefaultmetric}; then
 		local m=
 		eval m=\$metric_${IFVAR}
@@ -122,7 +122,7 @@ pppd_pre_start()
 
 	# Set unit
 	opts="unit ${unit} ${opts}"
-	
+
 	# Setup connect script
 	local chatprog="/usr/sbin/chat -e -E -v" phone=
 	eval phone=\$phone_number_${IFVAR}

net/pump.sh

@@ -35,7 +35,7 @@ pump_start()
 
 	ebegin "Running pump"
 	eval pump "${args}"
-	eend $? || return 1 
+	eend $? || return 1
 
 	_show_address
 	return 0
@@ -48,7 +48,7 @@ pump_stop()
 	start-stop-daemon --quiet --test --stop --exec /sbin/pump || return 0
 
 	# Check that pump is running on the interface
-	if ! pump --status --interface "${IFACE}" >/dev/null 2>&1; then 
+	if ! pump --status --interface "${IFACE}" >/dev/null 2>&1; then
 		return 0
 	fi
 

net/system.sh

@@ -80,10 +80,10 @@ _system_nis()
 
 	eval servers=\$nis_servers_${IFVAR}
 	[ -z "${servers}" ] && servers=${nis_servers}
-	
+
 	eval domain=\$nis_domain_${IFVAR}
 	[ -z "${domain}" ] && domain=${nis_domain}
-	
+
 	[ -z "${servers}" -a -z "${domain}" ] && return 0
 
 	buffer="# Generated by net-scripts for interface ${iface}\n"
@@ -110,8 +110,8 @@ _system_nis()
 system_pre_start()
 {
 	_system_dns
-	_system_ntp 
-	_system_nis 
+	_system_ntp
+	_system_nis
 
 	return 0
 }

net/vlan.sh

@@ -1,9 +1,18 @@
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # All rights reserved. Released under the 2-clause BSD license.
 
+_ip()
+{
+	if [ -x /bin/ip ]; then
+		echo /bin/ip
+	else
+		echo /sbin/ip
+	fi
+}
+
 vlan_depend()
 {
-	program /sbin/vconfig
+	program $(_ip)
 	after interface
 	before dhcp
 }
@@ -36,31 +45,12 @@ _check_vlan()
 
 vlan_pre_start()
 {
-	local vc="$(_get_array "vconfig_${IFVAR}")"
-	[ -z "${vc}" ] && return 0
-
-	_check_vlan || return 1
-	_exists || return 1
-
-	local v= x= e=
-	local IFS="$__IFS"
-	for v in ${vc}; do
-		unset IFS
-		case "${v}" in
-			set_name_type" "*) x=${v};;
-			*)
-				set -- ${v}
-				x="$1 ${IFACE}"
-				shift
-				x="${x} $@"
-				;;
-		esac
-
-		e="$(vconfig ${x} 2>&1 1>/dev/null)"
-		[ -z "${e}" ] && continue
-		eerror "${e}"
+	local vconfig
+	eval vconfig=\$vconfig_${IFVAR}
+	if [ -n "${vconfig}" ]; then
+		eerror "You must convert your vconfig_ VLAN entries to vlan${N} entries."
 		return 1
-	done
+	fi
 }
 
 vlan_post_start()
@@ -68,14 +58,26 @@ vlan_post_start()
 	local vlans=
 	eval vlans=\$vlans_${IFVAR}
 	[ -z "${vlans}" ] && return 0
-	
+
 	_check_vlan || return 1
 	_exists || return 1
 
-	local vlan= e= s=
+	local vlan= e= s= vname= vflags= vingress= vegress=
 	for vlan in ${vlans}; do
 		einfo "Adding VLAN ${vlan} to ${IFACE}"
-		e="$(vconfig add "${IFACE}" "${vlan}" 2>&1 1>/dev/null)"
+		# We need to gather all interface configuration options
+		# 1) naming. Default to the standard "${IFACE}.${vlan}" but it can be anything
+		eval vname=\$vlan${vlan}_name
+		[ -z "${vname}" ] && vname="${IFACE}.${vlan}"
+		# 2) flags
+		eval vflags=\$vlan${vlan}_flags
+		# 3) ingress/egress map
+		eval vingress=\$vlan${vlan}_ingress
+		[ -z "${vingress}" ] || vingress="ingress-qos-map ${vingress}"
+		eval vegress=\$vlan${vlan}_egress
+		[ -z "${vegress}" ] || vegress="egress-qos-map ${vegress}"
+
+		e="$(ip link add link "${IFACE}" name "${vname}" type vlan id "${vlan}" ${vflags} ${vingress} ${vegress} 2>&1 1>/dev/null)"
 		if [ -n "${e}" ]; then
 			eend 1 "${e}"
 			continue
@@ -95,7 +97,7 @@ vlan_post_start()
 			start
 		) || mark_service_stopped "net.${ifname}"
 	done
-	
+
 	return 0
 }
 
@@ -110,7 +112,7 @@ vlan_post_stop()
 			stop
 		) && {
 			mark_service_stopped "net.${vlan}"
-			vconfig rem "${vlan}" >/dev/null
+			ip link delete "${vlan}" type vlan >/dev/null
 		}
 	done
 

net/wpa_supplicant.sh

@@ -3,10 +3,14 @@
 
 wpa_supplicant_depend()
 {
-	if [ -x /usr/sbin/wpa_supplicant ]; then
-		program start /usr/sbin/wpa_supplicant
-	else
-		program start /sbin/wpa_supplicant
+	wpas=/usr/sbin/wpa_supplicant
+	[ -x ${wpas} ] || wpas=/sbin/wpa_supplicant
+	if [ -x ${wpas} ]; then
+		program start ${wpas}
+		# bug 345281: if wpa_supplicant is built w/ USE=dbus, we need to start
+		# dbus before we can start wpa_supplicant.
+		${wpas} -h |grep DBus -sq
+		[ $? -eq 0 ] && need dbus
 	fi
 	after macnet plug
 	before interface
@@ -145,7 +149,7 @@ wpa_supplicant_pre_start()
 	if [ -z "${wpac}" ]; then
 		if service_started devd; then
 			ebegin "Backgrounding ..."
-			exit 1 
+			exit 1
 		fi
 		return 0
 	fi
@@ -163,7 +167,7 @@ wpa_supplicant_pre_start()
 		-P "/var/run/wpa_cli-${IFACE}.pid" -B
 	if eend $?; then
 		ebegin "Backgrounding ..."
-		exit 1 
+		exit 1
 	fi
 
 	# wpa_cli failed to start? OK, error here
@@ -183,11 +187,9 @@ wpa_supplicant_post_stop()
 	fi
 
 	if yesno "${IN_BACKGROUND}"; then
-		# Don't stop wpa_supplicant & wpa_cli if in background
-		return 0
+		# Only stop wpa_supplicant if it's not the controlling daemon
+		! service_started_daemon "${RC_SVCNAME}" "${wpas}" 1
 	fi
-	# Only stop wpa_supplicant if it's not the controlling daemon
-	! service_started_daemon "${RC_SVCNAME}" "${wpas}" 1
 	[ $? != 0 ] && return 0
 
 	local pidfile="/var/run/wpa_cli-${IFACE}.pid"

pkgconfig/Makefile

@@ -2,7 +2,8 @@ DIR=	${LIBDIR}/pkgconfig
 SRCS=	einfo.pc.in openrc.pc.in
 INC=	einfo.pc openrc.pc
 
-sed -n -e 's/^VERSION=[[:space:]]*\([^[:space:]]*\).*/#define VERSION "\1${GITVER}\"/p' ../../Makefile > version.h
+.DEFAULT:
+	${SED} -n -e 's/^VERSION=[[:space:]]*\([^[:space:]]*\).*/#define VERSION "\1${GITVER}\"/p' ../../Makefile > version.h
 
 SED_EXTRA=	-e 's:@VERSION@:${VERSION}:g'
 

sh/init-early.sh.Linux.in

@@ -17,7 +17,7 @@ fi
 if [ -e /etc/runlevels/"$RC_DEFAULTLEVEL"/consolefont \
 	 -o -e /etc/runlevels/"$RC_BOOTLEVEL"/consolefont ]; then
 	printf "\033%s" "$termencoding" >"$CONSOLE" 2>/dev/null
-	if [ -r "$RC_LIBEXECDIR"/console/font -a -x /bin/setfont ]; then
+	if [ -r "$RC_LIBEXECDIR"/console/font -a -x /usr/bin/setfont ]; then
 		font="$(cat "$RC_LIBEXECDIR"/console/font)"
 		[ -c "$CONSOLE" ] && cons="-C $CONSOLE"
 		setfont $cons "$RC_LIBEXECDIR"/console/"$font" 2>/dev/null
@@ -29,7 +29,7 @@ if [ -e /etc/runlevels/"$RC_DEFAULTLEVEL"/keymaps \
 	 -o -e /etc/runlevels/"$RC_BOOTLEVEL"/keymaps ]; then
 	kbd_mode $kmode -C "$CONSOLE" 2>/dev/null
 	if [ -r "$RC_LIBEXECDIR"/console/keymap ]; then
-		loadkeys "$RC_LIBEXECDIR"/console/keymap 2>/dev/null
+		loadkeys -q "$RC_LIBEXECDIR"/console/keymap 2>/dev/null
 	fi
 fi
 

sh/init.sh.Linux.in

@@ -6,6 +6,17 @@
 # This basically mounts $RC_SVCDIR as a ramdisk.
 # The tricky part is finding something our kernel supports
 # tmpfs and ramfs are easy, so force one or the other.
+svcdir_restorecon()
+{
+	local rc=0
+	if [ -x /usr/sbin/selinuxenabled -a -c /selinux/null ] &&
+	  selinuxenabled; then
+		restorecon $RC_SVCDIR
+		rc=$?
+	fi
+	return $rc
+}
+
 mount_svcdir()
 {
 	# mount from fstab if we can
@@ -16,10 +27,14 @@ mount_svcdir()
 
 	# Some buggy kernels report tmpfs even when not present :(
 	if grep -Eq "[[:space:]]+tmpfs$" /proc/filesystems; then
-		mount -n -t tmpfs $fsopts,mode=755,size=${svcsize}k \
-			rc-svcdir "$RC_SVCDIR" && return 0
+		local tmpfsopts="${fsopts},mode=755,size=${svcsize}k"
+		mount -n -t tmpfs $tmpfsopts rc-svcdir "$RC_SVCDIR"
+		if [ $? -eq 0 ]; then
+			svcdir_restorecon
+			[ $? -eq 0 ] && return 0
+		fi
 	fi
-	
+
 	if grep -Eq "[[:space:]]+ramfs$" /proc/filesystems; then
 		fs="ramfs"
 		# ramfs has no special options
@@ -38,6 +53,10 @@ mount_svcdir()
 	fi
 
 	mount -n -t "$fs" $fsopts rc-svcdir "$RC_SVCDIR"
+	if [ $? -eq 0 ]; then
+		svcdir_restorecon
+		[ $? -eq 0 ] && return 0
+	fi
 }
 
 . "$RC_LIBEXECDIR"/sh/functions.sh
@@ -46,19 +65,21 @@ mount_svcdir()
 # By default VServer already has /proc mounted, but OpenVZ does not!
 # However, some of our users have an old proc image in /proc
 # NFC how they managed that, but the end result means we have to test if
-# /proc actually works or not. We to this by comparing uptime to one a second
-# ago
+# /proc actually works or not. We do this by comparing two reads of
+# /proc/self/environ for which we have set the variable VAR to two
+# different values. If the comparison comes back equal, we know that
+# /proc is not working.
 mountproc=true
-if [ -e /proc/uptime ]; then
-	up="$(cat /proc/uptime)"
-	sleep 1
-	if [ "$up" = "$(cat /proc/uptime)" ]; then
+f=/proc/self/environ
+if [ -e $f ]; then
+	if [ "$(VAR=a cat $f)" = "$(VAR=b cat $f)" ]; then
 		eerror "You have cruft in /proc that should be deleted"
 	else
 		einfo "/proc is already mounted, skipping"
 		mountproc=false
 	fi
 fi
+unset f
 
 if $mountproc; then
 	procfs="proc"

sh/rc-functions.sh.in

@@ -38,7 +38,8 @@ stop_addon()
 	( import_addon "$1-stop" )
 }
 
-net_fs_list="afs cifs coda davfs fuse gfs ncpfs nfs nfs4 ocfs2 shfs smbfs"
+net_fs_list="afs cifs coda davfs fuse fuse.sshfs gfs glusterfs lustre
+ncpfs nfs nfs4 ocfs2 shfs smbfs $extra_net_fs_list"
 is_net_fs()
 {
 	[ -z "$1" ] && return 1

sh/rc-mount.sh

@@ -26,6 +26,8 @@ do_unmount()
 		# Unmounting a shared mount can unmount other mounts, so
 		# we need to check the mount is still valid
 		mountinfo --quiet "$mnt" || continue
+		# Ensure we interpret all characters properly.
+		mnt=$(printf "$mnt")
 
 		case "$cmd" in
 			umount)

sh/runscript.sh.in

@@ -4,12 +4,24 @@
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # All rights reserved. Released under the 2-clause BSD license.
 
-. @SYSCONFDIR@/init.d/functions.sh
-. @LIBEXECDIR@/sh/rc-functions.sh
+sourcex()
+{
+	if [ "$1" = "-e" ]; then
+		shift
+		[ -e "$1" ] || return 1
+	fi
+	if ! . "$1"; then
+		eerror "$RC_SVCNAME: error loading $1"
+		exit 1
+	fi
+}
+
+sourcex "@SYSCONFDIR@/init.d/functions.sh"
+sourcex "@LIBEXECDIR@/sh/rc-functions.sh"
 
 # Support LiveCD foo
 if [ -r /sbin/livecd-functions.sh ]; then
-	. /sbin/livecd-functions.sh
+	sourcex "/sbin/livecd-functions.sh"
 	livecd_read_commandline
 fi
 
@@ -89,7 +101,7 @@ _status()
 		return 0
 	else
 		einfo "status: stopped"
-		return 1
+		return 3
 	fi
 }
 
@@ -99,7 +111,7 @@ start()
 	[ -n "$command" ] || return 0
 	local _background=
 	ebegin "Starting ${name:-$RC_SVCNAME}"
-	if yesno "${command_background}"; then 
+	if yesno "${command_background}"; then
 		_background="--background --pidfile"
 	fi
 	if yesno "$start_inactive"; then
@@ -145,30 +157,26 @@ _conf_d=${RC_SERVICE%/*}/../conf.d
 # If we're net.eth0 or openvpn.work then load net or openvpn config
 _c=${RC_SVCNAME%%.*}
 if [ -n "$_c" -a "$_c" != "$RC_SVCNAME" ]; then
-	if [ -e "$_conf_d/$_c.$RC_RUNLEVEL" ]; then
-		. "$_conf_d/$_c.$RC_RUNLEVEL"
-	elif [ -e "$_conf_d/$_c" ]; then
-		. "$_conf_d/$_c"
+	if ! sourcex -e "$_conf_d/$_c.$RC_RUNLEVEL"; then
+		sourcex -e "$_conf_d/$_c"
 	fi
 fi
 unset _c
 
 # Overlay with our specific config
-if [ -e "$_conf_d/$RC_SVCNAME.$RC_RUNLEVEL" ]; then
-	. "$_conf_d/$RC_SVCNAME.$RC_RUNLEVEL"
-elif [ -e "$_conf_d/$RC_SVCNAME" ]; then
-	. "$_conf_d/$RC_SVCNAME"
+if ! sourcex -e "$_conf_d/$RC_SVCNAME.$RC_RUNLEVEL"; then
+	sourcex -e "$_conf_d/$RC_SVCNAME"
 fi
 unset _conf_d
 
 # Load any system overrides
-[ -e @SYSCONFDIR@/rc.conf ] && . @SYSCONFDIR@/rc.conf
+sourcex -e "@SYSCONFDIR@/rc.conf"
 
 # Apply any ulimit defined
 [ -n "${rc_ulimit:-$RC_ULIMIT}" ] && ulimit ${rc_ulimit:-$RC_ULIMIT}
 
 # Load our script
-. "$RC_SERVICE"
+sourcex "$RC_SERVICE"
 
 for _d in $required_dirs; do
 	if [ ! -d $_d ]; then
@@ -244,7 +252,7 @@ while [ -n "$1" ]; do
 					eerror "$RC_SVCNAME: function \`$1' defined but does not exist"
 					exit 1
 				fi
-			fi	
+			fi
 		fi
 	done
 	eerror "$RC_SVCNAME: unknown function \`$1'"