merging latest gentoo stuff

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

.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.8.3
 PKG=		${NAME}-${VERSION}

README

@@ -1,8 +1,9 @@
 OpenRC README
-
+=============
 
 Installation
 ------------
+
 make install
 Yup, that simple. Works with GNU make.
 
@@ -67,31 +68,54 @@ init.d.misc is not installed by default as the scripts will need
 tweaking on a per distro basis. They are also non essential to the operation
 of the system.
 
-
 Reporting Bugs
---------------
-Bugs should go to the Gentoo Bugzilla:
-	http://bugs.gentoo.org/
-You'll want the "Gentoo Linux" product and the "baselayout" component.
 
+If you installed OpenRC from your chosen distribution, you should report
+bugs directly to them. For example, if you use Gentoo and emerged OpenRC
+then you should reports bugs to http://bugs.gentoo.org.
 
-History - by Roy Marples
-------------------------
-I became a Gentoo/Linux developer in 2004 and wrote the modular network
-scripts for the Gentoo baselayout package. baselayout is a collection of
-bash scripts to bring up your computer and its services.
-Then towards the end of 2005 I found myself as the primary maintainer
-for baselayout.
+History - by Daniel Robbins
+---------------------------
 
-At the start of 2007, baselayout-2 is announced to the world, re-writing the
-core of baselayout in C and allowing POSIX sh init scripts instead of
-forcing the use of bash. By Mid 2007 I have re-written everything, including
-init scripts, and alpha and pre baselayout-2 snapshots where put into Gentoo.
-Towards the end of 2007 I retired as a Gentoo developer for reasons I won't
-go into here. baselayout-2 was still in the pre stage, and aside from the
-fbsd users, it was masked everywhere. However, I also desired to keep the
-baselayout-2 project alive, but outside of Gentoo and into other projects
-such as FreeBSD.
+The Gentoo modular network scripts were created by Daniel Robbins for
+Gentoo Linux 1.0_rc6, in development during most of 2001 and released
+in September 2001. After their development, the dependency-based initscript
+system was maintained by a number of senior developers, primarily Martin
+Schlemmer (azarah).
 
-As such, the Gentoo Council have allowed the creation of OpenRC under the
-2 clause BSD license, managed by me as an external project.
+excerpt from http://www.gentoo.org/news/en/gwn/20040426-newsletter.xml
+by Grant Goodyear:
+
+"My recollection is that one of woodchip's more impressive early feats was the
+complete replacement of all of the init scripts in Portage for Gentoo Linux
+1.0_rc6. Through 1.0_rc5 Gentoo had used fairly standard rc scripts modified
+from Stampede Linux, but for 1.0_rc6 Daniel Robbins (drobbins) and Martin
+Schlemmer (azarah) had created a new dependency-based init script system that
+is still used today. Within a span of days Donny rewrote every single init
+script in the Portage tree and committed new masked packages to await the
+release of 1.0_rc6. Thanks to woodchip (and drobbins and azarah, of course) the
+transition to the new init scripts was nearly painless."
+
+Roy Marples became a Gentoo/Linux developer in 2004 and maintained the modular
+network scripts for the Gentoo baselayout package.  Then towards the end of
+2005, he became the the primary maintainer for baselayout.
+
+At the start of 2007, Roy Marples announced the ongoing development of
+baselayout-2, containing a rewritten initscript code in C and allowing POSIX sh
+init scripts instead of forcing the use of bash. By Mid 2007 Roy Marples had
+re-implemented the Gentoo initscript design created by Daniel Robbins, using an
+entirely new code base.  Alpha and pre-release baselayout-2 snapshots were
+added to Gentoo's Portage tree as an optional component.
+
+Towards the end of 2007, Roy Marples retired as a Gentoo developer Baselayout-2
+was still in the pre stage, and aside from the fbsd users, it was masked
+everywhere. However, Roy Marples desired to keep the baselayout-2 project
+alive, but outside of Gentoo and into other projects such as FreeBSD.
+
+As such, the Gentoo Council permitted Roy Marples to release OpenRC under the 2
+clause BSD license, managed by him as an external project. Around mid-2010, Roy
+Marples decided to no longer maintain OpenRC. At this point, he transferred
+development back to Gentoo, which continues to maintain the scripts. In
+addition, Daniel Robbins continues to maintain an independent version OpenRC
+for Funtoo Linux, which includes a Funtoo-specific network configuration
+system.

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/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=""

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
-# then you can specify a timeout here.
+# If you would like it to wait so that other services know that network is
+# 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.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()
@@ -26,14 +26,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
-		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
 
 		# pam_mktemp creates a .private directory within which
 		# each user gets a private directory with immutable
@@ -41,27 +42,23 @@ cleanup_tmp_dir()
 		# remove it.
 		[ -d /tmp/.private ] && chattr -R -a /tmp/.private 2> /dev/null
 
-		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/*" \
-			-exec rm -rf {} \;
+		# 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
 }

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."
 
@@ -37,7 +37,7 @@ stop()
 	local x= no_umounts_r="/|/dev|/dev/.*|${RC_SVCDIR}"
 	no_umounts_r="${no_umounts_r}|/bin|/sbin|/lib|/libexec"
 	# RC_NO_UMOUNTS is an env var that can be set by plugins
-	OIFS=$IFS SIFS=${IFS-y}
+	local OIFS=$IFS SIFS=${IFS-y}
 	IFS=$IFS:
 	for x in $no_umounts $RC_NO_UMOUNTS; do
 		no_umounts_r="$no_umounts_r|$x"
@@ -49,7 +49,7 @@ stop()
 	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)$"
 

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

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

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"
 

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

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

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
 

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

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

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 

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})

mk/dist.mk

@@ -1,6 +1,6 @@
 # rules to make a distribution tarball from a git repo
 # 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.
 
 GITREF?=	HEAD
 DISTPREFIX?=	${NAME}-${VERSION}

mk/gitignore.mk

@@ -1,6 +1,6 @@
 # rules to make .gitignore files
 # 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.
 
 IGNOREFILES+=   ${CLEANFILES}
 

mk/lib.mk

@@ -2,7 +2,7 @@
 # based on FreeBSD's bsd.lib.mk
 
 # 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.
 
 SHLIB_NAME=		lib${LIB}.so.${SHLIB_MAJOR}
 SHLIB_LINK=		lib${LIB}.so
@@ -31,8 +31,6 @@ 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 $@

mk/os-BSD.mk

@@ -1,5 +1,5 @@
 # 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.
 
 # Generic definitions
 

mk/os-FreeBSD.mk

@@ -1,5 +1,5 @@
 # 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.
 
 # Generic definitions