release openrc-0.6.4

The openrc ebuild now migrates these files to /etc/conf.d/local, so we
do not need to support them.

Makefile.inc

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

README

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

init.d/localmount.in

@@ -20,7 +20,7 @@ start()
 	done
 
 	ebegin "Mounting local filesystems"
-	mount -at "$types" -O no_netdev
+	mount -at "$types"
 	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,6 +4,7 @@
 
 depend()
 {
+	use hostname
 	before bootmisc logger
 	keyword -prefix
 }

net/bonding.sh

@@ -46,12 +46,27 @@ bonding_pre_start()
 		return 1
 	fi
 
-	# Configure the bond.
+	# Interface must be down in order to configure
-	# Nice and dynamic :)
+	_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/ifplugd.sh

@@ -27,8 +27,8 @@ ifplugd_pre_start()
 		return 0
 	fi
 
-	# We don't work on bonded, bridges, tun/tap, vlan or wireless
+	# We don't work on bonded, bridges, tun/tap or vlan
-	for f in bond bridge tuntap vlan wireless; do
+	for f in bond bridge tuntap vlan; do
 		if type "_is_${f}" >/dev/null 2>&1; then
 			if _is_${f}; then
 				veinfo "ifplugd does not work with ${f}"

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/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
+		# Ensure we interpret all characters properly.
 		mnt=$(printf "$mnt")
 
 		case "$cmd" in