release openrc-0.6.6

This fixes bug #347307.

Makefile.inc

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

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.
-net_fs_list="afs cifs coda davfs fuse fuse.sshfs gfs glusterfs lustre ncpfs nfs nfs4 ocfs2 shfs smbfs"
+# Below is the default list of network fstypes.
+#
+# afs cifs coda davfs fuse fuse.sshfs gfs glusterfs lustre ncpfs
+# nfs nfs4 ocfs2 shfs smbfs
+#
+# If you would like to add to this list, you can do so by adding your
+# own fstypes to the following variable.
+#extra_net_fs_list=""
 
 ##############################################################################
 # SERVICE CONFIGURATION VARIABLES

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 2> /dev/null
+
 		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

@@ -14,13 +14,16 @@ depend()
 start()
 {
 	# Mount local filesystems in /etc/fstab.
-	local types="noproc" x=
+	local types="noproc" x= no_netdev=
 	for x in $net_fs_list; do
 		types="${types},${x}"
 	done
 
+	if [ "$RC_UNAME" = Linux ]; then
+		no_netdev="-O no_netdev"
+	fi
 	ebegin "Mounting local filesystems"
-	mount -at "$types"
+	mount -at "$types" $no_netdev
 	eend $? "Some local filesystem failed to mount"
 
 	# Always return 0 - some local mounts may not be critical for boot

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
 }

net/bonding.sh

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

net/vlan.sh

@@ -20,7 +20,7 @@ _is_vlan()
 _get_vlans()
 {
 	[ -e /proc/net/vlan/config ] || return 1
-	sed -n -e 's/^\(.*[0-9]\) \(.* \) .*'"${IFACE}"'$/\1/p' /proc/net/vlan/config
+	sed -n -e 's/^\W*\([^ ]*\) \(.* \) .*'"${IFACE}"'$/\1/p' /proc/net/vlan/config
 }
 
 _check_vlan()

pkgconfig/Makefile

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

sh/init-early.sh.Linux.in

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

sh/rc-functions.sh.in

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

sh/rc-mount.sh

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