merging latest gentoo stuff

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

@@ -4,7 +4,12 @@
 
 include Makefile.inc
 
-SUBDIR=		conf.d doc etc init.d local.d man net scripts sh src
+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
 
 # Build pkgconfig or not
 MKPKGCONFIG?=	yes

Makefile.inc

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

README

@@ -1,8 +1,9 @@
 OpenRC README
-
+=============
 
 Installation
 ------------
+
 make install
 Yup, that simple. Works with GNU make.
 
@@ -14,9 +15,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
@@ -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, primarily Martin
+Schlemmer (azarah).
 
-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.

README.newnet

@@ -0,0 +1,40 @@
+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,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

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

conf.d/Makefile.FreeBSD

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

conf.d/Makefile.Linux

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

conf.d/Makefile.NetBSD

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

conf.d/bootmisc

@@ -4,7 +4,3 @@ 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,13 +13,6 @@
 #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,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.

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 :]!).

conf.d/urandom

@@ -2,4 +2,4 @@
 # (say for crypt swap), so you will need to customize this
 # behavior.  If you have /var on a separate partition, then
 # make sure this path lives on your root device somewhere.
-urandom_seed="/var/lib/misc/random-seed"
+urandom_seed="/var/run/random-seed"

doc/Makefile

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

doc/Makefile.FreeBSD

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

doc/Makefile.Linux

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

doc/Makefile.NetBSD

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

doc/net.example.BSD.in

@@ -388,17 +388,6 @@
 #
 # ${IFACE} is set to the interface being brought up/down
 # ${IFVAR} is ${IFACE} converted to variable name bash allows
-#
-# For historical and compatibility reasons, preup is actually normally called
-# in the following sequence: up ; preup ; up.
-# The first up causes the kernel to initialize the device, so
-# that it is available for use in the preup function.  However, for some
-# hardware, e.g. CAN devices, some configuration is needed before trying to up
-# the interface will actually work. For such hardware, the
-# up_before_preup variables will allow skipping the first up call if set
-# to yes.
-#up_before_preup_IFVAR="NO"
-#up_before_preup="NO"
 
 #preup() {
 #	# Remember to return 0 on success

doc/net.example.Linux.in

@@ -68,7 +68,6 @@
 # NOTE: ifconfig creates an aliased device for each extra IPv4 address
 #       (eth0:1, eth0:2, etc)
 #       iproute2 does not do this as there is no need to
-# WARNING: You cannot mix multiple addresses on a line with other parameters!
 #config_eth0="192.168.0.2/24 192.168.0.3/24 192.168.0.4/24"
 # However, that only works with CIDR addresses, so you can't use netmask.
 
@@ -86,14 +85,6 @@
 # If you don't want ANY address (only useful when calling for advanced stuff)
 #config_eth0="null"
 
-# If you need to pass parameters to go with an address, you can do so on the
-# same line as the address. You should split multiple addresses with newlines.
-# WARNING: You cannot mix multiple addresses on a line with other parameters!
-#config_eth0="192.168.0.2/24 scope host"
-#config_eth0="4321:0:1:2:3:4:567:89ab/64 nodad home preferred_lft 0"
-#config_eth0="192.168.0.2/24 scope host
-#4321:0:1:2:3:4:567:89ab/64 nodad home preferred_lft 0"
-
 # Here's how to do routing if you need it
 # We add an IPv4 default route, IPv4 subnet route and an IPv6 unicast route
 #routes_eth0="default via 192.168.0.1
@@ -359,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 it to wait, you can specify how long in seconds.
+# If you would like to, so can specify how long in seconds.
 #associate_timeout_eth0=60
 # A value of 0 means wait forever.
 
@@ -590,18 +581,6 @@
 # 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
@@ -799,7 +778,7 @@
 
 #-----------------------------------------------------------------------------
 # TUN/TAP
-# For TUN/TAP support install iproute2, openvpn or usermode-utilities
+# For TUN/TAP support emerge net-misc/openvpn or sys-apps/usermode-utilities
 #
 # You must specify if we're a tun or tap device. Then you can give it any
 # name you like - such as vpn
@@ -810,9 +789,6 @@
 #tuntap_tap0="tap"
 #config_tap0="192.168.0.1/24"
 
-# Use something like this to pass custom options to iproute2 during
-# tunnel creation. This sets the user and group ownership of the node.
-#iproute2_tun1="user foo group bar"
 # For passing custom options to tunctl use something like the following.  This
 # example sets the owner to adm
 #tunctl_tun1="-u adm"
@@ -851,9 +827,9 @@
 
 # Below is an example of configuring the bridge
 # Consult "man brctl" for more details
-#brctl_br0="setfd 15
-#sethello 2
-#stp on"
+#brctl_br0="setfd 0
+#sethello 0
+#stp off"
 
 # 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
@@ -941,8 +917,6 @@
 # /etc/iproute2/rt_tables, an example follows:
 # 2 oob
 # 3 external
-#
-# IPv6 RPDB entries are to be found in the rules6_IFVAR variables:
 
 #rules_eth0="
 #from ZZZ.ZZZ.200.128/27 table oob priority 500
@@ -957,11 +931,6 @@
 #XXX.XXX.112.0/24 dev eth1 table external scope link
 #default via XXX.XXX.112.1 dev eth1"
 
-# IPv6 example:
-#rules6_eth0="
-#from 2001:0DB8:AAAA:BBBB::/64 table vpn priority 100
-#to 2001:0DB8:AAAA:BBBB::/64 table vpn priority 150"
-
 
 #-----------------------------------------------------------------------------
 # System
@@ -1111,17 +1080,6 @@
 #
 # ${IFACE} is set to the interface being brought up/down
 # ${IFVAR} is ${IFACE} converted to variable name bash allows
-#
-# For historical and compatibility reasons, preup is actually normally called
-# in the following sequence: up ; preup ; up.
-# The first up causes the kernel to initialize the device, so
-# that it is available for use in the preup function.  However, for some
-# hardware, e.g. CAN devices, some configuration is needed before trying to up
-# the interface will actually work. For such hardware, the
-# up_before_preup variables will allow skipping the first up call if set
-# to yes.
-#up_before_preup_IFVAR="NO"
-#up_before_preup="NO"
 
 #preup() {
 #	# Test for link on the interface prior to bringing it up.  This

etc/Makefile

@@ -1,33 +1,17 @@
 DIR=	${SYSCONFDIR}
-SRCS=	rc.conf.in rc.in rc.shutdown.in
-BIN=	${BIN-${OS}}
-CONF=	rc.conf ${BIN-${OS}}
+CONF=	rc.conf
 
 CLEANFILES+=	rc.conf
 
 MK=	../mk
 include ${MK}/os.mk
-
-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 Makefile.${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

@@ -0,0 +1,4 @@
+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

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

etc/Makefile.NetBSD

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

etc/rc.conf.Linux

@@ -21,3 +21,4 @@ rc_sys="@RC_SYS_DEFAULT@"
 # This is the number of tty's used in most of the rc-scripts (like
 # consolefont, numlock, etc ...)
 rc_tty_number=12
+

etc/rc.conf.in

@@ -1,8 +1,18 @@
 # Global OpenRC configuration settings
 
+# Set to "YES" if you want the rc system to try and start services
+# in parallel for a slight speed improvement. When running in parallel we
+# prefix the service output with its name as the output will get
+# jumbled up.
+# WARNING: whilst we have improved parallel, it can still potentially lock
+# the boot process. Don't file bugs about this unless you can supply
+# patches that fix it without breaking other things!
+#rc_parallel="NO"
+
 # 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.
@@ -37,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"

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

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

init.d.misc/Makefile.Linux

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

init.d.misc/Makefile.NetBSD

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

init.d/Makefile

@@ -1,42 +1,25 @@
 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 ${SRCS-${OS}}
+	sysctl.in urandom.in
 BIN=	${OBJS}
 
-INSTALLAFTER=	_installafter_net.lo
-CLEANFILES+=	net.lo
-TARGETS+=	net.lo
+# 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}
 
 MK=	../mk
 include ${MK}/os.mk
-
-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
-
-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 Makefile.${OS}
 include ${MK}/scripts.mk
 
 _installafter_: realinstall
 
 _installafter_net.lo: realinstall
-	${INSTALL} -m ${BINMODE} net.lo ${DESTDIR}/${INITDIR}/${NET_LO-${OS}}
+	${INSTALL} -m ${BINMODE} net.lo ${DESTDIR}/${INITDIR}/${NET_LO}

init.d/Makefile.FreeBSD

@@ -0,0 +1,13 @@
+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

@@ -0,0 +1,9 @@
+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

@@ -0,0 +1,12 @@
+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,13 +10,12 @@ depend()
 	keyword -prefix -timeout
 }
 
-dir_writable()
+dir_writeable()
 {
 	mkdir "$1"/.test.$$ 2>/dev/null && rmdir "$1"/.test.$$
 }
 
 : ${wipe_tmp:=${WIPE_TMP:-yes}}
-: ${log_dmesg:=${LOG_DMESG:-yes}}
 
 cleanup_tmp_dir()
 {
@@ -25,7 +24,7 @@ cleanup_tmp_dir()
 	if ! [ -d "$dir" ]; then
 		mkdir -p "$dir" || return $?
 	fi
-	dir_writable "$dir" || return 1
+	dir_writeable "$dir" || return 1
 	chmod a+rwt "$dir" 2> /dev/null
 	cd "$dir" || return 1
 	if yesno $wipe_tmp; then
@@ -72,26 +71,6 @@ mkutmp()
 	chmod 0664 "$1"
 }
 
-migrate_to_run()
-{
-	src="$1"
-	dst="$2"
- 	if [ -L $src -a "$(readlink -f $src)" != $dst ]; then
- 		ewarn "$src does not point to $dst."
- 		ewarn "Setting $src to point to $dst."
- 		rm $src
- 	elif [ ! -L $src -a -d $src ]; then
- 		ebegin "Migrating $src to $dst"
- 		cp -a $src/* $dst/
- 		rm -rf $src
- 		eend $?
- 	fi
- 	# If $src doesn't exist at all, just run this
- 	if [ ! -e $src ]; then
- 		ln -s $dst $src
- 	fi
-}
-
 start()
 {
 	# Remove any added console dirs
@@ -99,16 +78,8 @@ start()
 
 	local logw=false runw=false extra=
 	# Ensure that our basic dirs exist
-	if [ "$RC_UNAME" = Linux ]; then
-		# Satisfy Linux FHS
-		extra=/var/lib/misc
-		if [ ! -d /run ]; then
-			extra="/var/run $extra"
-		fi
-	else
-		extra=/var/run
-	fi
-	for x in /var/log /tmp $extra; do
+	[ "$RC_UNAME" = Linux ] && extra=/var/lib/misc # Satisfy Linux FHS
+	for x in /var/log /var/run /tmp $extra; do
 		if ! [ -d $x ]; then
 			if ! mkdir -p $x; then
 				eend 1 "failed to create needed directory $x"
@@ -117,12 +88,7 @@ start()
 		fi
 	done
 
-	if [ "$RC_UNAME" = Linux -a -d /run ] && false; then
-		migrate_to_run	/var/lock /run/lock
-		migrate_to_run	/var/run /run
-	fi
-
-	if dir_writable /var/run; then
+	if dir_writeable /var/run; then
 		ebegin "Creating user login records"
 		local xtra=
 		[ "$RC_UNAME" = NetBSD ] && xtra=x
@@ -164,7 +130,7 @@ start()
 		cleanup_tmp_dir "$tmp"
 	done
 
-	if dir_writable /tmp; then
+	if dir_writeable /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
@@ -176,13 +142,11 @@ start()
 		fi
 	fi
 
-	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
+	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
 		fi
 	fi
 

init.d/consolefont.in

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

init.d/devdb.in

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

init.d/dumpon.in

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

init.d/fsck.in

@@ -48,13 +48,8 @@ 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
@@ -63,16 +58,10 @@ 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" -a -z "$fsck_mnt" ]; then
+		if [ -z "$fsck_passno" ]; then
 			fsck_args=${fsck_args--A -p}
 			if echo 2>/dev/null >/.test.$$; then
 				rm -f /.test.$$
@@ -102,7 +91,7 @@ start()
 			_reboot
 		fi;;
 	8)	ewend 1 "Operational error"; return 0;;
-	12)	ewend 1 "fsck interrupted";;
+	12)	ewend 1 "fsck interupted";;
 	*)	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 stateful firewall
+	# Use a statefull 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 stateful filter is a bit aggressive, and will cause some
+	# The statefull filter is a bit agressive, 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 += 1 ))
+		n=$(($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 $extra_net_fs_list; do
+	for x in $net_fs_list; do
 		types="${types},${x}"
 	done
 
@@ -34,17 +34,19 @@ start()
 stop()
 {
 	# We never unmount / or /dev or $RC_SVCDIR
-
-	# 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"
+	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:"
+	local 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/.*"
@@ -68,12 +70,12 @@ 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)$"
 	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/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,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")
@@ -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 += 1 ))
+		eend $? "Failed to load $x" && cnt=$(($cnt + 1))
 	done
 	einfo "Autoloaded $cnt module(s)"
 }

init.d/mount-ro.in

@@ -19,26 +19,28 @@ start()
 	# We need the do_unmount function
 	. "$RC_LIBEXECDIR"/sh/rc-mount.sh
 	eindent
-
-	# 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"
+	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)$"
 	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()
 {
-	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

@@ -21,11 +21,11 @@ depend()
 	need localmount
 	after bootmisc
 	provide net
-	keyword -shutdown -jail -prefix -vserver
+	keyword -jail -prefix -vserver
 
 	case "${IFACE}" in
 		lo|lo0);;
-		*) after net.lo net.lo0 dbus;;
+		*) after net.lo net.lo0;;
 	esac
 
 	if [ "$(command -v "depend_${IFVAR}")" = "depend_${IFVAR}" ]; then
@@ -42,25 +42,12 @@ 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}"
@@ -70,7 +57,10 @@ _get_array()
 		esac
 	fi
 
-	_array_helper $1
+	eval _a=\$$1
+	printf "%s" "${_a}"
+	printf "\n"
+	[ -n "${_a}" ]
 }
 
 # Flatten bash arrays to simple strings
@@ -79,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")"
@@ -91,7 +78,10 @@ _flatten_array()
 		esac
 	fi
 
-	_array_helper $1
+	eval _a=\$$1
+	printf "%s" "${_a}"
+	printf "\n"
+	[ -n "${_a}" ]
 }
 
 _wait_for_carrier()
@@ -115,7 +105,7 @@ _wait_for_carrier()
 			eend 0
 			return 0
 		fi
-		: $(( timeout -= 1 ))
+		timeout=$((${timeout} - 1))
 		[ "${efunc}" = "einfon" ] && printf "."
 	done
 
@@ -144,9 +134,9 @@ _netmask2cidr()
 	local i= len=
 	local IFS=.
 	for i in $1; do
-		while [ ${i} -ne 0 ]; do
-			: $(( len += i % 2 ))
-			: $(( i >>= 1 ))
+		while [ ${i} != "0" ]; do
+			len=$((${len} + ${i} % 2))
+			i=$((${i} >> 1))
 		done
 	done
 
@@ -169,36 +159,6 @@ _configure_variables()
 	done
 }
 
-_which()
-{
-	local i OIFS
-	# Empty
-	[ -z "$1" ] && return
-	# check paths
-	OIFS="$IFS"
-	IFS=:
-	for i in $PATH ; do
-		[ -x $i/$1 ] && echo $i/$1 && break
-	done
-	IFS=$OIFS
-}
-
-# Like _which, but also consider shell builtins, and multiple alternatives
-_program_available()
-{
-	[ -z "$1" ] && return 0
-	local x=
-	for x; do
-		case "${x}" in
-			/*) [ -x "${x}" ] && break;;
-			*) type "${x}" >/dev/null 2>&1 && break;;
-		esac
-		unset x
-	done
-	[ -n "${x}" ] && echo $x && return 0
-	return 1
-}
-
 _show_address()
 {
 	einfo "received address $(_get_inet_address "${IFACE}")"
@@ -307,7 +267,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 += 1 ))
+		i=$((${i} + 1))
 	done
 	echo "module_${i}=" >> "${MODULESLIST}"
 	)
@@ -334,17 +294,18 @@ _load_modules()
 
 	local i=-1 x= mod= f= provides=
 	while true; do
-		: $(( i += 1 ))
+		i=$((${i} + 1))
 		eval mod=\$module_${i}
 		[ -z "${mod}" ] && break
 		[ -e "${MODULESDIR}/${mod}.sh" ] || continue
 
 		eval set -- \$module_${i}_program
 		if [ -n "$1" ]; then
-			if ! _program_available "$@" >/dev/null; then
-				vewarn "Skipping module $mod due to missing program: $@"
-				continue
-			fi
+			x=
+			for x; do
+				[ -x "${x}" ] && break
+			done
+			[ -x "${x}" ] || continue
 		fi
 		if ${starting}; then
 			eval set -- \$module_${i}_program_start
@@ -352,10 +313,15 @@ _load_modules()
 			eval set -- \$module_${i}_program_stop
 		fi
 		if [ -n "$1" ]; then
-			if ! _program_available "$@" >/dev/null; then
-				vewarn "Skipping module $mod due to missing program: $@"
-				continue
-			fi
+			x=
+			for x; do
+				case "${x}" in
+					/*) [ -x "${x}" ] && break;;
+					*) type "${x}" >/dev/null 2>&1 && break;;
+				esac
+				unset x
+			done
+			[ -n "${x}" ] || continue
 		fi
 
 		eval provides=\$module_${i}_provide
@@ -431,18 +397,16 @@ _load_config()
 	set -- ${config}
 
 	# We should support a space separated array for cidr configs
-	# But only as long as they do not contain other parameters for the address
 	if [ $# = 1 ]; then
 		unset IFS
 		set -- ${config}
 		# Of course, we may have a single address added old style.
-		# If the NEXT argument is a v4 or v6 address, it's the next config.
-		# Otherwise, it's arguments to the first config...
-		if [ "${2#*.*}" = "${2}" -a "${2#*:*}" = "${2}" ]; then
-			# Not an IPv4/IPv6
-			local IFS="$__IFS"
-			set -- ${config}
-		fi
+		case "$2" in
+			netmask|broadcast|brd|brd+|peer|pointopoint)
+				local IFS="$__IFS"
+				set -- ${config}
+				;;
+		esac
 	fi
 
 	# Ensure that loopback has the correct address
@@ -464,7 +428,7 @@ _load_config()
 	# so modules can influence it
 	for cmd; do
 		eval config_${config_index}="'${cmd}'"
-		: $(( config_index += 1 ))
+		config_index=$((${config_index} + 1))
 	done
 	# Terminate the list
 	eval config_${config_index}=
@@ -472,7 +436,7 @@ _load_config()
 	config_index=0
 	for cmd in ${fallback}; do
 		eval fallback_${config_index}="'${cmd}'"
-		: $(( config_index += 1 ))
+		config_index=$((${config_index} + 1))
 	done
 	# Terminate the list
 	eval fallback_${config_index}=
@@ -514,9 +478,7 @@ start()
 {
 	local IFACE=${RC_SVCNAME#*.} oneworked=false fallback=false module=
 	local IFVAR=$(shell_var "${IFACE}") cmd= our_metric=
-	local metric=0 _up_before_preup
-	eval _up_before_preup="\$up_before_preup_${IFVAR}"
-	[ -z "${_up_before_preup}" ] && _up_before_preup=$up_before_preup
+	local metric=0
 
 	einfo "Bringing up interface ${IFACE}"
 	eindent
@@ -530,7 +492,7 @@ start()
 	# available in preup and afterwards incase the user inadvertently
 	# brings it down
 	if [ "$(command -v preup)" = "preup" ]; then
-		yesno "${_up_before_preup:-yes}" && _up 2>/dev/null
+		_up 2>/dev/null
 		ebegin "Running preup"
 		eindent
 		preup || return 1
@@ -569,7 +531,7 @@ start()
 	if [ -n "${our_metric}" ]; then
 		metric=${our_metric}
 	elif [ "${IFACE}" != "lo" -a "${IFACE}" != "lo0" ]; then
-		: $(( metric += $(_ifindex) ))
+		metric=$((${metric} + $(_ifindex)))
 	fi
 
 	while true; do
@@ -577,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)
@@ -609,11 +569,11 @@ start()
 				eindent
 				eval config_${config_index}=\$config
 				unset fallback_${config_index}
-				: $(( config_index -= 1 ))
+				config_index=$((${config_index} - 1))
 			fi
 		fi
 		eoutdent
-		: $(( config_index += 1 ))
+		config_index=$((${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 $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

@@ -219,12 +219,6 @@ 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
@@ -287,7 +281,7 @@ start()
 		tentative || break
 		[ $r = 5 ] && vebegin "Waiting for tentative addresses"
 		sleep 1
-		: $(( r -= 1 ))
+		r=$(($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 += 1 ))
+		i=$(($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 -a ! -e /proc/sys/fs/binfmt_misc/register ]; then
+	if [ -d /proc/sys/fs/binfmt_misc ] \
+		&& ! mountinfo -q /proc/sys/fs/binfmt_misc; 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
-			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
+			eend $?
 		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,11 +93,6 @@ 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,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/sysfs.in

@@ -50,43 +50,6 @@ 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
-
-	# set up kernel support for cgroups
-	if [ -d /sys/fs/cgroup ] && ! mountinfo -q /sys/fs/cgroup; then
-		if grep -qs cgroup /proc/filesystems; then
-			ebegin "Mounting cgroup filesystem"
-			local opts="nodev,noexec,nosuid,mode=755,size=${rc_cgroupsize:-10m}"
-			mount -n -t tmpfs -o ${opts} cgroup_root /sys/fs/cgroup
-			eend $?
-		fi
-	fi
-}
-
-mount_cgroups()
-{
-	yesno ${rc_cgroups:-YES} || return 0
-	if [ ! -e /proc/cgroups ]; then
-		return 0
-	fi
-
-	while read name hier groups enabled rest; do
-		case "${enabled}" in
-			1)	mkdir /sys/fs/cgroup/${name}
-				mount -t cgroup -o nodev,noexec,nosuid,${name} \
-					${name} /sys/fs/cgroup/${name}
-				;;
-		esac
-	done < /proc/cgroups
 }
 
 start()
@@ -96,11 +59,6 @@ start()
 	retval=$?
 	if [ $retval -eq 0 ]; then
 		mount_misc
-		retval=$?
-	fi
-	if [ $retval -eq 0 ]; then
-		mount_cgroups
-		retval=$?
 	fi
 	return $retval
 }

init.d/termencoding.in

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

init.d/urandom.in

@@ -2,7 +2,7 @@
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
-: ${urandom_seed:=${URANDOM_SEED:-/var/lib/misc/random-seed}}
+: ${urandom_seed:=${URANDOM_SEED:-/var/run/random-seed}}
 description="Initializes the random number generator."
 
 depend()
@@ -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,7 +105,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/runscript.8

@@ -21,7 +21,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd December 31, 2011
+.Dd November 4, 2009
 .Dt RUNSCRIPT 8 SMM
 .Os OpenRC
 .Sh NAME
@@ -93,15 +93,10 @@ 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
-String describing the extra command.
-.It Ar start_stop_daemon_args
-List of arguments passed to start-stop-daemon when starting the daemon.
+String describing the extra command the.
 .It Ar command
 Daemon to start or stop via
 .Nm start-stop-daemon
@@ -112,9 +107,6 @@ List of arguments to pass to the daemon when starting.
 Pidfile to use for the above defined command.
 .It Ar name
 Display name used for the above defined command.
-.It Ar retry
-Retry schedule to use when stopping the daemon. It can either be a
-timeout in seconds or multiple signal/timeout pairs (like SIGTERM/5).
 .El
 .Sh DEPENDENCIES
 You should define a
@@ -147,7 +139,7 @@ Tags a service with a keyword. Here's the keywords we currently understand:-
 .Bl -tag -width indent
 .It Dv -shutdown
 Don't stop this service when shutting the system down.
-This is normally quite safe as remaining daemons will be sent a SIGTERM just
+This normally quite safe as remaining daemons will be sent a SIGTERM just
 before final shutdown.
 Network related services such as the network and dhcpcd init scripts normally
 have this keyword.
@@ -229,7 +221,7 @@ seconds until all files exist.
 Returns 0 if all files exist, otherwise non zero.
 If
 .Ar timeout
-is less than 1 then we wait indefinitely.
+is less then 1 then we wait indefinitely.
 .It Ic is_newer_than Ar file1 Ar file2 ...
 If
 .Ar file1
@@ -296,11 +288,8 @@ Mark the service as coldplugged.
 Mark the service as inactive.
 .It Xo
 .Ic checkpath
-.Op Fl D , -directory-truncate
 .Op Fl d , -directory
-.Op Fl F , -file-truncate
 .Op Fl f , -file
-.Op Fl p , -pipe
 .Op Fl m , -mode Ar mode
 .Op Fl o , owner Ar owner
 .Ar path ...
@@ -457,7 +446,7 @@ eat()
 	veinfo "Eating `basename ${food}`"
 	${command} --eat ${food}
 	retval=$?
-	: $(( result += retval ))
+	: $((${result} += ${retval}))
 	[ ${retval} = 0 ] && ate="${ate} `basename ${food}`"
     done
 

man/start-stop-daemon.8

@@ -162,8 +162,9 @@ but with the standard error output.
 These options are only used for stopping daemons:
 .Bl -tag -width indent
 .It Fl R , -retry Ar timeout | Ar signal Ns / Ns Ar timeout
-The retry specification can be either a timeout in seconds or multiple
-signal/timeout pairs (like SIGTERM/5).
+You can either specify a timeout in seconds or a multiple signal/timeout
+pairs as a stopping schedule.
+If not specified then a default value of SIGTERM/5 is assumed.
 .El
 .Sh ENVIRONMENT
 .Va SSD_NICELEVEL

mk/lib.mk

@@ -8,22 +8,18 @@ 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}
-_LIBS+=			lib${LIB}.a
-endif
-
-_LIBS+=			${SHLIB_NAME}
+SOBJS+=			${OBJS:.o=.So}
+_LIBS=			lib${LIB}.a ${SHLIB_NAME}
 
 CLEANFILES+=		${OBJS} ${SOBJS} ${_LIBS} ${SHLIB_LINK}
 
-%.o: %.c
+.SUFFIXES:		.So
+
+.c.o:
 	${CC} ${CFLAGS} ${CPPFLAGS} -c $< -o $@
 
-%.So: %.c
+.c.So:
 	${CC} ${PICFLAG} -DPIC ${CPPFLAGS} ${CFLAGS} -c $< -o $@
 
 all: depend ${_LIBS}
@@ -45,10 +41,8 @@ ${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,7 +3,4 @@
 
 # Generic definitions
 
-PKG_PREFIX?=	/usr/local
-SFX=		.BSD.in
-
 LIBKVM?=	-lkvm

mk/os-Linux.mk

@@ -1,8 +1,5 @@
 # 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,3 +9,4 @@ OS?= 		${_OS}
 include ${MK}/os-${OS}.mk
 
 RC_LIB=		/$(LIBNAME)/rc
+

mk/prog.mk

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

mk/scripts.mk

@@ -15,10 +15,11 @@ _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
-%.sh: %.sh.in
+.SUFFIXES:	.sh.in .in
+.sh.in.sh:
 	${SED} ${SED_REPLACE} ${SED_EXTRA} $< > $@
 
-%: %.in
+.in:
 	${SED} ${SED_REPLACE} ${SED_EXTRA} $< > $@
 
 all: ${OBJS} ${TARGETS}

net/Makefile

@@ -1,24 +1,9 @@
 DIR=	${LIBEXECDIR}/net
-SRCS=	ifconfig.sh.in ${SRCS-${OS}}
+SRCS=	ifconfig.sh.in
 INC=	dhclient.sh dhcpcd.sh ifconfig.sh macchanger.sh macnet.sh \
-	ssidnet.sh system.sh wpa_supplicant.sh ${INC-${OS}}
+	ssidnet.sh system.sh wpa_supplicant.sh
 
 MK=	../mk
 include ${MK}/os.mk
-
-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 Makefile.${OS}
 include ${MK}/scripts.mk

net/Makefile.FreeBSD

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

net/Makefile.Linux

@@ -0,0 +1,9 @@
+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

@@ -0,0 +1,5 @@
+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 -= 1 ))
+			config_index=$((${config_index} - 1))
 			veend 0
 			eoutdent
 			return 0
 		fi
 
-		: $(( i += 1 ))
+		i=$((${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 -= 1 ))
+			w=$((${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/bonding.sh

@@ -95,22 +95,16 @@ bonding_pre_start()
 	_up
 
 	# finally add in slaves
-	# things needed in the process, and if they are done by ifenslave, openrc, and/or the kernel.
-	# down new slave interface: ifenslave, openrc
-	# set mtu: ifenslave, kernel
-	# set slave MAC: ifenslave, kernel
 	eoutdent
 	if [ -d /sys/class/net ]; then
 		sys_bonding_path=/sys/class/net/"${IFACE}"/bonding
 		if [ -n "${primary}" ]; then
-			IFACE=$primary _down
 			echo "+${primary}" >$sys_bonding_path/slaves
 			echo "${primary}" >$sys_bonding_path/primary
 		fi
 		for s in ${slaves}; do
 			[ "${s}" = "${primary}" ] && continue
 			if ! grep -q ${s} $sys_bonding_path/slaves; then
-				IFACE=$s _down
 				echo "+${s}" >$sys_bonding_path/slaves
 			fi
 		done

net/br2684ctl.sh

@@ -1,10 +1,19 @@
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
+_br2684ctl()
+{
+	if [ -x /usr/sbin/br2684ctl ]; then
+		echo /usr/sbin/br2684ctl
+	else
+		echo /sbin/br2684ctl
+	fi
+}
+
 br2684ctl_depend()
 {
 	before ppp
-	program start br2684ctl
+	program start $(_br2684ctl)
 }
 
 _config_vars="$_config_vars bridge bridge_add brctl"
@@ -33,7 +42,7 @@ br2684ctl_pre_start()
 	esac
 
 	einfo "Starting RFC 2684 Bridge control on ${IFACE}"
-	start-stop-daemon --start --exec $(_which br2684ctl) --background \
+	start-stop-daemon --start --exec $(_br2684ctl) --background \
 		--make-pidfile --pidfile "/var/run/br2684ctl-${IFACE}.pid" \
 		-- -c "${IFACE#nas*}" ${opts}
 	eend $?

net/bridge.sh

@@ -4,7 +4,7 @@
 bridge_depend()
 {
 	before interface macnet
-	program brctl
+	program /sbin/brctl
 }
 
 _config_vars="$_config_vars bridge bridge_add brctl"

net/clip.sh

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

net/ethtool.sh

@@ -1,9 +1,13 @@
 # Copyright (c) 2011 by Gentoo Foundation
 # Released under the 2-clause BSD license.
 
+_ethtool() {
+	echo /usr/sbin/ethtool
+}
+
 ethtool_depend()
 {
-	program ethtool
+	program $(_ethtool)
 	before interface
 }
 
@@ -25,9 +29,8 @@ ethtool_pre_start() {
 
 		# Skip everything if no arguments
 		[ -z "${args}" ] && continue
-
+		
 		# Split on \n
-		OIFS="${IFS}"
 		local IFS="$__IFS"
 
 		for p in ${args} ; do
@@ -35,7 +38,6 @@ 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 += 1 ))
+				i=$((${i} + 1))
 			done
 			;;
 		default)
@@ -47,7 +47,7 @@ _ifindex()
 					echo "${i}"
 					return 0
 				fi
-				: $(( i += 1 ))
+				i=$((${i} + 1))
 			done
 			;;
 	esac
@@ -242,23 +242,3 @@ ifconfig_post_start()
 		eend 0
 	fi
 }
-
-# Is the interface administratively/operationally up?
-# The 'UP' status in ifconfig is the administrative status
-# Operational state does not seem to be available in BSD?
-# 0: up
-# 1: down
-# 2: invalid arguments
-is_admin_up()
-{
-	local iface="$1"
-	[ -z "$iface" ] && iface="$IFACE"
-	ifconfig "${iface}" | \
-	sed -n '1,1{ /flags=.*[<,]UP[,>]/{ q 0 }}; q 1; '
-}
-
-is_oper_up()
-{
-	eerror "TODO: is_oper_up not available on BSD"
-	return 2
-}

net/ifconfig.sh.Linux.in

@@ -26,7 +26,7 @@ _ifindex()
 {
 	local line= i=-2
 	while read line; do
-		: $(( i += 1 ))
+		i=$((${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 += 1 ))
+	i=$((${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 += 1 ))
+		i=$((${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 -= 1 ))
-		: $(( done += 1 ))
+		octets=$((${octets} - 1))
+		done=$((${done} + 1))
 	done
 
 	if [ ${done} -lt 4 ]; then
 		while [ ${i} -lt ${frac} ]; do
-			: $(( sum += cur ))
-			: $(( cur /= 2 ))
-			: $(( i += 1 ))
+			sum=$((${sum} + ${cur}))
+			cur=$((${cur} / 2))
+			i=$((${i} + 1))
 		done
 		netmask="${netmask}.${sum}"
-		: $(( done += 1 ))
+		done=$((${done} + 1))
 
 		while [ ${done} -lt 4 ]; do
 			netmask="${netmask}.0"
-			: $(( done += 1 ))
+			done=$((${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
 
@@ -188,12 +188,6 @@ _add_route()
 	if [ "$1" = "-A" -o "$1" = "-f" -o "$1" = "-family" ]; then
 		family="-A $2"
 		shift; shift
-	elif [ "$1" = "-4" ]; then
-	    family="-A inet"
-		shift
-	elif [ "$1" = "-6" ]; then
-	    family="-A inet6"
-		shift
 	fi
 
 	if [ -n "${metric}" ]; then
@@ -303,26 +297,3 @@ ifconfig_post_stop()
 	iptunnel del "${IFACE}"
 	eend $?
 }
-
-# Is the interface administratively/operationally up?
-# The 'UP' status in ifconfig/iproute2 is the administrative status
-# Operational state is available in iproute2 output as 'state UP', or the
-# operstate sysfs variable.
-# 0: up
-# 1: down
-# 2: invalid arguments
-is_admin_up()
-{
-	local iface="$1"
-	[ -z "$iface" ] && iface="$IFACE"
-	ifconfig "${iface}" | \
-	sed -n '1,1{ /flags=.*[<,]UP[,>]/{ q 0 }}; q 1; '
-}
-
-is_oper_up()
-{
-	local iface="$1"
-	[ -z "$iface" ] && iface="$IFACE"
-	read state </sys/class/net/"${iface}"/operstate
-	[ "x$state" = "up" ]
-}

net/ifplugd.sh

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

net/ip6to4.sh

@@ -6,18 +6,10 @@ _config_vars="$_config_vars link suffix relay"
 ip6to4_depend()
 {
 	after interface
-	program ip
 }
 
-ip6to4_pre_start()
+ip6to4_start()
 {
-	# ALL interfaces run pre_start blocks, not just those with something
-	# assigned, so we must check if we need to run on this interface before we
-	# do so.
-	local config
-	eval config=\$config_${IFVAR}
-	[ "$config" = "ip6to4" ] || return 0
-
 	case " ${MODULES} " in
 		*" ifconfig "*)
 			if [ "${IFACE}" != "sit0" ]; then
@@ -27,7 +19,7 @@ ip6to4_pre_start()
 			fi
 	esac
 
-	local host= suffix= relay= addr= iface=${IFACE} config_ip6to4= localip=
+	local host= suffix= relay= addr= iface=${IFACE} new= localip=
 	eval host=\$link_${IFVAR}
 	if [ -z "${host}" ]; then
 		eerror "link_${IFVAR} not set"
@@ -59,7 +51,7 @@ ip6to4_pre_start()
 					case "${ip}" in
 						172.${i}.*) break;;
 					esac
-					: $(( i += 1 ))
+					i=$((${i} + 1))
 				done
 				[ ${i} -lt 32 ] && continue
 				;;
@@ -75,7 +67,7 @@ ip6to4_pre_start()
 		veinfo "Derived IPv6 address: ${ip6}"
 
 		# Now apply our IPv6 address to our config
-		config_ip6to4="${config_ip6to4}${config_ip6to4:+ }${ip6}/48"
+		new="${new}${new:+ }${ip6}/16"
 
 		if [ -n "${localip}" ]; then
 			localip="any"
@@ -84,7 +76,7 @@ ip6to4_pre_start()
 		fi
 	done
 
-	if [ -z "${config_ip6to4}" ]; then
+	if [ -z "${new}" ]; then
 		eerror "No global IPv4 addresses found on interface ${host}"
 		return 1
 	fi
@@ -95,22 +87,13 @@ ip6to4_pre_start()
 		eend $? || return 1
 		_up
 	fi
-	routes_ip6to4="2003::/3 via ::${relay} metric 2147483647"
-	service_set_value "config_ip6to4_$IFVAR" "$config_ip6to4"
-	service_set_value "routes_ip6to4_$IFVAR" "$routes_ip6to4"
-}
-
-ip6to4_start()
-{
-	local config_ip6to4=$(service_get_value "config_ip6to4_$IFVAR")
-	local routes_ip6to4=$(service_get_value "routes_ip6to4_$IFVAR")
 
 	# Now apply our config
-	eval config_${config_index}=\'"${config_ip6to4}"\'
-	: $(( config_index -= 1 ))
+	eval config_${config_index}=\'"${new}"\'
+	config_index=$((${config_index} - 1))
 
 	# Add a route for us, ensuring we don't delete anything else
 	local routes="$(_get_array "routes_${IFVAR}")
-$routes_ip6to4"
+2003::/3 via ::${relay} metric 2147483647"
 	eval routes_${IFVAR}=\$routes
 }

net/iproute2.sh

@@ -1,9 +1,18 @@
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
+_ip()
+{
+	if [ -x /bin/ip ]; then
+		echo /bin/ip
+	else
+		echo /sbin/ip
+	fi
+}
+
 iproute2_depend()
 {
-	program ip
+	program $(_ip)
 	provide interface
 	after ifconfig
 }
@@ -27,7 +36,7 @@ _ifindex()
 {
 	local line= i=-2
 	while read line; do
-		: $(( i += 1 ))
+		i=$((${i} + 1))
 		[ ${i} -lt 1 ] && continue
 		case "${line}" in
 			"${IFACE}:"*) echo "${i}"; return 0;;
@@ -35,7 +44,7 @@ _ifindex()
 	done < /proc/net/dev
 
 	# Return the next available index
-	: $(( i += 1 ))
+	i=$((${i} + 1))
 	echo "${i}"
 	return 1
 }
@@ -101,56 +110,39 @@ _add_address()
 		ip addr add "$@" dev "${IFACE}" 2>/dev/null
 		return 0
 	fi
-	local x
-	local address netmask broadcast peer anycast label scope
-	local valid_lft preferred_lft home nodad
-	local confflaglist
-	address="$1" ; shift
-	while [ -n "$*" ]; do
-		x=$1 ; shift
-		case "$x" in
-			netmask|ne*)
-				netmask="/$(_netmask2cidr "$1")" ; shift ;;
-			broadcast|brd|br*)
-				broadcast="$1" ; shift ;;
-			pointopoint|pointtopoint|peer|po*|pe*)
-				peer="$1" ; shift ;;
-			anycast|label|scope|valid_lft|preferred_lft|a*|l*|s*|v*|pr*)
-				case $x in
-					a*) x=anycast ;;
-					l*) x=label ;;
-					s*) x=scope ;;
-					v*) x=valid_lft ;;
-					pr*) x=preferred_lft ;;
-				esac
-				eval "$x=$1" ; shift ;;
-			home|nodad|h*|no*)
-				case $x in h*) x=home ;; n*) x=nodad ;; esac
-				# FIXME: If we need to reorder these, this will take more code
-				confflaglist="${confflaglist} $x" ; ;;
-			*)
-				ewarn "Unknown argument to config_$IFACE: $x"
-		esac
-	done
+
+	# 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
 
 	# Always scope lo addresses as host unless specified otherwise
 	if [ "${IFACE}" = "lo" ]; then
-		[ -z "$scope" ] && scope="host"
+		set -- "$@" "scope" "host"
 	fi
 
-	# figure out the broadcast address if it is not specified
-	# This must NOT be set for IPv6 addresses
-	if [ "${address#*:}" = "${address}" ]; then
-		[ -z "$broadcast" ] && broadcast="+"
-	elif [ -n "$broadcast" ]; then
-		eerror "Broadcast keywords are not valid with IPv6 addresses"
-		return 1
-	fi
+	# IPv4 specifics
+	case "$1" in
+		*.*.*.*)
+			case "$@" in
+				*" brd "*);;
+				*" broadcast "*);;
+				*) set -- "$@" brd +;;
+			esac
+			;;
+	esac
 
-	# This must appear on a single line, continuations cannot be used
-	set -- "${address}${netmask}" ${peer:+peer} ${peer} ${broadcast:+broadcast} ${broadcast} ${anycast:+anycast} ${anycast} ${label:+label} ${label} ${scope:+scope} ${scope} dev "${IFACE}" ${valid_lft:+valid_lft} $valid_lft ${preferred_lft:+preferred_lft} $preferred_lft $confflaglist
-	veinfo ip addr add "$@"
-	ip addr add "$@"
+	veinfo ip addr add "$@" dev "${IFACE}"
+	ip addr add "$@" dev "${IFACE}"
 }
 
 _add_route()
@@ -160,12 +152,6 @@ _add_route()
 	if [ "$1" = "-A" -o "$1" = "-f" -o "$1" = "-family" ]; then
 		family="-f $2"
 		shift; shift
-	elif [ "$1" = "-4" ]; then
-	    family="-f inet"
-		shift
-	elif [ "$1" = "-6" ]; then
-	    family="-f inet6"
-		shift
 	fi
 
 	if [ $# -eq 3 ]; then
@@ -228,13 +214,7 @@ _trim() {
 # This is our interface to Routing Policy Database RPDB
 # This allows for advanced routing tricks
 _ip_rule_runner() {
-	local cmd rules OIFS="${IFS}" family
-	if [ "$1" = "-4" -o "$1" = "-6" ]; then
-		family="$1"
-		shift
-	else
-		family="-4"
-	fi
+	local cmd rules OIFS="${IFS}"
 	cmd="$1"
 	rules="$2"
 	veindent
@@ -244,7 +224,7 @@ _ip_rule_runner() {
 		ruN="$(_trim "${ru}")"
 		[ -z "${ruN}" ] && continue
 		vebegin "${cmd} ${ruN}"
-		ip $family rule ${cmd} ${ru}
+		ip rule ${cmd} ${ru}
 		veend $?
 		local IFS="$__IFS"
 	done
@@ -300,30 +280,15 @@ iproute2_post_start()
 	if [ -e /proc/net/route ]; then
 		local rules="$(_get_array "rules_${IFVAR}")"
 		if [ -n "${rules}" ]; then
-			if ! ip -4 rule list | grep -q "^"; then
+			if ! ip rule list | grep -q "^"; then
 				eerror "IP Policy Routing (CONFIG_IP_MULTIPLE_TABLES) needed for ip rule"
 			else
 				service_set_value "ip_rule" "${rules}"
-				einfo "Adding IPv4 RPDB rules"
-				_ip_rule_runner -4 add "${rules}"
+				einfo "Adding RPDB rules"
+				_ip_rule_runner add "${rules}"
 			fi
 		fi
-		ip -4 route flush table cache dev "${IFACE}"
-	fi
-
-	# Kernel may not have IPv6 built in
-	if [ -e /proc/net/ipv6_route ]; then
-		local rules="$(_get_array "rules6_${IFVAR}")"
-		if [ -n "${rules}" ]; then
-			if ! ip -6 rule list | grep -q "^"; then
-				eerror "IPv6 Policy Routing (CONFIG_IPV6_MULTIPLE_TABLES) needed for ip rule"
-			else
-				service_set_value "ip6_rule" "${rules}"
-				einfo "Adding IPv6 RPDB rules"
-				_ip_rule_runner -6 add "${rules}"
-			fi
-		fi
-		ip -6 route flush table cache dev "${IFACE}"
+		ip route flush table cache dev "${IFACE}"
 	fi
 
 	if _iproute2_ipv6_tentative; then
@@ -331,7 +296,7 @@ iproute2_post_start()
 		while [ $n -ge 0 ]; do
 			_iproute2_ipv6_tentative || break
 			sleep 1
-			: $(( n -= 1 ))
+			n=$(($n - 1))
 		done
 		[ $n -ge 0 ]
 		eend $?
@@ -346,28 +311,10 @@ iproute2_post_stop()
 	if [ -e /proc/net/route ]; then
 		local rules="$(service_get_value "ip_rule")"
 		if [ -n "${rules}" ]; then
-			einfo "Removing IPv4 RPDB rules"
-			_ip_rule_runner -4 del "${rules}"
-		fi
-
-		# Only do something if the interface actually exist
-		if _exists; then
-			ip -4 route flush table cache dev "${IFACE}"
-		fi
-	fi
-
-	# Kernel may not have IPv6 built in
-	if [ -e /proc/net/ipv6_route ]; then
-		local rules="$(service_get_value "ip6_rule")"
-		if [ -n "${rules}" ]; then
-			einfo "Removing IPv6 RPDB rules"
-			_ip_rule_runner -6 del "${rules}"
-		fi
-
-		# Only do something if the interface actually exist
-		if _exists; then
-			ip -6 route flush table cache dev "${IFACE}"
+			einfo "Removing RPDB rules"
+			_ip_rule_runner del "${rules}"
 		fi
+		ip route flush table cache dev "${IFACE}"
 	fi
 
 	# Don't delete sit0 as it's a special tunnel
@@ -379,26 +326,3 @@ iproute2_post_stop()
 		fi
 	fi
 }
-
-# Is the interface administratively/operationally up?
-# The 'UP' status in ifconfig/iproute2 is the administrative status
-# Operational state is available in iproute2 output as 'state UP', or the
-# operstate sysfs variable.
-# 0: up
-# 1: down
-# 2: invalid arguments
-is_admin_up()
-{
-	local iface="$1"
-	[ -z "$iface" ] && iface="$IFACE"
-	ip link show dev $iface | \
-	sed -n '1,1{ /[<,]UP[,>]/{ q 0 }}; q 1; '
-}
-
-is_oper_up()
-{
-	local iface="$1"
-	[ -z "$iface" ] && iface="$IFACE"
-	read state </sys/class/net/"${iface}"/operstate
-	[ "x$state" = "up" ]
-}

net/iwconfig.sh.BSD.in

@@ -218,7 +218,7 @@ iwconfig_associate()
 		sleep 1
 
 		[ ${timeout} -eq 0 ] && continue
-		: $(( i +=  1 ))
+		i=$((${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 += 1 ))
+		i=$((${i} + 1))
 	done
 
 	APS=-1
 	eval set -- ${scan}
 	for line in "$@" ; do
-		: $(( APS += 1 ))
+		APS=$((${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 += 1 ))
+			k=$((${k} + 1))
 		done
-		: $(( i += 1 ))
+		i=$((${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 += 1 ))
+			k=$((${k} + 1))
 		done
-		: $(( i += 1 ))
+		i=$((${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 += 1 ))
+			i=$((${i} + 1))
 			continue
 		fi
 
@@ -374,7 +374,7 @@ iwconfig_scan()
 				unset SSID_${i} MAC_${i} CHAN_${i} QUALITY_${i} CAPS_${i}
 			fi
 		done
-		: $(( i += 1 ))
+		i=$((${i} + 1))
 	done
 	eoutdent
 	return 0
@@ -396,7 +396,7 @@ iwconfig_force_preferred()
 				found_AP=true
 				break
 			fi
-			: $(( i += 1 ))
+			i=$((${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 += 1 ))
+			i=$((${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 += 1 ))
+			i=$((${i} + 1))
 			continue
 		fi
 
@@ -465,7 +465,7 @@ iwconfig_connect_not_preferred()
 			iwconfig_associate "${mac}"  \
 			"${chan}" "${caps}" && return 0
 		fi
-		: $(( i += 1 ))
+		i=$((${i} + 1))
 	done
 
 	return 1

net/iwconfig.sh.Linux.in

@@ -39,7 +39,7 @@ _get_ssid()
 			return 0
 		fi
 		sleep 1
-		: $(( i -= 1 ))
+		i=$((${i} - 1))
 	done
 
 	return 1
@@ -229,7 +229,7 @@ iwconfig_wait_for_association()
 
 		sleep 1
 		[ ${timeout} -eq 0 ] && continue
-		: $(( i +=  1 ))
+		i=$((${i} +  1))
 		[ ${i} -ge ${timeout} ] && return 1
 	done
 	return 1
@@ -347,7 +347,7 @@ iwconfig_scan()
 					;;
 			esac
 		fi
-	    : $(( i += 1 ))
+	    i=$((${i} + 1))
 	done
 
 	if [ -z "${scan}" ]; then
@@ -377,7 +377,7 @@ iwconfig_scan()
 	for line; do
 		case "${line}" in
 			*Address:*)
-				: $(( APS += 1 ))
+				APS=$((${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 += 1 ))
+		k=$((${k} + 1))
 	    done
-	    : $(( i += 1 ))
+	    i=$((${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 += 1 ))
+			k=$((${k} + 1))
 		done
-		: $(( i += 1 ))
+		i=$((${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 += 1 ))
+		    i=$((${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 += 1 ))
+		i=$((${i} + 1))
 	done
 	eoutdent
 }
@@ -526,7 +526,7 @@ iwconfig_force_preferred()
 				found_AP=true
 				break
 			fi
-			: $(( i += 1 ))
+			i=$((${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 += 1 ))
+			i=$((${i} + 1))
 		done
 	done
 
@@ -593,7 +593,7 @@ iwconfig_connect_not_preferred()
 					"${chan}" && return 0
 			fi
 		fi
-		: $(( i += 1 ))
+		i=$((${i} + 1))
 	done
 
 	return 1

net/macchanger.sh

@@ -4,7 +4,6 @@
 macchanger_depend()
 {
 	before macnet
-	# no program 'macchanger', as we have partial functionality without it
 }
 
 _config_vars="$_config_vars mac"

net/macvlan.sh

@@ -1,53 +0,0 @@
-# 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.
-
-macvlan_depend()
-{
-	program ip
-	after interface
-	before dhcp macchanger
-}
-
-_is_macvlan()
-{
-	[ -n "$(export RC_SVCNAME="net.${IFACE}"; service_get_value macvlan)" ]
-}
-
-macvlan_pre_start()
-{
-	# MAC-VLAN needs an existing interface to link to
-	local macvlan=
-	eval macvlan=\$macvlan_${IFVAR}
-	[ -z "${macvlan}" ] && return 0
-
-	case " ${MODULES} " in
-		*" ifconfig "*)
-				eerror "sys-apps/iproute2 is required to configure MACVLANs"
-				return 1 ;;
-	esac
-
-	# 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 && _up && 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 += 1 ))
+		i=$((${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= imetric=
+	local servers= domain= search= sortlist= options= x=
 
 	eval servers=\$dns_servers_${IFVAR}
 	[ -z "${servers}" ] && servers=${dns_servers}
@@ -46,12 +46,7 @@ _system_dns()
 
 	# Support resolvconf if we have it.
 	if [ -x /sbin/resolvconf ]; then
-		x="-a ${IFACE}"
-		eval imetric=\${metric_${IFVAR}}
-		if [ -n "${imetric}" ]; then
-			x="${x} -m ${imetric}"
-		fi
-		printf "${buffer}" | resolvconf ${x}
+		printf "${buffer}" | resolvconf -a "${IFACE}"
 	else
 		printf "${buffer}" > /etc/resolv.conf
 		chmod 644 /etc/resolv.conf

net/tuntap.sh

@@ -4,10 +4,9 @@
 tuntap_depend()
 {
 	before bridge interface macchanger
-	program ip openvpn tunctl
 }
 
-_config_vars="$_config_vars iproute2 openvpn tunctl"
+_config_vars="$_config_vars tunctl"
 
 _is_tuntap()
 {
@@ -17,7 +16,6 @@ _is_tuntap()
 tuntap_pre_start()
 {
 	local tuntap=
-	local rc=
 	eval tuntap=\$tuntap_${IFVAR}
 
 	[ -z "${tuntap}" ] && return 0
@@ -32,7 +30,7 @@ tuntap_pre_start()
 		local timeout=10
 		while [ ! -e /dev/net/tun -a ${timeout} -gt 0 ]; do
 			sleep 1
-			: $(( timeout -= 1 ))
+			timeout=$((${timeout} - 1))
 		done
 		if [ ! -e /dev/net/tun ]; then
 			eerror "TUN/TAP support present but /dev/net/tun is not"
@@ -46,42 +44,27 @@ tuntap_pre_start()
 	# Set the base metric to 1000
 	metric=1000
 
-	local i_opts= o_opts= t_opts=
-	local do_iproute2=false do_openvpn=false do_tunctl=false
-	eval i_opts=\$iproute2_${IFVAR}
+	local o_opts= t_opts= do_openvpn=false do_tunctl=false
 	eval o_opts=\$openvpn_${IFVAR}
 	eval t_opts=\$tunctl_${IFVAR}
 
-	if [ -n "${i_opts}" ] && type ip >/dev/null 2>&1; then
-		do_iproute2=true
-	elif [ -n "${o_opts}" ] && type openvpn >/dev/null 2>&1; then
+	if [ -n "${o_opts}" ] && type openvpn >/dev/null 2>&1; then
 		do_openvpn=true
 	elif [ -n "${t_opts}" ] && type tunctl >/dev/null 2>&1; then
 		do_tunctl=true
-	elif type ip >/dev/null 2>&1; then
-		do_iproute2=true
 	elif type openvpn >/dev/null 2>&1; then
 		do_openvpn=true
-	elif type tunctl >/dev/null 2>&1; then
+	else
 		do_tunctl=true
 	fi
 
-	if ${do_iproute2}; then
-		ip tuntap add dev "${IFACE}" mode "${tuntap}" ${i_opts}
-		rc=$?
-	elif ${do_openvpn}; then
+	if ${do_openvpn}; then
 		openvpn --mktun --dev-type "${tuntap}" --dev "${IFACE}" \
 			${o_opts} >/dev/null
-		rc=$?
-	elif ${do_tunctl}; then
-		tunctl ${t_opts} -t "${IFACE}" >/dev/null
-		rc=$?
 	else
-		eerror "Neither iproute2, openvpn nor tunctl has been found, please install"
-		eerror "either \"iproute2\" \"openvpn\" or \"usermode-utilities\"."
-		rc=1
+		tunctl ${t_opts} -t "${IFACE}" >/dev/null
 	fi
-	eend $rc && _up && service_set_value tuntap "${tuntap}"
+	eend $? && _up && service_set_value tuntap "${tuntap}"
 }
 
 tuntap_post_stop()
@@ -89,9 +72,7 @@ tuntap_post_stop()
 	_is_tuntap || return 0
 
 	ebegin "Destroying Tun/Tap interface ${IFACE}"
-	if type ip > /dev/null 2>&1; then
-		ip tuntap del dev ${IFACE} mode $(service_get_value tuntap)
-	elif type tunctl >/dev/null 2>&1; then
+	if type tunctl >/dev/null 2>&1; then
 		tunctl -d "${IFACE}" >/dev/null
 	else
 		openvpn --rmtun \

net/vlan.sh

@@ -1,9 +1,18 @@
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
+_ip()
+{
+	if [ -x /bin/ip ]; then
+		echo /bin/ip
+	else
+		echo /sbin/ip
+	fi
+}
+
 vlan_depend()
 {
-	program ip
+	program $(_ip)
 	after interface
 	before dhcp
 }
@@ -42,14 +51,6 @@ vlan_pre_start()
 		eerror "You must convert your vconfig_ VLAN entries to vlan${N} entries."
 		return 1
 	fi
-	local vlans=
-	eval vlans=\$vlans_${IFVAR}
-	[ -z "$vlans" ] && return 0
-	case " ${MODULES} " in
-		*" ifconfig "*)
-				eerror "sys-apps/iproute2 is required to configure VLANs"
-				return 1 ;;
-	esac
 }
 
 vlan_post_start()
@@ -76,17 +77,7 @@ vlan_post_start()
 		eval vegress=\$vlan${vlan}_egress
 		[ -z "${vegress}" ] || vegress="egress-qos-map ${vegress}"
 
-		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)"
+		e="$(ip link add link "${IFACE}" name "${vname}" type vlan id "${vlan}" ${vflags} ${vingress} ${vegress} 2>&1 1>/dev/null)"
 		if [ -n "${e}" ]; then
 			eend 1 "${e}"
 			continue
@@ -110,12 +101,10 @@ vlan_post_start()
 	return 0
 }
 
-vlan_pre_stop()
+vlan_post_stop()
 {
 	local vlan=
 
-	_exists || return 0
-
 	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 -= 1 ))
+		timeout=$((timeout - 1))
 	done
 
 	return 1

runlevels/Makefile

@@ -1,8 +1,7 @@
-BOOT=		bootmisc fsck hostname localmount \
-		root swap sysctl urandom ${BOOT-${OS}}
+BOOT=		bootmisc fsck hostname localmount network \
+		root staticroute swap sysctl urandom
 DEFAULT=	local netmount
-SHUTDOWN=	savecache ${SHUTDOWN-${OS}}
-SYSINIT=	${SYSINIT-${OS}}
+SHUTDOWN=	savecache
 
 LEVELDIR=	${DESTDIR}/${SYSCONFDIR}/runlevels
 SYSINITDIR=	${LEVELDIR}/sysinit
@@ -10,30 +9,13 @@ 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
-
-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
-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
+include Makefile.${OS}
 
 all:
 

runlevels/Makefile.BSD

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