openrc-0.6.5

This fixes bug #342825.

Makefile.inc

@@ -1,3 +1,3 @@
 NAME=		openrc
-VERSION=	0.6.1
+VERSION=	0.6.5
 PKG=		${NAME}-${VERSION}

README

@@ -1,8 +1,9 @@
 OpenRC README
-
+=============
 
 Installation
 ------------
+
 make install
 Yup, that simple. Works with GNU make and BSD make.
 
@@ -51,34 +52,56 @@ 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
 -------------
+
 If you installed OpenRC from your chosen distribution, you should report
 bugs directly to them. For example, if you use Gentoo and emerged OpenRC
 then you should reports bugs to http://bugs.gentoo.org.
 
-Otherwise, you can report them directly to me at
+History - by Daniel Robbins
-http://roy.marples.name/projects/openrc
+---------------------------
 
+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.)
 
-History - by Roy Marples
+excerpt from http://www.gentoo.org/news/en/gwn/20040426-newsletter.xml
-------------------------
+by Grant Goodyear:
-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.
 
-At the start of 2007, baselayout-2 is announced to the world, re-writing the
+"My recollection is that one of woodchip's more impressive early feats was the
-core of baselayout in C and allowing POSIX sh init scripts instead of
+complete replacement of all of the init scripts in Portage for Gentoo Linux
-forcing the use of bash. By Mid 2007 I have re-written everything, including
+1.0_rc6. Through 1.0_rc5 Gentoo had used fairly standard rc scripts modified
-init scripts, and alpha and pre baselayout-2 snapshots where put into Gentoo.
+from Stampede Linux, but for 1.0_rc6 Daniel Robbins (drobbins) and Martin
-Towards the end of 2007 I retired as a Gentoo developer for reasons I won't
+Schlemmer (azarah) had created a new dependency-based init script system that
-go into here. baselayout-2 was still in the pre stage, and aside from the
+is still used today. Within a span of days Donny rewrote every single init
-fbsd users, it was masked everywhere. However, I also desired to keep the
+script in the Portage tree and committed new masked packages to await the
-baselayout-2 project alive, but outside of Gentoo and into other projects
+release of 1.0_rc6. Thanks to woodchip (and drobbins and azarah, of course) the
-such as FreeBSD.
+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.
 
-As such, the Gentoo Council have allowed the creation of OpenRC under the
-2 clause BSD license, managed by me as an external project.

etc/rc.conf.in

@@ -11,7 +11,8 @@
 
 # Set rc_interactive to "YES" and you'll be able to press the I key during
 # boot so you can choose to start specific services. Set to "NO" to disable
-# this feature.
+# this feature. This feature is automatically disabled if rc_parallel is
+# set to YES.
 #rc_interactive="YES"
 
 # If we need to drop to a shell, you can specify it here.
@@ -75,8 +76,14 @@
 # Set unicode to YES to turn on unicode support for keyboards and screens.
 #unicode="NO"
 
-# Network fstypes. Below is the default.
+# Below is the default list of network fstypes.
-net_fs_list="afs cifs coda davfs fuse fuse.sshfs gfs glusterfs lustre ncpfs nfs nfs4 ocfs2 shfs smbfs"
+#
+# afs cifs coda davfs fuse fuse.sshfs gfs glusterfs lustre ncpfs
+# nfs nfs4 ocfs2 shfs smbfs
+#
+# If you would like to add to this list, you can do so by adding your
+# own fstypes to the following variable.
+#extra_net_fs_list=""
 
 ##############################################################################
 # SERVICE CONFIGURATION VARIABLES

init.d/bootmisc.in

@@ -4,7 +4,6 @@
 
 depend()
 {
-	use hostname
 	need localmount
 	before logger
 	after clock sysctl
@@ -36,6 +35,12 @@ cleanup_tmp_dir()
 		# Faster than find
 		rm -rf -- [^ajlq\.]*
 
+		# pam_mktemp creates a .private directory within which
+		# each user gets a private directory with immutable
+		# bit set; remove the immutable bit before trying to
+		# remove it.
+		[ -d /tmp/.private ] && chattr -R -a /tmp/.private
+
 		find $startopts ! -name . \
 			! -path "./lost+found" \
 			! -path "./lost+found/*" \
@@ -49,8 +54,6 @@ cleanup_tmp_dir()
 			! -path "./aquota.group/*" \
 			! -path "./journal" \
 			! -path "./journal/*" \
-			! -path "./.private" \
-			! -path "./.private/*" \
 			-exec rm -rf {} \;
 		eend 0
 	else

init.d/local.in

@@ -18,11 +18,6 @@ start()
 		local_start
 	fi
 
-	# Support old configs
-	if [ -e @SYSCONFDIR@/conf.d/local.start ]; then
-		. @SYSCONFDIR@/conf.d/local.start
-	fi
-
 	eend $? "Failed to start local"
 }
 
@@ -34,10 +29,5 @@ stop()
 		local_stop
 	fi
 
-	# Support old configs
-	if [ -e @SYSCONFDIR@/conf.d/local.stop ]; then
-		. @SYSCONFDIR@/conf.d/local.stop
-	fi
-
 	eend $? "Failed to stop local"
 }

init.d/localmount.in

@@ -20,7 +20,7 @@ start()
 	done
 
 	ebegin "Mounting local filesystems"
-	mount -at "$types"
+	mount -at "$types" -O no_netdev
 	eend $? "Some local filesystem failed to mount"
 
 	# Always return 0 - some local mounts may not be critical for boot

init.d/sysctl.BSD.in

@@ -4,7 +4,6 @@
 
 depend()
 {
-	use hostname
 	before bootmisc logger
 	keyword -prefix
 }

init.d/sysctl.Linux.in

@@ -4,7 +4,6 @@
 
 depend()
 {
-	use hostname
 	before bootmisc logger
 	keyword -openvz -prefix -vserver
 }

sh/init-early.sh.Linux.in

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

sh/rc-functions.sh.in

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

sh/rc-mount.sh

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