Revert "Unprivileged users (such as services for example) should not be able view who is logged into system."

This reverts commit 62bd337494.

It's a bit too restrictive for a default install, as it also prevents "who" from working on user accounts.

Makefile

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

Makefile.inc

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

README

@@ -1,8 +1,9 @@
 OpenRC README
-
+=============
 
 Installation
 ------------
+
 make install
 Yup, that simple. Works with GNU make.
 
@@ -67,33 +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
---------------
-Since Gentoo Linux is hosting OpenRC development, Bugs should go to
-the Gentoo Bugzilla:
-	http://bugs.gentoo.org/
-They should be filed under the "Gentoo Hosted Projects" product and
-the "openrc" component.
 
+If you installed OpenRC from your chosen distribution, you should report
+bugs directly to them. For example, if you use Gentoo and emerged OpenRC
+then you should reports bugs to http://bugs.gentoo.org.
 
-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 (add names here....
+need to look at baselayout cvs logs.)
 
-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.

STYLE

@@ -32,54 +32,3 @@ 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 killprocs modules
+CONF+=	consolefont dmesg hwclock keymaps 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 boot" as root).
+# not want to use it, run "rc-update del consolefont" as root).
 consolefont="default8x16"
 
 # consoletranslation is the charset map file to use.  Leave commented to use

conf.d/killprocs

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

conf.d/modules

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

etc/rc.conf.in

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

etc/rc.devd

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

etc/rc.in

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

etc/rc.shutdown.in

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

init.d.misc/avahid.in

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

init.d.misc/dbus.in

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

init.d.misc/dhcpcd.in

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

init.d.misc/dnsmasq.in

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

init.d.misc/hald.in

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

init.d.misc/named.in

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

init.d.misc/ntpd.in

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

init.d.misc/openvpn.in

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

init.d.misc/polkitd.in

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

init.d.misc/sshd.in

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

init.d.misc/wpa_supplicant.in

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

init.d/adjkerntz.in

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

init.d/bootmisc.in

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

init.d/consolefont.in

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

init.d/devd.in

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

init.d/devdb.in

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

init.d/devfs.in

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

init.d/dmesg.in

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

init.d/dumpon.in

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

init.d/fsck.in

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

init.d/hostid.in

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

init.d/hostname.in

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

init.d/hwclock.in

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

init.d/ipfw.in

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

init.d/keymaps.in

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

init.d/killprocs.in

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

init.d/local.in

@@ -1,6 +1,6 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# All rights reserved. Released under the 2-clause BSD license.
 
 description="Executes user programs in @SYSCONFDIR@/local.d"
 

init.d/localmount.in

@@ -1,6 +1,6 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# All rights reserved. Released under the 2-clause BSD license.
 
 description="Mounts disks and swap according to /etc/fstab."
 
@@ -16,7 +16,7 @@ start()
 {
 	# Mount local filesystems in /etc/fstab.
 	local types="noproc" x= no_netdev=
-	for x in $net_fs_list $extra_net_fs_list; do
+	for x in $net_fs_list; do
 		types="${types},${x}"
 	done
 
@@ -37,10 +37,16 @@ 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
-	local IFS="$IFS:"
+	OIFS=$IFS SIFS=${IFS-y}
+	IFS=$IFS:
 	for x in $no_umounts $RC_NO_UMOUNTS; do
 		no_umounts_r="$no_umounts_r|$x"
 	done
+	if [ "$SIFS" = y ]; then
+		IFS=$OIFS
+	else
+		unset IFS
+	fi
 
 	if [ "$RC_UNAME" = Linux ]; then
 		no_umounts_r="$no_umounts_r|/proc|/proc/.*|/run|/sys|/sys/.*"
@@ -64,7 +70,7 @@ stop()
 	einfo "Unmounting filesystems"
 	eindent
 	local fs=
-	for x in $net_fs_list $extra_net_fs_list; do
+	for x in $net_fs_list; do
 		fs="$fs${fs:+|}$x"
 	done
 	[ -n "$fs" ] && fs="^($fs)$"

init.d/mixer.in

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

init.d/modules.in

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

init.d/mount-ro.in

@@ -1,6 +1,6 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# All rights reserved. Released under the 2-clause BSD license.
 
 description="Re-mount filesytems read-only for a clean reboot."
 
@@ -22,13 +22,19 @@ start()
 	local m="/dev|/dev/.*|/proc|/proc.*|/sys|/sys/.*|${RC_SVCDIR}" x= fs=
 	m="$m|/bin|/sbin|/lib|/libexec"
 	# RC_NO_UMOUNTS is an env var that can be set by plugins
-	local IFS="$IFS:"
+	local OIFS=$IFS SIFS=${IFS-y} IFS=$IFS
+	IFS=$IFS:
 	for x in $no_umounts $RC_NO_UMOUNTS; do
 		m="$m|$x"
 	done
+	if [ "$SIFS" = y ]; then
+		IFS=$OIFS
+	else
+		unset IFS
+	fi
 	m="^($m)$"
 	fs=
-	for x in $net_fs_list $extra_net_fs_list; do
+	for x in $net_fs_list; do
 		fs="$fs${fs:+|}$x"
 	done
 	[ -n "$fs" ] && fs="^($fs)$"

init.d/moused.in

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

init.d/mtab.in

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

init.d/net.lo.in

@@ -1,6 +1,6 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# All rights reserved. Released under the 2-clause BSD license.
 
 MODULESDIR="${RC_LIBEXECDIR}/net"
 MODULESLIST="${RC_SVCDIR}/nettree"
@@ -48,9 +48,6 @@ _get_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 _a; do
 					printf "%s\n" "${_a}"
@@ -72,9 +69,6 @@ _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")"
@@ -545,9 +539,7 @@ start()
 		[ -z "${config}" ] && break
 
 		set -- ${config}
-		if [ "$1" != "null" -a "$1" != "noop" ]; then
-			ebegin "$1"
-		fi
+		ebegin "$1"
 		eindent
 		case "$1" in
 			noop)

init.d/netmount.in

@@ -1,6 +1,6 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# All rights reserved. Released under the 2-clause BSD license.
 
 description="Mounts 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 $extra_net_fs_list; do
+	for x in $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 $extra_net_fs_list; do
+	for x in $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 $extra_net_fs_list; do
+	for x in $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>
-# Released under the 2-clause BSD license.
+# All rights reserved. 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>
-# Released under the 2-clause BSD license.
+# All rights reserved. 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>
-# Released under the 2-clause BSD license.
+# All rights reserved. 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>
-# Released under the 2-clause BSD license.
+# All rights reserved. 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>
-# Released under the 2-clause BSD license.
+# All rights reserved. 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>
-# Released under the 2-clause BSD license.
+# All rights reserved. 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>
-# Released under the 2-clause BSD license.
+# All rights reserved. Released under the 2-clause BSD license.
 
 description="Mounts misc filesystems in /proc."
 

init.d/rarpd.in

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

init.d/swap-blk.in

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

init.d/swap.in

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

init.d/swclock.in

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

init.d/syscons.in

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

init.d/sysctl.BSD.in

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

init.d/sysctl.Linux.in

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

init.d/sysfs.in

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

init.d/syslogd.in

@@ -1,6 +1,6 @@
 #!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# All rights reserved. Released under the 2-clause BSD license.
 
 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>
-# Released under the 2-clause BSD license.
+# All rights reserved. Released under the 2-clause BSD license.
 
 description="Configures terminal encoding."
 

init.d/ttys.in

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

init.d/urandom.in

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

man/einfo.3

@@ -1,4 +1,5 @@
 .\" 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
@@ -105,7 +106,8 @@ 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,4 +1,5 @@
 .\" 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,4 +1,5 @@
 .\" 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,4 +1,5 @@
 .\" 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,4 +1,5 @@
 .\" 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,4 +1,5 @@
 .\" 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,4 +1,5 @@
 .\" 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,4 +1,5 @@
 .\" 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,4 +1,5 @@
 .\" 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,4 +1,5 @@
 .\" 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,4 +1,5 @@
 .\" 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,4 +1,5 @@
 .\" 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,4 +1,5 @@
 .\" 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
@@ -462,6 +463,12 @@ 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,4 +1,5 @@
 .\" 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/debug.mk

@@ -1,6 +1,6 @@
 # rules to enable debugging support
 # Copyright (c) 2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# All rights reserved. Released under the 2-clause BSD license.
 
 _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>
-# Released under the 2-clause BSD license.
+# All rights reserved. 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>
-# Released under the 2-clause BSD license.
+# All rights reserved. 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>
-# Released under the 2-clause BSD license.
+# All rights reserved. Released under the 2-clause BSD license.
 
 SHLIB_NAME=		lib${LIB}.so.${SHLIB_MAJOR}
 SHLIB_LINK=		lib${LIB}.so

mk/os-BSD.mk

@@ -1,5 +1,5 @@
 # Copyright (c) 2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# All rights reserved. Released under the 2-clause BSD license.
 
 # Generic definitions
 

mk/os-FreeBSD.mk

@@ -1,5 +1,5 @@
 # Copyright (c) 2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# All rights reserved. Released under the 2-clause BSD license.
 
 # Generic definitions
 

mk/os-Linux.mk

@@ -1,5 +1,5 @@
 # Copyright (c) 2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# All rights reserved. Released under the 2-clause BSD license.
 
 CPPFLAGS+=	-D_BSD_SOURCE -D_XOPEN_SOURCE=600
 LIBDL=		-Wl,-Bdynamic -ldl

mk/os-NetBSD.mk

@@ -1,5 +1,5 @@
 # Copyright (c) 2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# All rights reserved. Released under the 2-clause BSD license.
 
 # Generic definitions
 

mk/os.mk

@@ -1,5 +1,5 @@
 # Copyright (c) 2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# All rights reserved. Released under the 2-clause BSD license.
 
 # Generic definitions
 

mk/prog.mk

@@ -2,7 +2,7 @@
 # based on FreeBSD's bsd.prog.mk
 
 # Copyright (c) 2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# All rights reserved. Released under the 2-clause BSD license.
 
 OBJS+=			${SRCS:.c=.o}
 

mk/scripts.mk

@@ -1,6 +1,6 @@
 # Install rules for our scripts
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# All rights reserved. Released under the 2-clause BSD license.
 
 include ${MK}/sys.mk
 include ${MK}/os.mk

mk/subdir.mk

@@ -1,7 +1,7 @@
 # Recursive rules
 # Adapted from FreeBSDs bsd.subdir.mk
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# All rights reserved. Released under the 2-clause BSD license.
 
 _+_ ?= +
 ECHODIR ?= echo