Release OpenRC-0.9.4

X-Gentoo-Bug: 382299
X-Gentoo-Bug-URL: https://bugs.gentoo.org/382299

.gitignore

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

FEATURE-REMOVAL-SCHEDULE

@@ -5,27 +5,6 @@ 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

Makefile

@@ -1,6 +1,6 @@
 # OpenRC Makefile
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 include Makefile.inc
 

Makefile.inc

@@ -1,3 +1,3 @@
 NAME=		openrc
-VERSION=	0.8.0
+VERSION=	0.9.4
 PKG=		${NAME}-${VERSION}

README

@@ -70,9 +70,11 @@ of the system.
 
 Reporting Bugs
 --------------
-Bugs should go to the Gentoo Bugzilla:
+Since Gentoo Linux is hosting OpenRC development, Bugs should go to
+the Gentoo Bugzilla:
 	http://bugs.gentoo.org/
-You'll want the "Gentoo Linux" product and the "baselayout" component.
+They should be filed under the "Gentoo Hosted Projects" product and
+the "openrc" component.
 
 
 History - by Roy Marples

STYLE

@@ -32,3 +32,54 @@ void foo(int c)
 
 	return ret;
 }
+
+##################
+# COMMIT MESSAGES #
+##################
+
+The following is an example of a correctly formatted git commit message
+for this repository. Most of this information came from this blog post
+[1], so I would like to thank the author.
+
+### cut here ###
+Capitalized, short (50 chars or less) summary
+
+More detailed explanatory text, if necessary.  Wrap it to about 72
+characters or so.  In some contexts, the first line is treated as the
+subject of an email and the rest of the text as the body.  The blank
+line separating the summary from the body is critical (unless you omit
+the body entirely); tools like rebase can get confused if you run the
+two together.
+
+Write your commit message in the present tense: "Fix bug" and not "Fixed
+bug."  This convention matches up with commit messages generated by
+commands like git merge and git revert.
+
+Further paragraphs come after blank lines.
+
+- Bullet points are okay, too
+
+- Typically a hyphen or asterisk is used for the bullet, preceded by a
+  single space, with blank lines in between, but conventions vary here
+
+- Use a hanging indent
+
+Reported-by: User Name <email>
+X-[Distro]-Bug: BugID
+X-[Distro]-Bug-URL: URL for the bug (on the distribution's web site typically)
+### cut here ###
+
+If you did not write the code and the patch does not include authorship
+information in a format git can use, please use the --author option of the
+git commit command to make the authorship correct.
+
+The Reported-by tag is required if the person who reported the bug is
+different from the author and committer.
+
+  The X-[Distro]-Bug/Bug-URL tags are required if this commit is related
+  to a bug reported to us by a specific distribution   of linux or a
+  *BSD. Also, [Distro] should be replaced with the name of the
+  distribution, e.g. X-Gentoo-Bug.
+
+[1] http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
+

conf.d/Makefile.Linux

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

conf.d/bootmisc

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

conf.d/consolefont

@@ -3,7 +3,7 @@
 # you shouldn't specify the trailing ".psf.gz", just the font name below.
 # To use the default console font, comment out the CONSOLEFONT setting below.
 # This setting is used by the /etc/init.d/consolefont script (NOTE: if you do
-# not want to use it, run "rc-update del consolefont" as root).
+# not want to use it, run "rc-update del consolefont boot" as root).
 consolefont="default8x16"
 
 # consoletranslation is the charset map file to use.  Leave commented to use

conf.d/keymaps

@@ -1,4 +1,4 @@
-# Use KEYMAP to specify the default console keymap.  There is a complete tree
+# Use keymap to specify the default console keymap.  There is a complete tree
 # of keymaps in /usr/share/keymaps to choose from.
 keymap="us"
 

conf.d/killprocs

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

conf.d/modules

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

conf.d/net

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

doc/net.example.BSD.in

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

doc/net.example.Linux.in

@@ -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"
@@ -412,7 +414,7 @@
 # dhclient: emerge net-misc/dhcp
 # dhcpcd:   emerge net-misc/dhcpcd
 # pump:     emerge net-misc/pump
-# udhcpc:   emerge net-misc/udhcp
+# udhcpc:   emerge sys-apps/busybox
 
 # If you have more than one DHCP client installed, you need to specify which
 # one to use - otherwise we default to dhcpcd if available.
@@ -540,11 +542,21 @@
 
 # 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
+# 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"
@@ -963,10 +975,12 @@
 # and you're done :)
 
 # By default we don't wait for netplug/ifplugd to configure the interface.
-# If you would like it to wait so that other services know that network is up
+# If you would like it to wait so that other services know that network is
-# then you can specify a timeout here.
+# up then you can specify a timeout here. A value of 0 means wait forever,
+# and a negative value means never wait.
+#plug_timeout_eth0="10"
+# If you want to set it for all interfaces:
 #plug_timeout="10"
-# A value of 0 means wait forever.
 
 # If you don't want to use netplug on a specific interface but you have it
 # installed, you can disable it for that interface via the modules statement

etc/rc.conf.FreeBSD

@@ -1,3 +1,6 @@
+##############################################################################
+# FreeBSD SPECIFIC OPTIONS
+
 # This is the subsystem type. Valid options on FreeBSD:
 # ""        - nothing special
 # "jail"    - FreeBSD jails

etc/rc.conf.Linux

@@ -1,3 +1,6 @@
+##############################################################################
+# LINUX SPECIFIC OPTIONS
+
 # This is the subsystem type. Valid options on Linux:
 # ""        - nothing special
 # "lxc"     - Linux Containers
@@ -15,9 +18,6 @@
 # PRESENTLY in, not the virtualization the environment is capable of.
 rc_sys="@RC_SYS_DEFAULT@"
 
-##############################################################################
-# LINUX SPECIFIC OPTIONS
-
 # This is the number of tty's used in most of the rc-scripts (like
 # consolefont, numlock, etc ...)
 rc_tty_number=12

etc/rc.conf.NetBSD

@@ -1,3 +1,6 @@
+##############################################################################
+# NetBSD SPECIFIC OPTIONS
+
 # This is the subsystem type. Valid options on NetBSD:
 # ""        - nothing special
 # "prefix"  - Prefix

etc/rc.conf.in

@@ -47,6 +47,10 @@
 # logging can take place and as such cannot log the sysinit runlevel.
 #rc_logger="YES"
 
+# Through rc_log_path you can specify a custom log file.
+# The default value is: /var/log/rc.log
+#rc_log_path="/var/log/rc.log"
+
 # By default we filter the environment for our running scripts. To allow other
 # variables through, add them here. Use a * to allow all variables through.
 #rc_env_allow="VAR1 VAR2"

etc/rc.devd

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

etc/rc.in

@@ -1,6 +1,6 @@
 #!@SHELL@
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 # If $TERM is not set then assume default of @TERM@
 # This gives us a nice colour boot :)

etc/rc.shutdown.in

@@ -1,6 +1,6 @@
 #!@SHELL@
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 # Handle interrupts
 trap : SIGINT SIGQUIT

init.d.misc/avahi-dnsconfd.in

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

init.d.misc/avahid.in

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

init.d.misc/dbus.in

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

init.d.misc/dhcpcd.in

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

init.d.misc/dnsmasq.in

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

init.d.misc/hald.in

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

init.d.misc/named.in

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

init.d.misc/ntpd.in

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

init.d.misc/openvpn.in

@@ -1,6 +1,6 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 vpn=${RC_SVCNAME#*.}
 name="OpenVPN"

init.d.misc/polkitd.in

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

init.d.misc/sshd.in

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

init.d.misc/wpa_supplicant.in

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

init.d/adjkerntz.in

@@ -1,6 +1,6 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 extra_commands="save"
 

init.d/bootmisc.in

@@ -1,13 +1,13 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 depend()
 {
 	need localmount
 	before logger
 	after clock sysctl
-	keyword -prefix
+	keyword -prefix -timeout
 }
 
 dir_writeable()
@@ -16,6 +16,7 @@ dir_writeable()
 }
 
 : ${wipe_tmp:=${WIPE_TMP:-yes}}
+: ${log_dmesg:=${LOG_DMESG:-yes}}
 
 cleanup_tmp_dir()
 {
@@ -26,14 +27,15 @@ cleanup_tmp_dir()
 	fi
 	dir_writeable "$dir" || return 1
 	chmod a+rwt "$dir" 2> /dev/null
-	cd "$dir"
+	cd "$dir" || return 1
 	if yesno $wipe_tmp; then
 		ebegin "Wiping $dir directory"
-		local startopts="-x . -depth"
-		[ "$RC_UNAME" = Linux ] && startopts=". -xdev -depth"
 
-		# Faster than find
+		# Faster than raw find
-		rm -rf -- [^ajlq\.]*
+		if ! rm -rf -- [^ajlq\.]* 2>/dev/null ; then
+			# Blah, too many files
+			find . -maxdepth 1 -name '[^ajlq\.]*' -exec rm -rf -- {} +
+		fi
 
 		# pam_mktemp creates a .private directory within which
 		# each user gets a private directory with immutable
@@ -41,27 +43,23 @@ cleanup_tmp_dir()
 		# remove it.
 		[ -d /tmp/.private ] && chattr -R -a /tmp/.private 2> /dev/null
 
-		find $startopts ! -name . \
+		# Prune the paths that are left
-			! -path "./lost+found" \
+		find . -maxdepth 1 \
-			! -path "./lost+found/*" \
+			! -name . \
-			! -path "./quota.user" \
+			! -name lost+found \
-			! -path "./quota.user/*" \
+			! -name quota.user \
-			! -path "./aquota.user" \
+			! -name aquota.user \
-			! -path "./aquota.user/*" \
+			! -name quota.group \
-			! -path "./quota.group" \
+			! -name aquota.group \
-			! -path "./quota.group/*" \
+			! -name journal \
-			! -path "./aquota.group" \
+			-exec rm -rf -- {} +
-			! -path "./aquota.group/*" \
-			! -path "./journal" \
-			! -path "./journal/*" \
-			-exec rm -rf {} \;
 		eend 0
 	else
 		ebegin "Cleaning $dir directory"
-		rm -rf -- "$dir"/.X*-lock "$dir"/esrv* "$dir"/kio* \
+		rm -rf -- .X*-lock esrv* kio* \
-			"$dir"/jpsock.* "$dir"/.fam* "$dir"/.esd* \
+			jpsock.* .fam* .esd* \
-			"$dir"/orbit-* "$dir"/ssh-* "$dir"/ksocket-* \
+			orbit-* ssh-* ksocket-* \
-			"$dir"/.*-unix
+			.*-unix
 		eend 0
 	fi
 }
@@ -145,11 +143,13 @@ start()
 		fi
 	fi
 
-	if $logw || dir_writeable /var/log; then
+	if yesno $log_dmesg; then
-		# Create an 'after-boot' dmesg log
+		if $logw || dir_writeable /var/log; then
-		if [ "$RC_SYS" != VSERVER -a "$RC_SYS" != OPENVZ ]; then
+			# Create an 'after-boot' dmesg log
-			dmesg > /var/log/dmesg
+			if [ "$RC_SYS" != VSERVER -a "$RC_SYS" != OPENVZ ]; then
-			chmod 640 /var/log/dmesg
+				dmesg > /var/log/dmesg
+				chmod 640 /var/log/dmesg
+			fi
 		fi
 	fi
 

init.d/consolefont.in

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

init.d/devd.in

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

init.d/devdb.in

@@ -1,6 +1,6 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2008 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 description="Creates the dev database"
 

init.d/devfs.in

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

init.d/dmesg.in

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

init.d/dumpon.in

@@ -1,6 +1,6 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 description="Configures a specific kernel dump device."
 

init.d/fsck.in

@@ -1,6 +1,6 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 description="Check and repair filesystems according to /etc/fstab"
 _IFS="

init.d/hostid.in

@@ -1,6 +1,6 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 extra_commands="reset"
 : ${hostid_file:=/etc/hostid}

init.d/hostname.in

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

init.d/hwclock.in

@@ -1,6 +1,6 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 extra_commands="save show"
 

init.d/ipfw.in

@@ -1,6 +1,6 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 # This is based on /etc/rc.firewall and /etc/rc.firewall6 from FreeBSD
 

init.d/keymaps.in

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

init.d/killprocs.in

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

init.d/local.in

@@ -1,6 +1,6 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 description="Executes user programs in @SYSCONFDIR@/local.d"
 
@@ -27,7 +27,7 @@ start()
 		local_start
 	fi
 
-	return 0
+	eend 0
 }
 
 stop()
@@ -47,5 +47,5 @@ stop()
 		local_stop
 	fi
 
-	return 0
+	eend 0
 }

init.d/localmount.in

@@ -1,6 +1,6 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 description="Mounts disks and swap according to /etc/fstab."
 
@@ -16,7 +16,7 @@ start()
 {
 	# Mount local filesystems in /etc/fstab.
 	local types="noproc" x= no_netdev=
-	for x in $net_fs_list; do
+	for x in $net_fs_list $extra_net_fs_list; do
 		types="${types},${x}"
 	done
 
@@ -34,22 +34,20 @@ start()
 stop()
 {
 	# We never unmount / or /dev or $RC_SVCDIR
-	local x= no_umounts_r="/|/dev|/dev/.*|${RC_SVCDIR}"
+
-	no_umounts_r="${no_umounts_r}|/bin|/sbin|/lib|/libexec"
+	# Bug 381783
+	local rc_svcdir=$(echo $RC_SVCDIR | sed 's:/lib\(32\|64\)\?/:/lib(32|64)?/:g')
+
+	local x= no_umounts_r="/|/dev|/dev/.*|${rc_svcdir}"
+	no_umounts_r="${no_umounts_r}|/bin|/sbin|/lib(32|64)?|/libexec"
 	# RC_NO_UMOUNTS is an env var that can be set by plugins
-	OIFS=$IFS SIFS=${IFS-y}
+	local IFS="$IFS:"
-	IFS=$IFS:
 	for x in $no_umounts $RC_NO_UMOUNTS; do
 		no_umounts_r="$no_umounts_r|$x"
 	done
-	if [ "$SIFS" = y ]; then
-		IFS=$OIFS
-	else
-		unset IFS
-	fi
 
 	if [ "$RC_UNAME" = Linux ]; then
-		no_umounts_r="$no_umounts_r|/proc|/proc/.*|/sys|/sys/.*"
+		no_umounts_r="$no_umounts_r|/proc|/proc/.*|/run|/sys|/sys/.*"
 	fi
 	no_umounts_r="^($no_umounts_r)$"
 
@@ -70,12 +68,12 @@ stop()
 	einfo "Unmounting filesystems"
 	eindent
 	local fs=
-	for x in $net_fs_list; do
+	for x in $net_fs_list $extra_net_fs_list; do
 		fs="$fs${fs:+|}$x"
 	done
 	[ -n "$fs" ] && fs="^($fs)$"
 	do_unmount umount --skip-point-regex "$no_umounts_r" \
-		${fs:+--skip-fstype-regex} $fs --nonetdev
+		"${fs:+--skip-fstype-regex}" $fs --nonetdev
 	eoutdent
 
 	return 0

init.d/mixer.in

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

init.d/modules.in

@@ -1,6 +1,6 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 description="Loads a user defined list of kernel modules."
 
@@ -16,18 +16,21 @@ start()
 	# support compiled in ...
 	[ ! -f /proc/modules ] && return 0
 
-	local KV=$(uname -r)
+	local KV x y kv_variant_list
-	local KV_MAJOR=${KV%%.*}
+	KV=$(uname -r)
-	local x=${KV#*.}
+	# full $KV
-	local KV_MINOR=${x%%.*}
+	kv_variant_list="${KV}"
-	x=${KV#*.*.}
+	# remove any KV_EXTRA options to just get the full version
-	local KV_MICRO=${x%%-*}
+	x=${KV%%-*}
+	# now slowly strip them
+	while [ -n "$x" ] && [ "$x" != "$y" ]; do
+		kv_variant_list="${kv_variant_list} $x"
+		y=$x
+		x=${x%.*}
+	done
 
 	local list= x= xx= y= args= mpargs= cnt=0 a=
-	for x in "$KV" \
+	for x in $kv_variant_list ; do
-		$KV_MAJOR.$KV_MINOR.$KV_MICRO \
-		$KV_MAJOR.$KV_MINOR \
-	; do
 		eval list=\$modules_$(shell_var "$x")
 		[ -n "$list" ] && break
 	done
@@ -45,10 +48,7 @@ start()
 		fi
 		aa=$(shell_var "$a")
 		xx=$(shell_var "$x")
-		for y in "$KV" \
+		for y in $kv_variant_list ; do
-			$KV_MAJOR.$KV_MINOR.$KV_MICRO \
-			$KV_MAJOR.$KV_MINOR \
-		; do
 			eval args=\$module_${aa}_args_$(shell_var "$y")
 			[ -n "${args}" ] && break
 			eval args=\$module_${xx}_args_$(shell_var "$y")

init.d/mount-ro.in

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

init.d/moused.in

@@ -1,6 +1,6 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 mouse=${RC_SVCNAME##*.}
 if [ -n "$mouse" -a "$mouse" != "moused" ]; then

init.d/mtab.in

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

init.d/net.lo.in

@@ -1,6 +1,6 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 MODULESDIR="${RC_LIBEXECDIR}/net"
 MODULESLIST="${RC_SVCDIR}/nettree"
@@ -42,12 +42,25 @@ depend()
 }
 
 # Support bash arrays - sigh
+_array_helper()
+{
+	local _a=
+
+	eval _a=\$$1
+	_a=$(echo "${_a}" | sed -e 's:^[[:space:]]*::' -e 's:[[:space:]]*$::' -e '/^$/d' -e 's:[[:space:]]\{1,\}: :g')
+
+	[ -n "${_a}" ] && printf "%s\n" "${_a}"
+}
+
 _get_array()
 {
 	local _a=
 	if [ -n "${BASH}" ]; then
 		case "$(declare -p "$1" 2>/dev/null)" in
 			"declare -a "*)
+				ewarn "You are using a bash array for $1."
+				ewarn "This feature will be removed in the future."
+				ewarn "Please see net.example for the correct format for $1."
 				eval "set -- \"\${$1[@]}\""
 				for _a; do
 					printf "%s\n" "${_a}"
@@ -57,10 +70,7 @@ _get_array()
 		esac
 	fi
 
-	eval _a=\$$1
+	_array_helper $1
-	printf "%s" "${_a}"
-	printf "\n"
-	[ -n "${_a}" ]
 }
 
 # Flatten bash arrays to simple strings
@@ -69,6 +79,9 @@ _flatten_array()
 	if [ -n "${BASH}" ]; then
 		case "$(declare -p "$1" 2>/dev/null)" in
 			"declare -a "*)
+				ewarn "You are using a bash array for $1."
+				ewarn "This feature will be removed in the future."
+				ewarn "Please see net.example for the correct format for $1."
 				eval "set -- \"\${$1[@]}\""
 				for x; do
 					printf "'%s' " "$(printf "$x" | sed "s:':'\\\'':g")"
@@ -78,10 +91,7 @@ _flatten_array()
 		esac
 	fi
 
-	eval _a=\$$1
+	_array_helper $1
-	printf "%s" "${_a}"
-	printf "\n"
-	[ -n "${_a}" ]
 }
 
 _wait_for_carrier()
@@ -476,7 +486,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
 
@@ -539,7 +549,9 @@ start()
 		[ -z "${config}" ] && break
 
 		set -- ${config}
-		ebegin "$1"
+		if [ "$1" != "null" -a "$1" != "noop" ]; then
+			ebegin "$1"
+		fi
 		eindent
 		case "$1" in
 			noop)
@@ -563,6 +575,7 @@ start()
 		else
 			eval config=\$fallback_${config_index}
 			if [ -n "${config}" ]; then
+				fallback=true
 				eoutdent
 				ewarn "Trying fallback configuration ${config}"
 				eindent
@@ -585,8 +598,13 @@ start()
 		return 1
 	fi
 
-	local hidefirstroute=false first=true
+	local hidefirstroute=false first=true routes=
-	local routes="$(_get_array "routes_${IFVAR}")"
+	if ${fallback}; then
+		routes="$(_get_array "fallback_routes_${IFVAR}")"
+	fi
+	if [ -z "${routes}" ]; then
+		routes="$(_get_array "routes_${IFVAR}")"
+	fi
 	if [ "${IFACE}" = "lo" -o "${IFACE}" = "lo0" ]; then
 		if [ "${config_0}" != "null" ]; then
 			routes="127.0.0.0/8 via 127.0.0.1

init.d/netmount.in

@@ -1,6 +1,6 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 description="Mounts network shares according to /etc/fstab."
 
@@ -44,7 +44,7 @@ start()
 	[ -x @SYSCONFDIR@/init.d/rpcbind ] && pmap="rpcbind"
 
 	local x= fs= rc=
-	for x in $net_fs_list; do
+	for x in $net_fs_list $extra_net_fs_list; do
 		case "$x" in
 			nfs|nfs4)
 			# If the nfsmount script took care of the nfs
@@ -81,7 +81,7 @@ stop()
 	ebegin "Unmounting network filesystems"
 	. "$RC_LIBEXECDIR"/sh/rc-mount.sh
 
-	for x in $net_fs_list; do
+	for x in $net_fs_list $extra_net_fs_list; do
 		fs="$fs${fs:+,}$x"
 	done
 	if [ -n "$fs" ]; then
@@ -90,7 +90,7 @@ stop()
 
 	eindent
 	fs=
-	for x in $net_fs_list; do
+	for x in $net_fs_list $extra_net_fs_list; do
 		fs="$fs${fs:+|}$x"
 	done
 	[ -n "$fs" ] && fs="^($fs)$"

init.d/network.in

@@ -1,6 +1,6 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2009 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 # This script was inspired by the equivalent rc.d network from NetBSD.
 

init.d/newsyslog.in

@@ -1,6 +1,6 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 required_files="/etc/newsyslog.conf"
 

init.d/nscd.in

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

init.d/numlock.in

@@ -1,6 +1,6 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 description="Turns numlock on for the consoles."
 

init.d/pf.in

@@ -1,6 +1,6 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 name="Packet Filter"
 : ${pf_conf:=${pf_rules:-/etc/pf.conf}}

init.d/powerd.in

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

init.d/procfs.in

@@ -1,6 +1,6 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 description="Mounts misc filesystems in /proc."
 
@@ -14,7 +14,7 @@ depend()
 start()
 {
 	# Make sure we insert usbcore if it's a module
-	if [ -f /proc/modules -a ! -d /proc/bus/usb ]; then
+	if [ -f /proc/modules -a ! -d /sys/module/usbcore -a ! -d /proc/bus/usb ]; then
 		modprobe -q usbcore
 	fi
 
@@ -37,24 +37,24 @@ start()
 		fi
 	fi
 
-	# Setup Kernel Support for the NFS daemon status
-	if [ -d /proc/fs/nfsd ] && ! mountinfo -q /proc/fs/nfsd; then
-		if grep -qs nfsd /proc/filesystems; then
-			ebegin "Mounting NFS filesystem"
-			mount -t nfsd -o nodev,noexec,nosuid \
-				nfsd /proc/fs/nfsd
-			eend $?
-		fi
-	fi
-
 	# Setup Kernel Support for miscellaneous Binary Formats
-	if [ -d /proc/sys/fs/binfmt_misc ] \
+	if [ -d /proc/sys/fs/binfmt_misc -a ! -e /proc/sys/fs/binfmt_misc/register ]; then
-		&& ! mountinfo -q /proc/sys/fs/binfmt_misc; then
 		if grep -qs binfmt_misc /proc/filesystems; then
 			ebegin "Mounting misc binary format filesystem"
 			mount -t binfmt_misc -o nodev,noexec,nosuid \
 				binfmt_misc /proc/sys/fs/binfmt_misc
-			eend $?
+			if eend $? ; then
+				local fmts
+				ebegin "Loading custom binary format handlers"
+				fmts=$(grep -hsv -e '^[#;]' -e '^[[:space:]]*$' \
+					/run/binfmt.d/*.conf \
+					"/etc"/binfmt.d/*.conf \
+					""/usr/lib/binfmt.d/*.conf)
+				if [ -n "${fmts}" ]; then
+					echo "${fmts}" > /proc/sys/fs/binfmt_misc/register
+				fi
+				eend $?
+			fi
 		fi
 	fi
 

init.d/rarpd.in

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

init.d/rc-enabled.in

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

init.d/root.in

@@ -1,6 +1,6 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 description="Mount the root fs read/write"
 

init.d/rpcbind.in

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

init.d/savecache.in

@@ -1,6 +1,6 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 description="Saves the caches OpenRC uses to non volatile storage"
 

init.d/savecore.in

@@ -1,6 +1,6 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 description="Saves a kernel dump."
 

init.d/staticroute.in

@@ -1,6 +1,6 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2009 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 # This script was inspired by the equivalent rc.d staticroute from NetBSD.
 
@@ -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

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

init.d/swap.in

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

init.d/swclock.in

@@ -1,6 +1,6 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2009 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 description="Sets the local clock to the mtime of a given file."
 
@@ -16,7 +16,9 @@ depend()
 start()
 {
 	ebegin "Setting the local clock based on last shutdown time"
-	swclock --warn
+	if ! swclock 2> /dev/null; then
+	swclock --warn @PREFIX@/sbin/runscript
+	fi
 	eend $?
 }
 

init.d/syscons.in

@@ -1,6 +1,6 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 depend() {
 	need localmount

init.d/sysctl.BSD.in

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

init.d/sysctl.Linux.in

@@ -1,6 +1,6 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 depend()
 {
@@ -10,16 +10,25 @@ depend()
 
 start()
 {
-	local conf= retval=0
+	local conf= retval=0 err errs
+
 	ebegin "Configuring kernel parameters"
 	eindent
+
 	for conf in /etc/sysctl.d/*.conf /etc/sysctl.conf; do
 		if [ -r "$conf" ]; then
 			vebegin "applying $conf"
-			sysctl -p "$conf" >/dev/null
+			if ! err=$(sysctl -q -p "$conf" 2>&1) ; then
+				errs="${errs} ${err}"
+				sysctl -q -e -p "${conf}"
+			fi
 			veend $? || retval=1
 		fi
 	done
+
 	eoutdent
-	eend $retval "Some errors were encountered"
+	if [ ${retval} -eq 0 ] && [ -n "${errs}" ] ; then
+		ewarn "Unknown keys:${errs}"
+	fi
+	eend $retval "Some errors were encountered: ${errs}"
 }

init.d/sysfs.in

@@ -1,6 +1,6 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 description="Mount the sys filesystem."
 

init.d/syslogd.in

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

init.d/termencoding.in

@@ -1,6 +1,6 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2008-2009 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 description="Configures terminal encoding."
 
@@ -10,6 +10,8 @@ ttyn=${rc_tty_number:-${RC_TTY_NUMBER:-12}}
 depend()
 {
 	keyword -openvz -prefix -uml -vserver -xenu
+	need root
+	after bootmisc
 }
 
 start()

init.d/ttys.in

@@ -1,6 +1,6 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2008 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 depend()
 {

init.d/urandom.in

@@ -1,6 +1,6 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 : ${urandom_seed:=${URANDOM_SEED:-/var/run/random-seed}}
 description="Initializes the random number generator."

init.d/wscons.in

@@ -1,6 +1,6 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2008-2009 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 depend()
 {

man/einfo.3

@@ -1,5 +1,4 @@
 .\" Copyright (c) 2007-2008 Roy Marples
-.\" All rights reserved
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -106,8 +105,7 @@ and
 respectively, but only work when
 .Va EINFO_VERBOSE
 is true. You can also make the
-.Fn einfo ,
+.Fn einfo
-.Fn ewarn ,
 and
 .Fn ebegin
 functions silent by setting

man/rc-service.8

@@ -1,5 +1,4 @@
 .\" Copyright (c) 2008-2009 Roy Marples
-.\" All rights reserved
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions

man/rc-status.8

@@ -1,5 +1,4 @@
 .\" Copyright (c) 2007-2009 Roy Marples
-.\" All rights reserved
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions

man/rc-update.8

@@ -1,5 +1,4 @@
 .\" Copyright (c) 2007-2009 Roy Marples
-.\" All rights reserved
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions

man/rc.8

@@ -1,5 +1,4 @@
 .\" Copyright (c) 2007-2009 Roy Marples
-.\" All rights reserved
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions

man/rc_config.3

@@ -1,5 +1,4 @@
 .\" Copyright (c) 2007-2008 Roy Marples
-.\" All rights reserved
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions

man/rc_deptree.3

@@ -1,5 +1,4 @@
 .\" Copyright (c) 2007-2008 Roy Marples
-.\" All rights reserved
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions

man/rc_find_pids.3

@@ -1,5 +1,4 @@
 .\" Copyright (c) 2007-2008 Roy Marples
-.\" All rights reserved
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions

man/rc_plugin_hook.3

@@ -1,5 +1,4 @@
 .\" Copyright (c) 2007-2008 Roy Marples
-.\" All rights reserved
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions

man/rc_runlevel.3

@@ -1,5 +1,4 @@
 .\" Copyright (c) 2007-2008 Roy Marples
-.\" All rights reserved
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions

man/rc_service.3

@@ -1,5 +1,4 @@
 .\" Copyright (c) 2007-2008 Roy Marples
-.\" All rights reserved
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions

man/rc_stringlist.3

@@ -1,5 +1,4 @@
 .\" Copyright (c) 2007-2008 Roy Marples
-.\" All rights reserved
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions

man/runscript.8

@@ -1,5 +1,4 @@
 .\" Copyright (c) 2007-2009 Roy Marples
-.\" All rights reserved
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -148,7 +147,8 @@ 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 
@@ -462,12 +462,6 @@ show()
 
 .Ed
 .Sh BUGS
-Because of the way we load our configuration files and the need to handle
-more than one service directory, you can only use symlinks in service
-directories to other services in the same directory.
-You cannot symlink to a service in a different directory even if it is
-another service directory.
-.Pp
 is_older_than should return 0 on success.
 Instead we return 1 to be compliant with Gentoo baselayout.
 Users are encouraged to use the is_newer_than function which returns correctly.

man/start-stop-daemon.8

@@ -1,5 +1,4 @@
 .\" Copyright (c) 2007-2009 Roy Marples
-.\" All rights reserved
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions

mk/cc.mk

@@ -1,7 +1,7 @@
 # Copyright (c) 2008 Roy Marples <roy@marples.name>
 
 # Setup some good default CFLAGS
-CFLAGS?=	-O2
+CFLAGS?=	-O2 -g
 
 # Default to using the C99 standard
 CSTD?=		c99
@@ -31,3 +31,5 @@ _CC_FLAGS_SH=	for f in ${_CCFLAGS}; do \
 		done;
 _CC_FLAGS:=	$(shell ${_CC_FLAGS_SH})
 CFLAGS+=	${_CC_FLAGS}
+
+include ${MK}/debug.mk

mk/debug.mk

@@ -1,6 +1,6 @@
 # rules to enable debugging support
 # Copyright (c) 2008 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Released under the 2-clause BSD license.
 
 _RC_DEBUG_SH=	case "${DEBUG}" in "") echo "";; *) echo "-DRC_DEBUG";; esac
 _RC_DEBUG:=	$(shell ${_RC_DEBUG_SH})