release openrc-0.9.5

This reverts commit 5a3599df8a.

After review, I am bringing this back to the tree.

Makefile

@@ -4,12 +4,7 @@
 
 include Makefile.inc
 
-SUBDIR=		conf.d etc init.d local.d man scripts sh src
-
-# Build our old net foo or not
-ifeq (${MKOLDNET},yes)
-SUBDIR+=	net doc
-endif
+SUBDIR=		conf.d doc etc init.d local.d man net scripts sh src
 
 # Build pkgconfig or not
 MKPKGCONFIG?=	yes

Makefile.inc

@@ -1,3 +1,3 @@
 NAME=		openrc
-VERSION=	0.8.3
+VERSION=	0.9.5
 PKG=		${NAME}-${VERSION}

README

@@ -1,9 +1,8 @@
 OpenRC README
-=============
+
 
 Installation
 ------------
-
 make install
 Yup, that simple. Works with GNU make.
 
@@ -15,9 +14,9 @@ MKPAM=pam
 MKPKGCONFIG=no
 MKRCSYS=prefix
 MKSELINUX=yes
+MKSTATICLIBS=no
 MKTERMCAP=ncurses
 MKTERMCAP=termcap
-MKOLDNET=yes
 PKG_PREFIX=/usr/pkg
 LOCAL_PREFIX=/usr/local
 PREFIX=/usr/local
@@ -68,54 +67,33 @@ 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 Daniel Robbins
----------------------------
+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.
 
-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).
+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.
 
-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.
+As such, the Gentoo Council have allowed the creation of OpenRC under the
+2 clause BSD license, managed by me as an external project.

README.newnet

@@ -1,40 +0,0 @@
-The following applies only to the newnet stack, which is not presently
-maintained in OpenRC. The oldnet stack is maintained instead.
-- Robin H. Johnson <robbat2@gentoo.org>, 2011/02/21
-
-OpenRC Network Ideals
----------------------
-
-The new style networking for OpenRC is very simplistic - provide a basic means
-of configuring static interface address and routes whilst allowing the
-possibility to run any command at any point.
-
-In a nutshell, init.d/network is a wrapper around ifconfig(8) and
-init.d/staticroute is wrapper around route(8).
-
-In the Perfect World (TM) ifconfig should be able to configure everything
-about the interface easily * . The BSD family almost get this right and Linux
-epically fails.
-
-* Only static configuration, including link setup.
-For dynamic, static, IPv4LL, arping and per ssid IPv4 setup dhcpcd-5.x
-provides your needs.
-
-It fails because there are many tools to do the same job and often have
-vastly different syntax where they could be similar. In other words, there
-is no coherence.
-
-OpenRC-0.4.x and older (inc Gentoo baselayout-1) had a collection of scripts
-for each tool and allowed a script per interface. Over the years, this design
-has proven very hard to maintain as each user has their own idea of how
-things should work. Also, there were (and still are) race conditions.
-
-So where do we go from here?
-Well, it's possible to use the new network scripts using the tools
-currently available. It's just harder as you have to know them and their
-documentation can be lacking at times.
-The correct end goal is a BSD style ifconfig tool.
-I've started work on it, but the project has stalled somewhat.
-It's display only right now and the source is not yet publicly available.
-If you have the skills and share the vision then contact me privately and
-we'll take it from there.

STYLE

@@ -32,3 +32,54 @@ 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

@@ -1,19 +1,23 @@
 DIR=	${CONFDIR}
-CONF=	bootmisc fsck hostname localmount network staticroute urandom
+CONF=	bootmisc fsck hostname localmount network staticroute urandom \
+	${CONF-${OS}}
 
 TARGETS+=	network staticroute
 CLEANFILES+=	network staticroute
 
 MK=	../mk
 include ${MK}/os.mk
-include Makefile.${OS}
+
+CONF-FreeBSD=	ipfw moused powerd rarpd savecore syscons
+
+CONF-Linux=	consolefont dmesg hwclock keymaps killprocs modules
+
+CONF-NetBSD=	moused rarpd savecore
+
 include ${MK}/scripts.mk
 
-SOS?=	BSD
+network: network.in network${SFX}
+	cat $^ > $@
 
-network: network.in network.${SOS}
-	cp $@.in $@
-	[ -e $@.${SOS} ] && cat $@.${SOS} >> $@ || true
-
-staticroute: staticroute.${SOS}
-	cp $@.${SOS} $@
+staticroute: staticroute${SFX}
+	cp $@${SFX} $@

conf.d/Makefile.FreeBSD

@@ -1 +0,0 @@
-CONF+=	ipfw moused powerd rarpd savecore syscons

conf.d/Makefile.Linux

@@ -1,2 +0,0 @@
-CONF+=	consolefont dmesg hwclock keymaps killprocs modules
-SOS=	Linux

conf.d/Makefile.NetBSD

@@ -1 +0,0 @@
-CONF+=	moused rarpd savecore

conf.d/bootmisc

@@ -4,3 +4,7 @@ clean_tmp_dirs="/tmp"
 # Should we wipe the tmp paths completely or just selectively remove known
 # locks / files / etc... ?
 wipe_tmp="YES"
+
+# Write the initial dmesg log into /var/log/dmesg after boot
+# This may be useful if you need the kernel boot log afterwards
+log_dmesg="YES"

conf.d/fsck

@@ -13,6 +13,13 @@
 #fsck_passno=">1"
 #fsck_passno="<2"
 
+# If passno is not enough granularity, you can also specify mountpoints to
+# check. This should NOT be used for the default non-multiplexed fsck, or your
+# system might not be checked. Additionally, it is mutually exclusive with
+# the fsck_passno setting.
+#fsck_mnt=""
+#fsck_mnt="/home"
+
 # Most modern fs's don't require a full fsck on boot, but for those that do
 # it may be advisable to skip this when running on battery.
 # WARNING: Do not turn this off if you have any JFS partitions.

conf.d/modules

@@ -1,8 +1,10 @@
 # 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
@@ -10,10 +12,12 @@
 #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="ieee1394 ohci1394"
-#module_ieee1394_args_2_6_23="tun ieee1394"
-#module_ieee1394_args_2_6="tun"
+#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"
 
 # You should consult your kernel documentation and configuration
 # for a list of modules and their options.

conf.d/net

@@ -1,4 +1,4 @@
 # This blank configuration will automatically use DHCP for any net.*
 # scripts in /etc/init.d.  To create a more complete configuration,
-# please review /usr/share/doc/openrc/net.example and save your configuration
+# please review /usr/share/doc/openrc*/net.example* and save your configuration
 # in /etc/conf.d/net (this file :]!).

doc/Makefile

@@ -1,7 +1,11 @@
 DIR=	${DOCDIR}/openrc
+SRCS=	net.example.in
 INC=	net.example
 
 MK=	../mk
 include ${MK}/os.mk
-include Makefile.${OS}
+
+%.example.in: %.example${SFX}
+	${CP} $< $@
+
 include ${MK}/scripts.mk

doc/Makefile.FreeBSD

@@ -1,5 +0,0 @@
-SRCS+=		net.example.in
-
-.SUFFIXES:	.BSD.in
-.BSD.in:
-	${CP} $< $@

doc/Makefile.Linux

@@ -1,5 +0,0 @@
-SRCS+=		net.example.in
-
-.SUFFIXES:	.Linux.in
-.Linux.in:
-	${CP} $< $@

doc/Makefile.NetBSD

@@ -1,5 +0,0 @@
-SRCS+=		net.example.in
-
-.SUFFIXES:	.BSD.in
-.BSD.in:
-	${CP} $< $@

doc/net.example.Linux.in

@@ -350,7 +350,7 @@
 # By default we don't wait for wpa_supplicant to associate and authenticate.
 # If you need to change this behaviour then you don't know how our scripts work
 # and setting this value could cause strange things to happen.
-# If you would like to, so can specify how long in seconds.
+# If you would like it to wait, you can specify how long in seconds.
 #associate_timeout_eth0=60
 # A value of 0 means wait forever.
 
@@ -581,6 +581,18 @@
 # NOTE: depend functions only work in /etc/conf.d/net
 # and not in profile configs such as /etc/conf.d/net.foo
 
+# MAC-VLAN support
+# The following configuration can be used to create a new interface 'macvlan0'
+# linked to 'eth0'
+#macvlan_macvlan0="eth0"
+
+# MAC-VLAN mode (private, vepa, bridge, passtru)
+#mode_macvlan0="private"
+
+# IP address, MAC address, ... are configured as a normal interface
+#config_macvlan0="192.168.20.20/24"
+#mac_macvlan0="00:50:06:20:20:20"
+
 #-----------------------------------------------------------------------------
 # Bonding
 # For link bonding/trunking on 2.4 kernels, or kernels without sysfs
@@ -827,9 +839,9 @@
 
 # Below is an example of configuring the bridge
 # Consult "man brctl" for more details
-#brctl_br0="setfd 0
-#sethello 0
-#stp off"
+#brctl_br0="setfd 15
+#sethello 2
+#stp on"
 
 # You can also configure the bridge or bridge members via sysfs on 2.6 kernels
 # or newer. See the kernel bridge documentation for a description of these

etc/Makefile

@@ -1,17 +1,33 @@
 DIR=	${SYSCONFDIR}
-CONF=	rc.conf
+SRCS=	rc.conf.in rc.in rc.shutdown.in
+BIN=	${BIN-${OS}}
+CONF=	rc.conf ${BIN-${OS}}
 
 CLEANFILES+=	rc.conf
 
 MK=	../mk
 include ${MK}/os.mk
-include Makefile.${OS}
+
+SED_EXTRA-FreeBSD=	-e 's:@TERM@:cons25:g'
+BIN-FreeBSD=		rc rc.shutdown rc.devd
+CONF-FreeBSD=		devd.conf
+
+SED_EXTRA-Linux=	-e 's:@TERM@:wsvt25:g'
+BIN-Linux=
+CONF-Linux=
+
+SED_EXTRA-NetBSD=	-e 's:@TERM@:wsvt25:g'
+BIN-NetBSD=		rc rc.shutdown
+CONF-NetBSD=
+
+SED_EXTRA=	${SED_EXTRA-${OS}}
+
 include ${MK}/scripts.mk
 
 # We can't use "ifndef" here because that treats set-but-empty
 # as not-set which is not what we want
 MKRCSYS ?= automagicplease
-ifeq ($(MKRCSYS),automagicplease)
+ifeq (${MKRCSYS},automagicplease)
 # If the user isn't picking a default, then have the
 # config go with runtime automagic detection #357247
 rc.conf: SED_EXTRA += -e '/^rc_sys=""/s:^:\#:'

etc/Makefile.FreeBSD

@@ -1,4 +0,0 @@
-SED_EXTRA=	-e 's:@TERM@:cons25:g'
-SRCS+=		rc.conf.in rc.in rc.shutdown.in
-CONF+=		devd.conf
-BIN+=		rc rc.shutdown rc.devd

etc/Makefile.Linux

@@ -1,2 +0,0 @@
-SED_EXTRA=	-e 's:@TERM@:wsvt25:g'
-SRCS+=		rc.conf.in rc.in rc.shutdown.in

etc/Makefile.NetBSD

@@ -1,3 +0,0 @@
-SED_EXTRA=	-e 's:@TERM@:wsvt25:g'
-SRCS+=		rc.conf.in rc.in rc.shutdown.in
-BIN+=		rc rc.shutdown

etc/rc.conf.in

@@ -47,6 +47,10 @@
 # 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"

init.d.misc/Makefile

@@ -7,5 +7,5 @@ MK=	../mk
 
 SED_EXTRA+= -e 's:@VARBASE@:/var:g'
 
+include ${MK}/os.mk
 include ${MK}/scripts.mk
-include Makefile.${OS}

init.d.misc/Makefile.FreeBSD

@@ -1 +0,0 @@
-PKG_PREFIX?=	/usr/local

init.d.misc/Makefile.Linux

@@ -1 +0,0 @@
-PKG_PREFIX?=/usr

init.d.misc/Makefile.NetBSD

@@ -1 +0,0 @@
-PKG_PREFIX?=	/usr/pkg

init.d/Makefile

@@ -1,25 +1,42 @@
 DIR=	${INITDIR}
 SRCS=	bootmisc.in fsck.in hostname.in local.in localmount.in netmount.in \
 	network.in root.in savecache.in staticroute.in swap.in swclock.in \
-	sysctl.in urandom.in
+	sysctl.in urandom.in ${SRCS-${OS}}
 BIN=	${OBJS}
 
-# Build our old net foo or not
-ifeq (${MKOLDNET},yes)
-_OLDNET=	net.lo
-endif
-_NET_LO=	${_OLDNET}
-
-INSTALLAFTER=	_installafter_${_NET_LO}
-CLEANFILES+=	${_NET_LO}
-TARGETS+=	${_NET_LO}
+INSTALLAFTER=	_installafter_net.lo
+CLEANFILES+=	net.lo
+TARGETS+=	net.lo
 
 MK=	../mk
 include ${MK}/os.mk
-include Makefile.${OS}
+
+NET_LO-FreeBSD=	net.lo0
+# Generic BSD scripts
+SRCS-FreeBSD=	hostid.in moused.in newsyslog.in pf.in rarpd.in rc-enabled.in \
+		rpcbind.in savecore.in syslogd.in
+# These are FreeBSD specific
+SRCS-FreeBSD+=	adjkerntz.in devd.in dumpon.in ipfw.in mixer.in nscd.in \
+		powerd.in syscons.in
+
+NET_LO-Linux=	net.lo
+SRCS-Linux=	devfs.in dmesg.in hwclock.in consolefont.in keymaps.in \
+		killprocs.in modules.in mount-ro.in mtab.in numlock.in \
+		procfs.in sysfs.in termencoding.in migrate-run.in
+
+NET_LO-NetBSD=	net.lo0
+# Generic BSD scripts
+SRCS-NetBSD=	hostid.in moused.in newsyslog.in pf.in rarpd.in rc-enabled.in \
+		rpcbind.in savecore.in syslogd.in
+# These are NetBSD specific
+SRCS-NetBSD+=	devdb.in swap-blk.in ttys.in wscons.in
+
+%.in: %${SFX}
+	sed ${SED_REPLACE} ${SED_EXTRA} $< > $@
+
 include ${MK}/scripts.mk
 
 _installafter_: realinstall
 
 _installafter_net.lo: realinstall
-	${INSTALL} -m ${BINMODE} net.lo ${DESTDIR}/${INITDIR}/${NET_LO}
+	${INSTALL} -m ${BINMODE} net.lo ${DESTDIR}/${INITDIR}/${NET_LO-${OS}}

init.d/Makefile.FreeBSD

@@ -1,13 +0,0 @@
-NET_LO=	net.lo0
-
-# Generic BSD scripts
-SRCS+=	hostid.in moused.in newsyslog.in pf.in rarpd.in rc-enabled.in \
-	rpcbind.in savecore.in syslogd.in
-
-# These are FreeBSD specific
-SRCS+=	adjkerntz.in devd.in dumpon.in ipfw.in mixer.in nscd.in \
-	powerd.in syscons.in
-
-.SUFFIXES:	.BSD.in
-.BSD.in:
-	sed ${SED_REPLACE} ${SED_EXTRA} $< > $@

init.d/Makefile.Linux

@@ -1,9 +0,0 @@
-NET_LO=	net.lo
-
-SRCS+=	devfs.in dmesg.in hwclock.in consolefont.in keymaps.in killprocs.in \
-	modules.in mount-ro.in mtab.in numlock.in procfs.in sysfs.in \
-	termencoding.in
-
-.SUFFIXES:	.Linux.in
-.Linux.in:
-	sed ${SED_REPLACE} ${SED_EXTRA} $< > $@

init.d/Makefile.NetBSD

@@ -1,12 +0,0 @@
-NET_LO=	net.lo0
-
-# Generic BSD scripts
-SRCS+=	hostid.in moused.in newsyslog.in pf.in rarpd.in rc-enabled.in \
-	rpcbind.in savecore.in syslogd.in
-
-# These are NetBSD specific
-SRCS+=	devdb.in swap-blk.in ttys.in wscons.in
-
-.SUFFIXES:	.BSD.in
-.BSD.in:
-	sed ${SED_REPLACE} ${SED_EXTRA} $< > $@

init.d/bootmisc.in

@@ -10,12 +10,13 @@ depend()
 	keyword -prefix -timeout
 }
 
-dir_writeable()
+dir_writable()
 {
 	mkdir "$1"/.test.$$ 2>/dev/null && rmdir "$1"/.test.$$
 }
 
 : ${wipe_tmp:=${WIPE_TMP:-yes}}
+: ${log_dmesg:=${LOG_DMESG:-yes}}
 
 cleanup_tmp_dir()
 {
@@ -24,7 +25,7 @@ cleanup_tmp_dir()
 	if ! [ -d "$dir" ]; then
 		mkdir -p "$dir" || return $?
 	fi
-	dir_writeable "$dir" || return 1
+	dir_writable "$dir" || return 1
 	chmod a+rwt "$dir" 2> /dev/null
 	cd "$dir" || return 1
 	if yesno $wipe_tmp; then
@@ -88,7 +89,7 @@ start()
 		fi
 	done
 
-	if dir_writeable /var/run; then
+	if dir_writable /var/run; then
 		ebegin "Creating user login records"
 		local xtra=
 		[ "$RC_UNAME" = NetBSD ] && xtra=x
@@ -130,7 +131,7 @@ start()
 		cleanup_tmp_dir "$tmp"
 	done
 
-	if dir_writeable /tmp; then
+	if dir_writable /tmp; then
 		# Make sure our X11 stuff have the correct permissions
 		# Omit the chown as bootmisc is run before network is up
 		# and users may be using lame LDAP auth #139411
@@ -142,11 +143,13 @@ start()
 		fi
 	fi
 
-	if $logw || dir_writeable /var/log; then
-		# Create an 'after-boot' dmesg log
-		if [ "$RC_SYS" != VSERVER -a "$RC_SYS" != OPENVZ ]; then
-			dmesg > /var/log/dmesg
-			chmod 640 /var/log/dmesg
+	if yesno $log_dmesg; then
+		if $logw || dir_writable /var/log; then
+			# Create an 'after-boot' dmesg log
+			if [ "$RC_SYS" != VSERVER -a "$RC_SYS" != OPENVZ ]; then
+				dmesg > /var/log/dmesg
+				chmod 640 /var/log/dmesg
+			fi
 		fi
 	fi
 

init.d/consolefont.in

@@ -49,7 +49,7 @@ start()
 			retval=1
 			break
 		fi
-		x=$(($x + 1))
+		: $(( x += 1 ))
 	done
 	eend $retval
 

init.d/devdb.in

@@ -11,7 +11,7 @@ depend()
 
 start()
 {
-	ebegin "Bulding the dev database"
+	ebegin "Building the dev database"
 	if [ /var/run/dev.db -nt /dev ]; then
 		:
 	else

init.d/dumpon.in

@@ -19,7 +19,7 @@ start() {
 }
 
 stop() {
-	ebegin "Deactiving kernel core dump device"
+	ebegin "Deactivating kernel core dump device"
 	dumpon off
 	eend $?
 }

init.d/fsck.in

@@ -48,8 +48,13 @@ start()
 
 	if [ -n "$fsck_passno" ]; then
 		check_extra="[passno $fsck_passno] $check_extra"
+		if -n "$fsck_mnt" ]; then
+			eerror "Only 1 of fsck_passno and fsck_mnt must be set!"
+			return 1
+		fi
 	fi
 	ebegin "Checking local filesystems $check_extra"
+	# Append passno mounts
 	for p in $fsck_passno; do
 		local IFS="$_IFS"
 		case "$p" in
@@ -58,10 +63,16 @@ start()
 		set -- "$@" $(fstabinfo --passno "$p")
 		unset IFS
 	done
+	# Append custom mounts
+	for m in $fsck_mnt ; do
+		local IFS="$_IFS"
+		set -- "$@" "$m"
+		unset IFS
+	done
 
 	if [ "$RC_UNAME" = Linux ]; then
 		fsck_opts="$fsck_opts -C0 -T"
-		if [ -z "$fsck_passno" ]; then
+		if [ -z "$fsck_passno" -a -z "$fsck_mnt" ]; then
 			fsck_args=${fsck_args--A -p}
 			if echo 2>/dev/null >/.test.$$; then
 				rm -f /.test.$$
@@ -91,7 +102,7 @@ start()
 			_reboot
 		fi;;
 	8)	ewend 1 "Operational error"; return 0;;
-	12)	ewend 1 "fsck interupted";;
+	12)	ewend 1 "fsck interrupted";;
 	*)	eend 2 "Filesystems couldn't be fixed";;
 	esac
 	_abort || return 1

init.d/hwclock.in

@@ -85,7 +85,7 @@ start()
 
 	if [ -e /etc/adjtime ] && yesno $clock_adjfile; then
 		_hwclock --adjust $utc_cmd
-		retval=$(($retval + $?))
+		: $(( retval += $? ))
 	fi
 
 	# If setting UTC, don't bother to run hwclock when first booting
@@ -99,7 +99,7 @@ start()
 		else
 			_hwclock --systz $utc_cmd $clock_args
 		fi
-		retval=$(($retval + $?))
+		: $(( retval += $? ))
 	fi
 
 	eend $retval "Failed to set the system clock"

init.d/ipfw.in

@@ -59,7 +59,7 @@ start() {
 		return 1
 	fi
 
-	# Use a statefull firewall
+	# Use a stateful firewall
 	ipfw add check-state
 	ipfw add pass tcp from me to any established
 
@@ -123,7 +123,7 @@ start() {
 	ipfw add deny udp from any to any 520 in
 
 	# Noise from webbrowsing.
-	# The statefull filter is a bit agressive, and will cause some
+	# The stateful filter is a bit aggressive, and will cause some
 	# connection teardowns to be logged.
 	ipfw add deny tcp from any 80,443 to any 1024-65535 in
 

init.d/keymaps.in

@@ -47,7 +47,7 @@ start()
 	n=1
 	while [ $n -le $ttyn ]; do
 		kbd_mode $kmode -C $ttydev$n
-		n=$(($n + 1))
+		: $(( n += 1 ))
 	done
 	eend 0
 

init.d/localmount.in

@@ -16,7 +16,7 @@ start()
 {
 	# Mount local filesystems in /etc/fstab.
 	local types="noproc" x= no_netdev=
-	for x in $net_fs_list; do
+	for x in $net_fs_list $extra_net_fs_list; do
 		types="${types},${x}"
 	done
 
@@ -34,19 +34,17 @@ start()
 stop()
 {
 	# We never unmount / or /dev or $RC_SVCDIR
-	local x= no_umounts_r="/|/dev|/dev/.*|${RC_SVCDIR}"
-	no_umounts_r="${no_umounts_r}|/bin|/sbin|/lib|/libexec"
+
+	# Bug 381783
+	local rc_svcdir=$(echo $RC_SVCDIR | sed 's:/lib\(32\|64\)\?/:/lib(32|64)?/:g')
+
+	local x= no_umounts_r="/|/dev|/dev/.*|${rc_svcdir}"
+	no_umounts_r="${no_umounts_r}|/bin|/sbin|/lib(32|64)?|/libexec"
 	# RC_NO_UMOUNTS is an env var that can be set by plugins
-	local OIFS=$IFS SIFS=${IFS-y}
-	IFS=$IFS:
+	local 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/.*"
@@ -70,12 +68,12 @@ stop()
 	einfo "Unmounting filesystems"
 	eindent
 	local fs=
-	for x in $net_fs_list; do
+	for x in $net_fs_list $extra_net_fs_list; do
 		fs="$fs${fs:+|}$x"
 	done
 	[ -n "$fs" ] && fs="^($fs)$"
 	do_unmount umount --skip-point-regex "$no_umounts_r" \
-		${fs:+--skip-fstype-regex} $fs --nonetdev
+		"${fs:+--skip-fstype-regex}" $fs --nonetdev
 	eoutdent
 
 	return 0

init.d/migrate-run.in

@@ -0,0 +1,28 @@
+#!@PREFIX@/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Released under the 2-clause BSD license.
+
+description="Migrate /var/run and /var/lock to /run"
+
+depend()
+{
+	before *
+	after localmount
+}
+
+start()
+{
+	return 0
+}
+
+stop()
+{
+	if [ -d /run -a ! -L /var/lock -a ! -L /var/run ]; then
+		ebegin "Migrating /var/lock and /var/run to /run"
+		rm -rf /var/lock /var/run
+		ln -s /var/lock /run/lock
+		ln -s /var/run /run
+		eend 0
+	fi
+	return 0
+}

init.d/mixer.in

@@ -21,7 +21,7 @@ restore()
 			mixer -f "$mixer" \
 			$(cat "/var/db/${mixer#/dev/}-state") >/dev/null
 			veend $?
-			: $((retval += $?))
+			: $(( retval += $? ))
 		fi
 	done
 }
@@ -40,7 +40,7 @@ stop()
 		vebegin "$mixer"
 		mixer -f "$mixer" -s >/var/db/"${mixer#/dev/}"-state
 		veend $?
-		: $((retval += $?))
+		: $(( retval += $? ))
 	done
 	eoutdent
 	eend $retval

init.d/modules.in

@@ -16,18 +16,21 @@ start()
 	# support compiled in ...
 	[ ! -f /proc/modules ] && return 0
 
-	local KV=$(uname -r)
-	local KV_MAJOR=${KV%%.*}
-	local x=${KV#*.}
-	local KV_MINOR=${x%%.*}
-	x=${KV#*.*.}
-	local KV_MICRO=${x%%-*}
+	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 list= x= xx= y= args= mpargs= cnt=0 a=
-	for x in "$KV" \
-		$KV_MAJOR.$KV_MINOR.$KV_MICRO \
-		$KV_MAJOR.$KV_MINOR \
-	; do
+	for x in $kv_variant_list ; do
 		eval list=\$modules_$(shell_var "$x")
 		[ -n "$list" ] && break
 	done
@@ -45,10 +48,7 @@ start()
 		fi
 		aa=$(shell_var "$a")
 		xx=$(shell_var "$x")
-		for y in "$KV" \
-			$KV_MAJOR.$KV_MINOR.$KV_MICRO \
-			$KV_MAJOR.$KV_MINOR \
-		; do
+		for y in $kv_variant_list ; do
 			eval args=\$module_${aa}_args_$(shell_var "$y")
 			[ -n "${args}" ] && break
 			eval args=\$module_${xx}_args_$(shell_var "$y")
@@ -57,7 +57,7 @@ start()
 		[ -z "$args" ] && eval args=\$module_${aa}_args
 		[ -z "$args" ] && eval args=\$module_${xx}_args
 		eval modprobe -q "$mpargs" "$x" "$args"
-		eend $? "Failed to load $x" && cnt=$(($cnt + 1))
+		eend $? "Failed to load $x" && : $(( cnt += 1 ))
 	done
 	einfo "Autoloaded $cnt module(s)"
 }

init.d/mount-ro.in

@@ -19,28 +19,26 @@ start()
 	# We need the do_unmount function
 	. "$RC_LIBEXECDIR"/sh/rc-mount.sh
 	eindent
-	local m="/dev|/dev/.*|/proc|/proc.*|/sys|/sys/.*|${RC_SVCDIR}" x= fs=
-	m="$m|/bin|/sbin|/lib|/libexec"
+
+	# Bug 381783
+	local rc_svcdir=$(echo $RC_SVCDIR | sed 's:/lib\(32\|64\)\?/:/lib(32|64)?/:g')
+
+	local m="/dev|/dev/.*|/proc|/proc.*|/sys|/sys/.*|${rc_svcdir}" x= fs=
+	m="$m|/bin|/sbin|/lib(32|64)?|/libexec"
 	# RC_NO_UMOUNTS is an env var that can be set by plugins
-	local OIFS=$IFS SIFS=${IFS-y} IFS=$IFS
-	IFS=$IFS:
+	local 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; do
+	for x in $net_fs_list $extra_net_fs_list; do
 		fs="$fs${fs:+|}$x"
 	done
 	[ -n "$fs" ] && fs="^($fs)$"
 	do_unmount "umount -r" \
 		--skip-point-regex "$m" \
-		${fs:+--skip-fstype-regex} $fs --nonetdev
+		"${fs:+--skip-fstype-regex}" $fs --nonetdev
 	eoutdent
 	eend $?
 }

init.d/moused.in

@@ -54,7 +54,7 @@ start()
 		local ttyv=
 		for ttyv in /dev/ttyv*; do
 			vidcontrol < "$ttyv" -m on
-			: $((retval+= $?))
+			: $(( retval += $? ))
 		done
 	fi
 

init.d/mtab.in

@@ -12,9 +12,9 @@ depend()
 
 start()
 {
-	# /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)"
+	if [ -L /etc/mtab ]
+	then
+		einfo "Skipping mtab update (mtab is a symbolic link)"
 		return 0
 	fi
 

init.d/net.lo.in

@@ -42,12 +42,25 @@ depend()
 }
 
 # Support bash arrays - sigh
+_array_helper()
+{
+	local _a=
+
+	eval _a=\$$1
+	_a=$(echo "${_a}" | sed -e 's:^[[:space:]]*::' -e 's:[[:space:]]*$::' -e '/^$/d' -e 's:[[:space:]]\{1,\}: :g')
+
+	[ -n "${_a}" ] && printf "%s\n" "${_a}"
+}
+
 _get_array()
 {
 	local _a=
 	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}"
@@ -57,10 +70,7 @@ _get_array()
 		esac
 	fi
 
-	eval _a=\$$1
-	printf "%s" "${_a}"
-	printf "\n"
-	[ -n "${_a}" ]
+	_array_helper $1
 }
 
 # Flatten bash arrays to simple strings
@@ -69,6 +79,9 @@ _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")"
@@ -78,10 +91,7 @@ _flatten_array()
 		esac
 	fi
 
-	eval _a=\$$1
-	printf "%s" "${_a}"
-	printf "\n"
-	[ -n "${_a}" ]
+	_array_helper $1
 }
 
 _wait_for_carrier()
@@ -105,7 +115,7 @@ _wait_for_carrier()
 			eend 0
 			return 0
 		fi
-		timeout=$((${timeout} - 1))
+		: $(( timeout -= 1 ))
 		[ "${efunc}" = "einfon" ] && printf "."
 	done
 
@@ -134,9 +144,9 @@ _netmask2cidr()
 	local i= len=
 	local IFS=.
 	for i in $1; do
-		while [ ${i} != "0" ]; do
-			len=$((${len} + ${i} % 2))
-			i=$((${i} >> 1))
+		while [ i -ne 0 ]; do
+			: $(( len += i % 2 ))
+			: $(( i >>= 1 ))
 		done
 	done
 
@@ -267,7 +277,7 @@ _gen_module_list()
 		echo "module_${i}_program_start='${PROGRAM_START}'" >> "${MODULESLIST}"
 		echo "module_${i}_program_stop='${PROGRAM_STOP}'" >> "${MODULESLIST}"
 		echo "module_${i}_provide='${PROVIDE}'" >> "${MODULESLIST}"
-		i=$((${i} + 1))
+		: $(( i += 1 ))
 	done
 	echo "module_${i}=" >> "${MODULESLIST}"
 	)
@@ -294,7 +304,7 @@ _load_modules()
 
 	local i=-1 x= mod= f= provides=
 	while true; do
-		i=$((${i} + 1))
+		: $(( i += 1 ))
 		eval mod=\$module_${i}
 		[ -z "${mod}" ] && break
 		[ -e "${MODULESDIR}/${mod}.sh" ] || continue
@@ -428,7 +438,7 @@ _load_config()
 	# so modules can influence it
 	for cmd; do
 		eval config_${config_index}="'${cmd}'"
-		config_index=$((${config_index} + 1))
+		: $(( config_index += 1 ))
 	done
 	# Terminate the list
 	eval config_${config_index}=
@@ -436,7 +446,7 @@ _load_config()
 	config_index=0
 	for cmd in ${fallback}; do
 		eval fallback_${config_index}="'${cmd}'"
-		config_index=$((${config_index} + 1))
+		: $(( config_index += 1 ))
 	done
 	# Terminate the list
 	eval fallback_${config_index}=
@@ -531,7 +541,7 @@ start()
 	if [ -n "${our_metric}" ]; then
 		metric=${our_metric}
 	elif [ "${IFACE}" != "lo" -a "${IFACE}" != "lo0" ]; then
-		metric=$((${metric} + $(_ifindex)))
+		: $(( metric += $(_ifindex) ))
 	fi
 
 	while true; do
@@ -539,7 +549,9 @@ start()
 		[ -z "${config}" ] && break
 
 		set -- ${config}
-		ebegin "$1"
+		if [ "$1" != "null" -a "$1" != "noop" ]; then
+			ebegin "$1"
+		fi
 		eindent
 		case "$1" in
 			noop)
@@ -569,11 +581,11 @@ start()
 				eindent
 				eval config_${config_index}=\$config
 				unset fallback_${config_index}
-				config_index=$((${config_index} - 1))
+				: $(( config_index -= 1 ))
 			fi
 		fi
 		eoutdent
-		config_index=$((${config_index} + 1))
+		: $(( config_index += 1 ))
 	done
 
 	if ! ${oneworked}; then

init.d/netmount.in

@@ -44,7 +44,7 @@ start()
 	[ -x @SYSCONFDIR@/init.d/rpcbind ] && pmap="rpcbind"
 
 	local x= fs= rc=
-	for x in $net_fs_list; do
+	for x in $net_fs_list $extra_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; do
+	for x in $net_fs_list $extra_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; do
+	for x in $net_fs_list $extra_net_fs_list; do
 		fs="$fs${fs:+|}$x"
 	done
 	[ -n "$fs" ] && fs="^($fs)$"

init.d/network.in

@@ -219,6 +219,12 @@ start()
 		eend $?
 	fi
 
+	ewarn
+	ewarn "The $RC_SVCNAME script is deprecated and will be"
+	ewarn "removed in the future."
+	ewarn "Please use the net.* scripts to manage your network interfaces."
+	ewarn
+
 	einfo "Starting network"
 	routeflush
 	if [ "$RC_UNAME" = "Linux" ]; then
@@ -281,7 +287,7 @@ start()
 		tentative || break
 		[ $r = 5 ] && vebegin "Waiting for tentative addresses"
 		sleep 1
-		r=$(($r - 1))
+		: $(( r -= 1 ))
 	done
 	if [ $r != 5 ]; then
 		[ $r != 0 ]

init.d/numlock.in

@@ -21,7 +21,7 @@ _setleds()
 
 	while [ $i -le $ttyn ]; do
 		setleds -D "$1"num < $dev$i || retval=1
-		i=$(($i + 1))
+		: $(( i += 1 ))
 	done
 
 	return $retval

init.d/procfs.in

@@ -37,24 +37,24 @@ start()
 		fi
 	fi
 
-	# Setup Kernel Support for the NFS daemon status
-	if [ -d /proc/fs/nfsd ] && ! mountinfo -q /proc/fs/nfsd; then
-		if grep -qs nfsd /proc/filesystems; then
-			ebegin "Mounting NFS filesystem"
-			mount -t nfsd -o nodev,noexec,nosuid \
-				nfsd /proc/fs/nfsd
-			eend $?
-		fi
-	fi
-
 	# Setup Kernel Support for miscellaneous Binary Formats
-	if [ -d /proc/sys/fs/binfmt_misc ] \
-		&& ! mountinfo -q /proc/sys/fs/binfmt_misc; then
+	if [ -d /proc/sys/fs/binfmt_misc -a ! -e /proc/sys/fs/binfmt_misc/register ]; then
 		if grep -qs binfmt_misc /proc/filesystems; then
 			ebegin "Mounting misc binary format filesystem"
 			mount -t binfmt_misc -o nodev,noexec,nosuid \
 				binfmt_misc /proc/sys/fs/binfmt_misc
-			eend $?
+			if eend $? ; then
+				local fmts
+				ebegin "Loading custom binary format handlers"
+				fmts=$(grep -hsv -e '^[#;]' -e '^[[:space:]]*$' \
+					/run/binfmt.d/*.conf \
+					"/etc"/binfmt.d/*.conf \
+					""/usr/lib/binfmt.d/*.conf)
+				if [ -n "${fmts}" ]; then
+					echo "${fmts}" > /proc/sys/fs/binfmt_misc/register
+				fi
+				eend $?
+			fi
 		fi
 	fi
 

init.d/rc-enabled.in

@@ -33,7 +33,7 @@ start()
 
 		# Good to go!
 		"$svc" start && started="$started $svc"
-		: $((retval += $?))
+		: $(( retval += $? ))
 	done
 	service_set_value started "$started"
 	eend $retval "Some local rc services failed to start"
@@ -46,7 +46,7 @@ stop()
 	local svc= retval=0
 	for svc in $(rcorder $(service_get_value started) 2>/dev/null | sort -r); do
 		"$svc" stop
-		: $((retval += $?))
+		: $(( retval += $? ))
 	done
 	eend $retval "Some local rc services failed to stop"
 	return 0

init.d/staticroute.in

@@ -93,6 +93,11 @@ do_routes()
 
 start()
 {
+	ewarn
+	ewarn "The $RC_SVCNAME script is deprecated and will be"
+	ewarn "removed in the future."
+	ewarn "Please use the net.* scripts to manage your network interfaces."
+	ewarn
 	do_routes "Adding" "add"
 }
 

init.d/swclock.in

@@ -16,7 +16,9 @@ depend()
 start()
 {
 	ebegin "Setting the local clock based on last shutdown time"
-	swclock --warn
+	if ! swclock 2> /dev/null; then
+	swclock --warn @PREFIX@/sbin/runscript
+	fi
 	eend $?
 }
 

init.d/sysfs.in

@@ -50,6 +50,37 @@ mount_misc()
 			eend $?
 		fi
 	fi
+
+	# Setup Kernel Support for configfs
+	if [ -d /sys/kernel/config ] && ! mountinfo -q /sys/kernel/config; then
+		if grep -qs configfs /proc/filesystems; then
+			ebegin "Mounting config filesystem"
+			mount -n -t configfs -o  nodev,noexec,nosuid \
+				configfs /sys/kernel/config
+			eend $?
+		fi
+	fi
+
+	# Setup Kernel Support for cgroup
+	if [ -d /sys/fs/cgroup ]; then
+		if grep -qs cgroup /proc/filesystems && \
+			! mountinfo -q /sys/fs/cgroup; then
+			ebegin "Mounting cgroup filesystem"
+			mount -n -t tmpfs -o  nodev,noexec,nosuid \
+				cgroup /sys/fs/cgroup
+			eend $?
+		fi
+		if ! mountinfo -q /sys/fs/cgroup/openrc; then
+			ebegin "creating openrc control group"
+			mkdir /sys/fs/cgroup/openrc
+			mount -n -t cgroup -o  nodev,noexec,nosuid \
+				openrc /sys/fs/cgroup/openrc
+			echo 1 > /sys/fs/cgroup/openrc/notify_on_release
+			echo @LIBEXECDIR@/sh/cgroup-release-agent.sh \
+				> /sys/fs/cgroup/openrc/release_agent
+			eend
+		fi
+	fi
 }
 
 start()

init.d/termencoding.in

@@ -31,7 +31,7 @@ start()
 	n=1
 	while [ ${n} -le "$ttyn" ]; do
 		printf "\033%s" "$termencoding" >$ttydev$n
-		n=$(($n + 1))
+		: $(( n += 1 ))
 	done
 
 	# Save the encoding for use immediately at boot

init.d/urandom.in

@@ -16,7 +16,7 @@ save_seed()
 	local psz=1
 
 	if [ -e /proc/sys/kernel/random/poolsize ]; then
-		psz=$(($(cat /proc/sys/kernel/random/poolsize) / 4096))
+		: $(( psz = $(cat /proc/sys/kernel/random/poolsize) / 4096 ))
 	fi
 
 	(	# sub shell to prevent umask pollution

man/einfo.3

@@ -105,8 +105,7 @@ and
 respectively, but only work when
 .Va EINFO_VERBOSE
 is true. You can also make the
-.Fn einfo ,
-.Fn ewarn ,
+.Fn einfo
 and
 .Fn ebegin
 functions silent by setting

man/runscript.8

@@ -93,6 +93,9 @@ Space separated list of extra commands the service defines.
 .It Ar extra_started_commands
 Space separated list of extra commands the service defines. These only work if
 the service has already been started.
+.It Ar extra_stopped_commands
+Space separated list of extra commands the service defines. These only work if
+the service has already been stopped.
 .It Ar description
 String describing the service.
 .It Ar description_$command
@@ -446,7 +449,7 @@ eat()
 	veinfo "Eating `basename ${food}`"
 	${command} --eat ${food}
 	retval=$?
-	: $((${result} += ${retval}))
+	: $(( result += retval ))
 	[ ${retval} = 0 ] && ate="${ate} `basename ${food}`"
     done
 
@@ -462,12 +465,6 @@ 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.

mk/lib.mk

@@ -8,18 +8,22 @@ SHLIB_NAME=		lib${LIB}.so.${SHLIB_MAJOR}
 SHLIB_LINK=		lib${LIB}.so
 SONAME?=		${SHLIB_NAME}
 
+SOBJS+=			${SRCS:.c=.So}
+
+MKSTATICLIBS?=  yes
+ifeq (${MKSTATICLIBS},yes)
 OBJS+=			${SRCS:.c=.o}
-SOBJS+=			${OBJS:.o=.So}
-_LIBS=			lib${LIB}.a ${SHLIB_NAME}
+_LIBS+=			lib${LIB}.a
+endif
+
+_LIBS+=			${SHLIB_NAME}
 
 CLEANFILES+=		${OBJS} ${SOBJS} ${_LIBS} ${SHLIB_LINK}
 
-.SUFFIXES:		.So
-
-.c.o:
+%.o: %.c
 	${CC} ${CFLAGS} ${CPPFLAGS} -c $< -o $@
 
-.c.So:
+%.So: %.c
 	${CC} ${PICFLAG} -DPIC ${CPPFLAGS} ${CFLAGS} -c $< -o $@
 
 all: depend ${_LIBS}
@@ -41,8 +45,10 @@ ${SHLIB_NAME}:	${SOBJS}
 	${SOBJS} ${LDADD}
 
 install: all
+ifeq (${MKSTATICLIBS},yes)
 	${INSTALL} -d ${DESTDIR}${LIBDIR}
 	${INSTALL} -m ${LIBMODE} lib${LIB}.a ${DESTDIR}${LIBDIR}
+endif
 	${INSTALL} -d ${DESTDIR}${SHLIBDIR}
 	${INSTALL} -m ${LIBMODE} ${SHLIB_NAME} ${DESTDIR}${SHLIBDIR}
 	ln -fs ${SHLIB_NAME} ${DESTDIR}${SHLIBDIR}/${SHLIB_LINK}

mk/os-BSD.mk

@@ -3,4 +3,7 @@
 
 # Generic definitions
 
+PKG_PREFIX?=	/usr/local
+SFX=		.BSD.in
+
 LIBKVM?=	-lkvm

mk/os-Linux.mk

@@ -1,5 +1,8 @@
 # Copyright (c) 2008 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
+SFX=		.Linux.in
+PKG_PREFIX?=	/usr
+
 CPPFLAGS+=	-D_BSD_SOURCE -D_XOPEN_SOURCE=600
 LIBDL=		-Wl,-Bdynamic -ldl

mk/os.mk

@@ -9,4 +9,3 @@ OS?= 		${_OS}
 include ${MK}/os-${OS}.mk
 
 RC_LIB=		/$(LIBNAME)/rc
-

mk/prog.mk

@@ -24,7 +24,7 @@ CLEANFILES+=		${OBJS} ${PROG}
 
 all: depend ${PROG}
 
-.c.o:
+%.o: %.c
 	${CC} ${CFLAGS} ${CPPFLAGS} -c $< -o $@
 
 ${PROG}: ${SCRIPTS} ${OBJS}

mk/scripts.mk

@@ -15,11 +15,10 @@ _LCL_SED:=		$(shell ${_LCL_SED_SH})
 SED_REPLACE=		-e 's:@SHELL@:${SH}:g' -e 's:@LIB@:${LIBNAME}:g' -e 's:@SYSCONFDIR@:${SYSCONFDIR}:g' -e 's:@LIBEXECDIR@:${LIBEXECDIR}:g' -e 's:@PREFIX@:${PREFIX}:g' -e 's:@RC_SYS_DEFAULT@:${MKRCSYS}:g' ${_PKG_SED} ${_LCL_SED}
 
 # Tweak our shell scripts
-.SUFFIXES:	.sh.in .in
-.sh.in.sh:
+%.sh: %.sh.in
 	${SED} ${SED_REPLACE} ${SED_EXTRA} $< > $@
 
-.in:
+%: %.in
 	${SED} ${SED_REPLACE} ${SED_EXTRA} $< > $@
 
 all: ${OBJS} ${TARGETS}

net/Makefile

@@ -1,9 +1,24 @@
 DIR=	${LIBEXECDIR}/net
-SRCS=	ifconfig.sh.in
+SRCS=	ifconfig.sh.in ${SRCS-${OS}}
 INC=	dhclient.sh dhcpcd.sh ifconfig.sh macchanger.sh macnet.sh \
-	ssidnet.sh system.sh wpa_supplicant.sh
+	ssidnet.sh system.sh wpa_supplicant.sh ${INC-${OS}}
 
 MK=	../mk
 include ${MK}/os.mk
-include Makefile.${OS}
+
+SRCS-FreeBSD=	iwconfig.sh.in
+INC-FreeBSD=	iwconfig.sh
+
+SRCS-Linux=	iwconfig.sh.in
+INC-Linux=	adsl.sh apipa.sh arping.sh bonding.sh br2684ctl.sh bridge.sh \
+		ccwgroup.sh clip.sh ethtool.sh iproute2.sh ifplugd.sh ip6to4.sh \
+		ipppd.sh iwconfig.sh netplugd.sh pppd.sh pump.sh tuntap.sh udhcpc.sh \
+		vlan.sh macvlan.sh
+
+SRCS-NetBSD=
+INC-NetBSD=	ifwatchd.sh
+
+%.sh: %.sh${SFX}
+	${CP} $< $@
+
 include ${MK}/scripts.mk

net/Makefile.FreeBSD

@@ -1,6 +0,0 @@
-SRCS+=		iwconfig.sh.in
-INC+=		iwconfig.sh
-
-.SUFFIXES:	.sh.BSD.in
-.sh.BSD.in.sh:
-	${CP} $< $@

net/Makefile.Linux

@@ -1,9 +0,0 @@
-SRCS+=		iwconfig.sh.in
-INC+=		adsl.sh apipa.sh arping.sh bonding.sh br2684ctl.sh bridge.sh \
-		ccwgroup.sh clip.sh ethtool.sh iproute2.sh ifplugd.sh ip6to4.sh \
-		ipppd.sh iwconfig.sh netplugd.sh pppd.sh pump.sh tuntap.sh udhcpc.sh \
-		vlan.sh
-
-.SUFFIXES:	.sh.Linux.in
-.sh.Linux.in.sh:
-	${CP} $< $@

net/Makefile.NetBSD

@@ -1,5 +0,0 @@
-INC+=		ifwatchd.sh
-
-.SUFFIXES:	.sh.BSD.in
-.sh.BSD.in.sh:
-	${CP} $< $@

net/apipa.sh

@@ -26,20 +26,20 @@ apipa_start()
 	eindent
 
 	while [ ${i} -lt 64516 ]; do
-		i1=$((($(_random) % 255) + 1))
-		i2=$((($(_random) % 255) + 1))
+		: $(( i1 = (_random % 255) + 1 ))
+		: $(( i2 = (_random % 255) + 1 ))
 
 		addr="169.254.${i1}.${i2}"
 		vebegin "${addr}/16"
 		if ! arping_address "${addr}"; then
 			eval config_${config_index}="\"${addr}/16 broadcast 169.254.255.255\""
-			config_index=$((${config_index} - 1))
+			: $(( config_index -= 1 ))
 			veend 0
 			eoutdent
 			return 0
 		fi
 
-		i=$((${i} + 1))
+		: $(( i += 1 ))
 	done
 
 	eerror "No free address found!"

net/arping.sh

@@ -34,13 +34,13 @@ arping_address()
 		while [ ${w} -gt 0 -a -z "${foundmac}" ]; do
 			foundmac="$(arping2 ${opts} -r -c 1 -i "${IFACE}" "${ip}" 2>/dev/null | \
 			sed -e 'y/abcdef/ABCDEF/')"
-			w=$((${w} - 1))
+			: $(( w -= 1 ))
 		done
 	else
 		[ -z "$(_get_inet_address)" ] && opts="${opts} -D"
 
 		foundmac="$(arping -w "${w}" ${opts} -f -I "${IFACE}" "${ip}" 2>/dev/null | \
-		sed -n -e 'y/abcdef/ABCDEF/' -e 's/.*\[\([^]]*\)\].*/\1/p')"
+			sed -n -e 'y/abcdef/ABCDEF/' -e 's/[^[]*\[\([^]]*\)\].*/\1/p')"
 	fi
 	[ -z "${foundmac}" ] && return 1
 

net/clip.sh

@@ -148,7 +148,7 @@ clip_post_start()
 
 		local nleftretries=10 emsg= ecode=
 		while [ ${nleftretries} -gt 0 ]; do
-			nleftretries=$((${nleftretries} - 1))
+			: $(( nleftretries -= 1 ))
 	    	emsg="$(atmarp -s "${peerip}" "${ifvpivci}" "$@" 2>&1)"
 	    	ecode=$? && break
 	    	sleep 2

net/ethtool.sh

@@ -29,8 +29,9 @@ ethtool_pre_start() {
 
 		# Skip everything if no arguments
 		[ -z "${args}" ] && continue
-		
+
 		# Split on \n
+		OIFS="${IFS}"
 		local IFS="$__IFS"
 
 		for p in ${args} ; do
@@ -38,6 +39,7 @@ ethtool_pre_start() {
 			local args_pretty="$(_trim "${p}")"
 			# Do nothing if empty
 			[ -z "${args_pretty}" ] && continue
+			[ "${opt}" = "ring" ] && opt="set-ring"
 			args_pretty="--${opt} $IFACE ${args_pretty}"
 			args="--${opt} $IFACE ${args}"
 			ebegin "ethtool ${args_pretty}"

net/ifconfig.sh.BSD.in

@@ -38,7 +38,7 @@ _ifindex()
 					echo "${x#/dev/net}"
 					return 0
 				fi
-				i=$((${i} + 1))
+				: $(( i += 1 ))
 			done
 			;;
 		default)
@@ -47,7 +47,7 @@ _ifindex()
 					echo "${i}"
 					return 0
 				fi
-				i=$((${i} + 1))
+				: $(( i += 1 ))
 			done
 			;;
 	esac

net/ifconfig.sh.Linux.in

@@ -26,7 +26,7 @@ _ifindex()
 {
 	local line= i=-2
 	while read line; do
-		i=$((${i} + 1))
+		: $(( i += 1 ))
 		[ ${i} -lt 1 ] && continue
 		case "${line}" in
 			"${IFACE}:"*) echo "${i}"; return 0;;
@@ -34,7 +34,7 @@ _ifindex()
 	done < /proc/net/dev
 
 	# Return the next available index
-	i=$((${i} + 1))
+	: $(( i += 1 ))
 	echo "${i}"
 	return 1
 }
@@ -96,7 +96,7 @@ _get_inet_addresses()
 		_exists || break
 		local addr="$(_get_inet_address)"
 		[ -n "${addr}" ] && addrs="${addrs}${addrs:+ }${addr}"
-		i=$((${i} + 1))
+		: $(( i += 1 ))
 	done
 	echo "${addrs}"
 }
@@ -106,26 +106,26 @@ _cidr2netmask()
 	local cidr="$1" netmask="" done=0 i=0 sum=0 cur=128
 	local octets= frac=
 
-	local octets=$((${cidr} / 8))
-	local frac=$((${cidr} % 8))
+	local octets=$(( cidr / 8 ))
+	local frac=$(( cidr % 8 ))
 	while [ ${octets} -gt 0 ]; do
 		netmask="${netmask}.255"
-		octets=$((${octets} - 1))
-		done=$((${done} + 1))
+		: $(( octets -= 1 ))
+		: $(( done += 1 ))
 	done
 
 	if [ ${done} -lt 4 ]; then
 		while [ ${i} -lt ${frac} ]; do
-			sum=$((${sum} + ${cur}))
-			cur=$((${cur} / 2))
-			i=$((${i} + 1))
+			: $(( sum += cur ))
+			: $(( cur /= 2 ))
+			: $(( i += 1 ))
 		done
 		netmask="${netmask}.${sum}"
-		done=$((${done} + 1))
+		: $(( done += 1 ))
 
 		while [ ${done} -lt 4 ]; do
 			netmask="${netmask}.0"
-			done=$((${done} + 1))
+			: $(( done += 1 ))
 		done
 	fi
 
@@ -150,7 +150,7 @@ _add_address()
 		# Get the last alias made for the interface and add 1 to it
 		i=$(ifconfig | sed '1!G;h;$!d' | grep -m 1 -o "^${iface}:[0-9]*" \
 			| sed -n -e 's/'"${iface}"'://p')
-		i=$((${i:-0} + 1))
+		: $(( i = ${i:-0} + 1 ))
 		iface="${iface}:${i}"
 	fi
 

net/ifplugd.sh

@@ -72,7 +72,7 @@ ifplugd_pre_start()
 		fi
 		sleep 1
 		[ ${timeout} -eq 0 ] && continue
-		i=$((${i} + 1))
+		: $(( i += 1 ))
 		[ ${i} -ge ${timeout} ] && break
 	done
 

net/ip6to4.sh

@@ -51,7 +51,7 @@ ip6to4_start()
 					case "${ip}" in
 						172.${i}.*) break;;
 					esac
-					i=$((${i} + 1))
+					: $(( i += 1 ))
 				done
 				[ ${i} -lt 32 ] && continue
 				;;
@@ -90,7 +90,7 @@ ip6to4_start()
 
 	# Now apply our config
 	eval config_${config_index}=\'"${new}"\'
-	config_index=$((${config_index} - 1))
+	: $(( config_index -= 1 ))
 
 	# Add a route for us, ensuring we don't delete anything else
 	local routes="$(_get_array "routes_${IFVAR}")

net/iproute2.sh

@@ -36,7 +36,7 @@ _ifindex()
 {
 	local line= i=-2
 	while read line; do
-		i=$((${i} + 1))
+		: $(( i += 1 ))
 		[ ${i} -lt 1 ] && continue
 		case "${line}" in
 			"${IFACE}:"*) echo "${i}"; return 0;;
@@ -44,7 +44,7 @@ _ifindex()
 	done < /proc/net/dev
 
 	# Return the next available index
-	i=$((${i} + 1))
+	: $(( i += 1 ))
 	echo "${i}"
 	return 1
 }
@@ -111,38 +111,32 @@ _add_address()
 		return 0
 	fi
 
-	# Convert an ifconfig line to iproute2
-	if [ "$2" = "netmask" ]; then
-		local one="$1" three="$3"
-		shift; shift; shift
-		set -- "${one}/$(_netmask2cidr "${three}")" "$@"
-	fi
-
-	# tunnel keyword is 'peer' in iproute2, but 'pointopoint' in ifconfig.
-	if [ "$2" = "pointopoint" ]; then
-		local one="$1"
-		shift; shift
-		set -- "${one}" "peer" "$@"
-	fi
+	local address netmask broadcast peer anycast label scope
+	local valid_lft preferred_lft home nodad
+	address="$1" ; shift
+	while [ -n "$*" ]; do
+		case "$1" in
+			netmask)
+				netmask="/$(_netmask2cidr "$2")" ; shift ; shift ;;
+			broadcast|brd)
+				broadcast="broadcast $2" ; shift ; shift ;;
+			pointopoint|pointtopoint|peer)
+				peer="peer $2" ; shift ; shift ;;
+			anycast|label|scope|valid_lft|preferred_lft)
+				eval "$1=$2" ; shift ; shift ;;
+			home|nodad)
+				eval "$1=$1" ; shift ;;
+		esac
+	done
 
 	# Always scope lo addresses as host unless specified otherwise
 	if [ "${IFACE}" = "lo" ]; then
-		set -- "$@" "scope" "host"
+		[ -z "$scope" ] && scope="scope host"
 	fi
 
-	# IPv4 specifics
-	case "$1" in
-		*.*.*.*)
-			case "$@" in
-				*" brd "*);;
-				*" broadcast "*);;
-				*) set -- "$@" brd +;;
-			esac
-			;;
-	esac
-
-	veinfo ip addr add "$@" dev "${IFACE}"
-	ip addr add "$@" dev "${IFACE}"
+	set -- "${address}${netmask}" $peer $broadcast $anycast $label $scope dev "${IFACE}" $valid_lft $preferred_lft $home $nodad
+	veinfo ip addr add "$@"
+	ip addr add "$@"
 }
 
 _add_route()
@@ -296,7 +290,7 @@ iproute2_post_start()
 		while [ $n -ge 0 ]; do
 			_iproute2_ipv6_tentative || break
 			sleep 1
-			n=$(($n - 1))
+			: $(( n -= 1 ))
 		done
 		[ $n -ge 0 ]
 		eend $?
@@ -314,7 +308,11 @@ iproute2_post_stop()
 			einfo "Removing RPDB rules"
 			_ip_rule_runner del "${rules}"
 		fi
-		ip route flush table cache dev "${IFACE}"
+
+		# Only do something if the interface actually exist
+		if _exists; then
+			ip route flush table cache dev "${IFACE}"
+		fi
 	fi
 
 	# Don't delete sit0 as it's a special tunnel

net/iwconfig.sh.BSD.in

@@ -218,7 +218,7 @@ iwconfig_associate()
 		sleep 1
 
 		[ ${timeout} -eq 0 ] && continue
-		i=$((${i} +  1))
+		: $(( i +=  1 ))
 		[ ${i} -ge ${timeout} ] && { eend 1; return 1; }
 	done
 
@@ -252,13 +252,13 @@ iwconfig_scan()
 	scan="$(LC_ALL=C ifconfig -v "${IFACE}" list scan 2>/dev/null | sed -e "1 d" -e "s/$/'/g" -e "s/^/'/g")"
 	while [ ${i} -lt 3 -a -z "${scan}" ] ; do
 		scan="${scan}${scan:+ }$(LC_ALL=C ifconfig -v "${IFACE}" scan 2>/dev/null | sed -e "1 d" -e "s/$/'/g" -e "s/^/'/g")"
-		i=$((${i} + 1))
+		: $(( i += 1 ))
 	done
 
 	APS=-1
 	eval set -- ${scan}
 	for line in "$@" ; do
-		APS=$((${APS} + 1))
+		: $(( APS += 1 ))
 		set -- ${line}
 		while true ; do
 			case "$1" in
@@ -276,7 +276,7 @@ iwconfig_scan()
 		# Add 1000 for managed nodes as we prefer them to adhoc
 		set -- $*
 		case "$1" in
-			*E*) eval QUAL_${APS}=$((${quality} + 1000)) ;;
+			*E*) eval QUAL_${APS}=$(( quality + 1000 )) ;;
 			*)   eval QUAL_${APS}=\$quality ;;
 		esac
 	done
@@ -290,7 +290,7 @@ iwconfig_scan()
 	# Sort based on quality
 	local i=0 k=1 a= b= x= t=
 	while [ ${i} -lt ${APS} ] ; do
-		k=$((${i} + 1))
+		: $(( k = i + 1 ))
 		while [ ${k} -le ${APS} ] ; do
 			eval a=\$QUALITY_${i}
 			[ -z "${a}" ] && break
@@ -302,15 +302,15 @@ iwconfig_scan()
 					eval ${x}_${k}=\$t
 				done
 			fi
-			k=$((${k} + 1))
+			: $(( k += 1 ))
 		done
-		i=$((${i} + 1))
+		: $(( i += 1 ))
 	done
 
 	# Strip any duplicates
 	local i=0 k=1 a= b=
 	while [ ${i} -lt ${APS} ] ; do
-		k=$((${i} + 1))
+		: $(( k = i + 1 ))
 		while [ ${k} -le ${APS} ] ; do
 			eval a=\$MAC_${i}
 			eval b=\$MAC_${k}
@@ -327,9 +327,9 @@ iwconfig_scan()
 					unset MAC_${k} SSID_${k} CHAN_${k} QUALITY_${k} CAPS_${k}
 				fi
 			fi
-			k=$((${k} + 1))
+			: $(( k += 1 ))
 		done
-		i=$((${i} + 1))
+		: $(( i += 1 ))
 	done
 
 	local i=0 e= m= s=
@@ -337,7 +337,7 @@ iwconfig_scan()
 	while [ ${i} -le ${APS} ] ; do
 		eval x=\$MAC_${i}
 		if [ -z "${x}" ] ; then
-			i=$((${i} + 1))
+			: $(( i += 1 ))
 			continue
 		fi
 
@@ -374,7 +374,7 @@ iwconfig_scan()
 				unset SSID_${i} MAC_${i} CHAN_${i} QUALITY_${i} CAPS_${i}
 			fi
 		done
-		i=$((${i} + 1))
+		: $(( i += 1 ))
 	done
 	eoutdent
 	return 0
@@ -396,7 +396,7 @@ iwconfig_force_preferred()
 				found_AP=true
 				break
 			fi
-			i=$((${i} + 1))
+			: $(( i += 1 ))
 		done
 		if ! ${found_AP} ; then
 			SSID=${ssid}
@@ -428,7 +428,7 @@ iwconfig_connect_preferred()
 				iwconfig_associate "${mac}" \
 				"${chan}" "${caps}" && return 0
 			fi
-			i=$((${i} + 1))
+			: $(( i += 1 ))
 		done
 	done
 
@@ -442,7 +442,7 @@ iwconfig_connect_not_preferred()
 	while [ ${i} -le ${APS} ] ; do
 		eval e=\$SSID_${i}
 		if [ -z "${e}" ] ; then
-			i=$((${i} + 1))
+			: $(( i += 1 ))
 			continue
 		fi
 
@@ -465,7 +465,7 @@ iwconfig_connect_not_preferred()
 			iwconfig_associate "${mac}"  \
 			"${chan}" "${caps}" && return 0
 		fi
-		i=$((${i} + 1))
+		: $(( i += 1 ))
 	done
 
 	return 1

net/iwconfig.sh.Linux.in

@@ -39,7 +39,7 @@ _get_ssid()
 			return 0
 		fi
 		sleep 1
-		i=$((${i} - 1))
+		: $(( i -= 1 ))
 	done
 
 	return 1
@@ -229,7 +229,7 @@ iwconfig_wait_for_association()
 
 		sleep 1
 		[ ${timeout} -eq 0 ] && continue
-		i=$((${i} +  1))
+		: $(( i +=  1 ))
 		[ ${i} -ge ${timeout} ] && return 1
 	done
 	return 1
@@ -347,7 +347,7 @@ iwconfig_scan()
 					;;
 			esac
 		fi
-	    i=$((${i} + 1))
+	    : $(( i += 1 ))
 	done
 
 	if [ -z "${scan}" ]; then
@@ -377,7 +377,7 @@ iwconfig_scan()
 	for line; do
 		case "${line}" in
 			*Address:*)
-				APS=$((${APS} + 1))
+				: $(( APS += 1 ))
 				eval MAC_${APS}="\""$(echo "${line#*: }" | tr '[:lower:]' '[:upper:]')"\""
 				eval QUALITY_${APS}=0
 				;;
@@ -427,7 +427,7 @@ iwconfig_scan()
 	# Sort based on quality
 	local i=0 k=1 a= b= x= t=
 	while [ ${i} -lt ${APS} ]; do
-	    k=$((${i} + 1))
+	    : $(( k = i + 1 ))
 	    while [ ${k} -le ${APS} ]; do
 		eval a=\$QUALITY_${i}
 		[ -z "${a}" ] && break
@@ -439,15 +439,15 @@ iwconfig_scan()
 			eval ${x}_${k}=\$t
 		    done
 		fi
-		k=$((${k} + 1))
+		: $(( k += 1 ))
 	    done
-	    i=$((${i} + 1))
+	    : $(( i += 1 ))
 	done
 
 	# Strip any duplicates
 	local i=0 k=1 a= b=
 	while [ ${i} -lt ${APS} ]; do
-		k=$((${i} + 1))
+		: $(( k = i + 1 ))
 		while [ ${k} -le ${APS} ]; do
 			eval a=\$MAC_${i}
 			eval b=\$MAC_${k}
@@ -459,9 +459,9 @@ iwconfig_scan()
 				[ -n "${a}" -a -n "${b}" ] && [ "${a}" -lt "${b}" ] && u=${i}
 				unset MAC_${u} SSID_${u} MODE_${u} CHAN_${u} QUALITY_${u} ENC_${u}
 			fi
-			k=$((${k} + 1))
+			: $(( k += 1 ))
 		done
-		i=$((${i} + 1))
+		: $(( i += 1 ))
 	done
 
 	local i=0 e= m= s=
@@ -469,7 +469,7 @@ iwconfig_scan()
 	while [ ${i} -le ${APS} ]; do
 		eval x=\$MAC_${i}
 		if [ -z "${x}" ]; then
-		    i=$((${i} + 1))
+		    : $(( i += 1 ))
 		    continue
 		fi
 
@@ -506,7 +506,7 @@ iwconfig_scan()
 				unset SSID_${i} MAC_${i} ${MODE}_${i} CHAN_${i} QUALITY_${i} ENC_${i}
 			fi
 		done
-		i=$((${i} + 1))
+		: $(( i += 1 ))
 	done
 	eoutdent
 }
@@ -526,7 +526,7 @@ iwconfig_force_preferred()
 				found_AP=true
 				break
 			fi
-			i=$((${i} + 1))
+			: $(( i += 1 ))
 		done
 		if ! ${found_AP}; then
 			SSID=${ssid}
@@ -559,7 +559,7 @@ iwconfig_connect_preferred()
 				iwconfig_associate "${mode}" "${mac}" "${enc}" "${freq}" \
 					"${chan}" && return 0
 			fi
-			i=$((${i} + 1))
+			: $(( i += 1 ))
 		done
 	done
 
@@ -593,7 +593,7 @@ iwconfig_connect_not_preferred()
 					"${chan}" && return 0
 			fi
 		fi
-		i=$((${i} + 1))
+		: $(( i += 1 ))
 	done
 
 	return 1

net/macvlan.sh

@@ -0,0 +1,69 @@
+# 2011-09-22	Stef Simoens <stef@bgs.org>
+#		based on vlan.sh & tuntap.sh
+# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
+
+_ip()
+{
+	if [ -x /bin/ip ]; then
+		echo /bin/ip
+	else
+		echo /sbin/ip
+	fi
+}
+
+macvlan_depend()
+{
+	program $(_ip)
+	after interface
+	before dhcp macchanger
+}
+
+_is_macvlan()
+{
+	[ -n "$(export RC_SVCNAME="net.${IFACE}"; service_get_value macvlan)" ]
+}
+
+_check_macvlan()
+{
+	if [ ! -d /sys/module/macvlan ]; then
+		modprobe macvlan
+		if [ ! -d /sys/module/macvlan ]; then
+			eerror "MAC-VLAN support is not present in this kernel"
+			return 1
+		fi
+	fi
+}
+
+macvlan_pre_start()
+{
+	# MAC-VLAN needs an existing interface to link to
+	local macvlan=
+	eval macvlan=\$macvlan_${IFVAR}
+	[ -z "${macvlan}" ] && return 0
+
+	_check_macvlan || return 1
+
+	# optional mode, default to "private"
+	local mode=
+	eval mode=\$mode_${IFVAR}
+	[ -z "${mode}" ] && mode="private"
+
+	ebegin "Creating MAC-VLAN ${IFACE} to ${macvlan}"
+	e="$(ip link add link "${macvlan}" name "${IFACE}" type macvlan mode "${mode}" 2>&1 1>/dev/null)"
+	if [ -n "${e}" ]; then
+		eend 1 "${e}"
+	else
+		eend 0 && service_set_value macvlan "${macvlan}"
+	fi
+}
+
+
+macvlan_post_stop()
+{
+	_is_macvlan || return 0
+
+	ebegin "Removing MAC-VLAN ${IFACE}"
+	ip link delete "${IFACE}" type macvlan >/dev/null
+	eend $?
+}

net/netplugd.sh

@@ -74,7 +74,7 @@ netplugd_pre_start()
 		fi
 		sleep 1
 		[ ${timeout} -eq 0 ] && continue
-		i=$((${i} + 1))
+		: $(( i += 1 ))
 		[ ${i} -ge ${timeout} ] && break
 	done
 

net/pppd.sh

@@ -96,7 +96,7 @@ pppd_pre_start()
 	if ! ${hasdefaultmetric}; then
 		local m=
 		eval m=\$metric_${IFVAR}
-		[ -z "${m}" ] && m=$((${metric} + $(_ifindex)))
+		[ -z "${m}" ] && : $(( m = metric + $(_ifindex) ))
 		opts="${opts} defaultmetric ${m}"
 	fi
 	if [ -n "${mtu}" ]; then

net/system.sh

@@ -13,7 +13,7 @@ system_depend()
 
 _system_dns()
 {
-	local servers= domain= search= sortlist= options= x=
+	local servers= domain= search= sortlist= options= x= imetric=
 
 	eval servers=\$dns_servers_${IFVAR}
 	[ -z "${servers}" ] && servers=${dns_servers}
@@ -46,7 +46,12 @@ _system_dns()
 
 	# Support resolvconf if we have it.
 	if [ -x /sbin/resolvconf ]; then
-		printf "${buffer}" | resolvconf -a "${IFACE}"
+		x="-a ${IFACE}"
+		eval imetric=\${metric_${IFVAR}}
+		if [ -n "${imetric}" ]; then
+			x="${x} -m ${imetric}"
+		fi
+		printf "${buffer}" | resolvconf ${x}
 	else
 		printf "${buffer}" > /etc/resolv.conf
 		chmod 644 /etc/resolv.conf

net/tuntap.sh

@@ -30,7 +30,7 @@ tuntap_pre_start()
 		local timeout=10
 		while [ ! -e /dev/net/tun -a ${timeout} -gt 0 ]; do
 			sleep 1
-			timeout=$((${timeout} - 1))
+			: $(( timeout -= 1 ))
 		done
 		if [ ! -e /dev/net/tun ]; then
 			eerror "TUN/TAP support present but /dev/net/tun is not"
@@ -54,15 +54,18 @@ tuntap_pre_start()
 		do_tunctl=true
 	elif type openvpn >/dev/null 2>&1; then
 		do_openvpn=true
-	else
+	elif type tunctl >/dev/null 2>&1; then
 		do_tunctl=true
 	fi
 
 	if ${do_openvpn}; then
 		openvpn --mktun --dev-type "${tuntap}" --dev "${IFACE}" \
 			${o_opts} >/dev/null
-	else
+	elif ${do_tunctl}; then
 		tunctl ${t_opts} -t "${IFACE}" >/dev/null
+	else
+		eerror "Neither openvpn nor tunctl has been found, please install"
+		eerror "either \"openvpn\" or \"usermode-utilities\"."
 	fi
 	eend $? && _up && service_set_value tuntap "${tuntap}"
 }

net/vlan.sh

@@ -77,7 +77,17 @@ vlan_post_start()
 		eval vegress=\$vlan${vlan}_egress
 		[ -z "${vegress}" ] || vegress="egress-qos-map ${vegress}"
 
-		e="$(ip link add link "${IFACE}" name "${vname}" type vlan id "${vlan}" ${vflags} ${vingress} ${vegress} 2>&1 1>/dev/null)"
+		local txqueuelen=
+		eval txqueuelen=\$txqueuelen_vlan${vlan}
+		local mac=
+		eval mac=\$mac_vlan${vlan}
+		local broadcast=
+		eval broadcast=\$broadcast_vlan${vlan}
+		local mtu=
+		eval mtu=\$mtu_vlan${vlan}
+		local opts="${txqueuelen:+txqueuelen} ${txqueuelen} ${mac:+address} ${mac} ${broadcast:+broadcast} ${broadcast} ${mtu+:mtu} ${mtu}"
+
+		e="$(ip link add link "${IFACE}" name "${vname}" ${opts} type vlan id "${vlan}" ${vflags} ${vingress} ${vegress} 2>&1 1>/dev/null)"
 		if [ -n "${e}" ]; then
 			eend 1 "${e}"
 			continue
@@ -101,10 +111,12 @@ vlan_post_start()
 	return 0
 }
 
-vlan_post_stop()
+vlan_pre_stop()
 {
 	local vlan=
 
+	_exists || return 1
+
 	for vlan in $(_get_vlans); do
 		einfo "Removing VLAN ${vlan##*.} from ${IFACE}"
 		(

net/wpa_supplicant.sh

@@ -34,7 +34,7 @@ _get_ssid()
 			return 0
 		fi
 		sleep 1
-		timeout=$((timeout - 1))
+		: $(( timeout -= 1 ))
 	done
 
 	return 1

runlevels/Makefile

@@ -1,7 +1,8 @@
-BOOT=		bootmisc fsck hostname localmount network \
-		root staticroute swap sysctl urandom
+BOOT=		bootmisc fsck hostname localmount \
+		root swap sysctl urandom ${BOOT-${OS}}
 DEFAULT=	local netmount
-SHUTDOWN=	savecache
+SHUTDOWN=	savecache ${SHUTDOWN-${OS}}
+SYSINIT=	${SYSINIT-${OS}}
 
 LEVELDIR=	${DESTDIR}/${SYSCONFDIR}/runlevels
 SYSINITDIR=	${LEVELDIR}/sysinit
@@ -9,13 +10,30 @@ BOOTDIR=	${LEVELDIR}/boot
 DEFAULTDIR=	${LEVELDIR}/default
 SHUTDOWNDIR=	${LEVELDIR}/shutdown
 
-INITDIR=	../init.d
-
 MK=		../mk
 include ${MK}/sys.mk
 include ${MK}/os.mk
 include ${MK}/gitignore.mk
-include Makefile.${OS}
+
+BOOT-${OS}=
+SHUTDOWN-${OS}=
+SYSINIT-${OS}=
+
+BOOT-BSD=	hostid newsyslog savecore syslogd swap-blk
+
+# Generic BSD stuff
+BOOT-FreeBSD=	hostid net.lo0 newsyslog savecore syslogd
+# FreeBSD specific stuff
+BOOT-FreeBSD+=	adjkerntz dumpon syscons
+
+BOOT-Linux=	hwclock keymaps modules mtab net.lo procfs termencoding migrate-run
+SHUTDOWN-Linux=	killprocs mount-ro
+SYSINIT-Linux=	devfs dmesg
+
+# Generic BSD stuff
+BOOT-NetBSD=	hostid net.lo0 newsyslog savecore syslogd
+# NetBSD specific stuff
+BOOT-NetBSD+=	devdb swap-blk ttys wscons
 
 all:
 

runlevels/Makefile.BSD

@@ -1 +0,0 @@
-BOOT+=		hostid newsyslog savecore syslogd swap-blk

runlevels/Makefile.FreeBSD

@@ -1,5 +0,0 @@
-# Generic BSD stuff
-BOOT+=		hostid net.lo0 newsyslog savecore syslogd
-
-# FreeBSD specific stuff
-BOOT+=		adjkerntz dumpon syscons

runlevels/Makefile.Linux

@@ -1,3 +0,0 @@
-SYSINIT+=	devfs dmesg
-BOOT+=		hwclock keymaps modules mtab procfs termencoding
-SHUTDOWN+=	killprocs mount-ro

runlevels/Makefile.NetBSD

@@ -1,5 +0,0 @@
-# Generic BSD stuff
-BOOT+=		hostid net.lo0 newsyslog savecore syslogd
-
-# NetBSD specific stuff
-BOOT+=		devdb swap-blk ttys wscons

scripts/on_ac_power

@@ -3,14 +3,14 @@
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 
 # Exit 0 if on AC power, 1 if not and 255 if we don't know how to work it out
-if [ -f /proc/acpi/ac_adapter/AC*/state ]; then
-	cat /proc/acpi/ac_adapter/AC*/state | while read line; do
+if [ -f /proc/acpi/ac_adapter/*/state ]; then
+	cat /proc/acpi/ac_adapter/*/state | while read line; do
 		case "$line" in
 		"state:"*"off-line") exit 128;;
 		esac
 	done
-elif [ -f /sys/class/power_supply/AC*/online ]; then
-	cat /sys/class/power_supply/AC*/online | while read line; do
+elif [ -f /sys/class/power_supply/*/online ]; then
+	cat /sys/class/power_supply/*/online | while read line; do
 		[ "${line}" = 0 ] && exit 128
 	done
 elif [ -f /proc/pmu/info ]; then

sh/Makefile

@@ -1,16 +1,28 @@
 DIR=	${LIBEXECDIR}/sh
-SRCS=	functions.sh.in gendepends.sh.in init-common-post.sh.in \
-	rc-functions.sh.in runscript.sh.in
+SRCS=	init.sh.in functions.sh.in gendepends.sh.in init-common-post.sh.in \
+	rc-functions.sh.in runscript.sh.in ${SRCS-${OS}}
 INC=	init-common-post.sh rc-mount.sh functions.sh rc-functions.sh
-BIN=	gendepends.sh init.sh runscript.sh
+BIN=	gendepends.sh init.sh runscript.sh ${BIN-${OS}}
 
 INSTALLAFTER=	_installafter
 
 MK=	../mk
 include ${MK}/os.mk
-include Makefile.${OS}
+
+SRCS-FreeBSD=
+BIN-FreeBSD=
+
+SRCS-Linux=	cgroup-release-agent.sh.in init-early.sh.in udhcpc-hook.sh.in
+BIN-Linux=	cgroup-release-agent.sh init-early.sh udhcpc-hook.sh
+
+SRCS-NetBSD=	ifwatchd-carrier.sh.in ifwatchd-nocarrier.sh.in
+BIN-NetBSD=	ifwatchd-carrier.sh ifwatchd-nocarrier.sh
+
 include ${MK}/scripts.mk
 
+%.sh: %.sh${SFX}
+	${SED} ${SED_REPLACE} ${SED_EXTRA} $< > $@
+
 _installafter:
 	${INSTALL} -d ${DESTDIR}/${INITDIR}
 	@# Put functions.sh into init for backwards compat

sh/Makefile.FreeBSD

@@ -1,6 +0,0 @@
-SRCS+=		init.sh.in
-
-.SUFFIXES:	.sh.BSD.in
-.sh.BSD.in.sh:
-	${SED} ${SED_REPLACE} ${SED_EXTRA} $< > $@
-

sh/Makefile.Linux

@@ -1,7 +0,0 @@
-SRCS+=		init.sh.in init-early.sh.in udhcpc-hook.sh.in
-BIN+=		init-early.sh udhcpc-hook.sh
-
-.SUFFIXES:	.sh.Linux.in
-.sh.Linux.in.sh:
-	${SED} ${SED_REPLACE} ${SED_EXTRA} $< > $@
-