FL-227: add aliases variable for /etc/conf.d/hostname aliases

conf.d/consolefont was written as though the consolefont service was
active by default. It is not, so this has been fixed.

reported-by: Ikonta@yandex.ru
X-Gentoo-Bug: 420037
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=420037

Makefile

@@ -4,12 +4,7 @@
 
 include Makefile.inc
 
-SUBDIR=		conf.d etc init.d local.d man scripts sh src
+SUBDIR=		conf.d doc etc init.d local.d sysctl.d man net scripts sh src
-
-# Build our old net foo or not
-ifeq (${MKOLDNET},yes)
-SUBDIR+=	net doc
-endif
 
 # Build pkgconfig or not
 MKPKGCONFIG?=	yes
@@ -30,6 +25,8 @@ include ${MK}/dist.mk
 include ${MK}/git.mk
 
 _installafter:
+ifneq ($(OS),Linux)
 	${INSTALL} -d ${DESTDIR}/${LIBEXECDIR}/init.d
+endif
 	${INSTALL} -d ${DESTDIR}/${LIBEXECDIR}/tmp
 	${ECHO} "${VERSION}${GITVER}" > ${DESTDIR}/${LIBEXECDIR}/version

Makefile.inc

@@ -1,3 +1,3 @@
 NAME=		openrc
-VERSION=	0.9.0
+VERSION=	0.10
 PKG=		${NAME}-${VERSION}

README

@@ -12,11 +12,10 @@ LIBNAME=lib64
 DESTDIR=/tmp/openrc-image
 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
@@ -34,20 +33,6 @@ LOCAL_PREFIX should be set when to where user maintained packages are.
 Only set LOCAL_PREFIX if different from PKG_PREFIX.
 PREFIX should be set when OpenRC is not installed to /.
 
-MKRCSYS should be set only if you need to specify a default system
-subtype. The subtype should be set to match the type of environment the
-file is installed into, not the virtualization the environment is
-capable of handling. Here is a list of subtypes and their meanings.
-
-jail	FreeBSD jail
-lxc	Linux container
-openvz	Linux OpenVZ
-prefix	Linux and *BSD prefix system
-uml	UsermodeLinux
-vserver	Linux vserver
-xen0 Linux and NetBSD xen0 Domain
-xenU Linux and NetBSD xenU Domain
-
 If any of the following files exist then we do not overwrite them
 /etc/devd.conf
 /etc/rc

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.

TODO

@@ -1,7 +1,21 @@
-- ensure all forks block, restore and unblock signals. needs review 
+- ensure all forks block, restore and unblock signals. needs review
 
 - add support somehow for optional translations
 
 - oldnet[bridging]: Review setting of bridge configuration on dynamic interface add
 
 - Document rc-depend binary.
+
+- _ifindex is not a reliable means of calculating metrics:
+	_ifindex is used for calculating metrics for new devices but has a major
+	problem: Since it's only the nth entry in /proc/net/dev
+	And devices may be removed from that file, and reordered, you won't always
+	get the same result.
+	If you do:
+	- add eth0 - _ifindex (eth0=0)
+	- add vlan1 - _ifindex (eth0=0,vlan1=1)
+	- add vlan2 - _ifindex (eth0=0,vlan1=1,vlan2=2)
+	- rem vlan1 - _ifindex (eth0=0,vlan2=1)
+	- add vlan3 - _ifindex (eth0=0,vlan2=1,vlan3=2)
+	Now your routing table has entries for both vlan2 and vlan3 with a metric of 2.
+

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}
+staticroute: staticroute${SFX}
-	cp $@.in $@
+	cp $@${SFX} $@
-	[ -e $@.${SOS} ] && cat $@.${SOS} >> $@ || true
-
-staticroute: staticroute.${SOS}
-	cp $@.${SOS} $@

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/adjkerntz

@@ -1,10 +1,10 @@
 # Set CLOCK to "UTC" if your system clock is set to UTC (also known as
-# Greenwich Mean Time).  If your clock is set to the local time, then 
+# Greenwich Mean Time).  If your clock is set to the local time, then
-# set CLOCK to "local".  Note that if you dual boot with Windows, then 
+# set CLOCK to "local".  Note that if you dual boot with Windows, then
 # you should set it to "local".
 clock="UTC"
 
-# If you want to set the Hardware Clock to the current System Time 
+# If you want to set the Hardware Clock to the current System Time
 # during shutdown, then say "YES" here.
 # You normally don't need to do this if you run a ntp daemon.
 clock_systohc="NO"

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/consolefont

@@ -1,9 +1,10 @@
+# The consolefont service is not activated by default. If you need to
+# use it, you should run "rc-update add consolefont boot" as root.
+#
 # consolefont specifies the default font that you'd like Linux to use on the
 # console.  You can find a good selection of fonts in /usr/share/consolefonts;
 # you shouldn't specify the trailing ".psf.gz", just the font name below.
 # To use the default console font, comment out the CONSOLEFONT setting below.
-# This setting is used by the /etc/init.d/consolefont script (NOTE: if you do
-# not want to use it, run "rc-update del consolefont boot" as root).
 consolefont="default8x16"
 
 # consoletranslation is the charset map file to use.  Leave commented to use

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/hwclock

@@ -1,22 +1,20 @@
 # Set CLOCK to "UTC" if your Hardware Clock is set to UTC (also known as
-# Greenwich Mean Time).  If that clock is set to the local time, then 
+# Greenwich Mean Time).  If that clock is set to the local time, then
-# set CLOCK to "local".  Note that if you dual boot with Windows, then 
+# set CLOCK to "local".  Note that if you dual boot with Windows, then
 # you should set it to "local".
 clock="UTC"
 
-# If you want to set the Hardware Clock to the current System Time 
+# If you want the hwclock script to set the system time (software clock)
-# (software clock) during shutdown, then say "YES" here.
+# to match the current hardware clock during bootup, leave this
-# You normally don't need to do this if you run a ntp daemon.
+# commented out.
-clock_systohc="NO"
+# However, you can set this to "NO" ifyou are running a modern kernel
+# with CONFIG_RTC_HCTOSYS set to y and your hardware clock set to UTC.
+#clock_hctosys="YES"
+
+# If you do not want to set the hardware clock to the current system
+# time (software clock) during shutdown, set this to no.
+#clock_systohc="YES"
 
-# If you want to set the system time to the current hardware clock
-# during bootup, then say "YES" here. You do not need this if you are
-# running a modern kernel with CONFIG_RTC_HCTOSYS set to y.
-# Also, be aware that if you set this to "NO", the system time will
-# never be saved to the hardware clock unless you set
-# clock_systohc="YES" above.
-clock_hctosys="YES"
- 
 # If you wish to pass any other arguments to hwclock during bootup,
 # you may do so here. Alpha users may wish to use --arc or --srm here.
 clock_args=""

conf.d/keymaps

@@ -12,7 +12,7 @@ windowkeys="NO"
 extended_keymaps=""
 #extended_keymaps="backspace keypad euro2"
 
-# Tell dumpkeys(1) to interpret character action codes to be 
+# Tell dumpkeys(1) to interpret character action codes to be
 # from the specified character set.
 # This only matters if you set unicode="yes" in /etc/rc.conf.
 # For a list of valid sets, run `dumpkeys --help`

conf.d/moused

@@ -11,6 +11,6 @@
 
 # You can also multiplex the init script for each device like so
 #   ln -s moused /etc/init.d/moused.ums0
-# This enables you to have a config file per mouse (forces moused_device 
+# This enables you to have a config file per mouse (forces moused_device
 # to ums0 in this case) and control each mouse.
 # devd can also start and stop these mice, which laptop users will find handy.

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/run/random-seed"
+urandom_seed="/var/lib/misc/random-seed"

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.BSD.in

@@ -388,6 +388,17 @@
 #
 # ${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

@@ -34,7 +34,7 @@
 # In other words, you probably should DO NOTHING HERE...
 
 # Prefer ifconfig over iproute2
-#modules="ifconfig"
+#modules="!iproute2"
 
 # You can also specify other modules for an interface
 # In this case we prefer udhcpc over dhcpcd
@@ -57,7 +57,7 @@
 
 # If you don't specify an interface then we prefer iproute2 if it's installed
 # To prefer ifconfig over iproute2
-#modules="ifconfig"
+#modules="!iproute2"
 
 # For a static configuration, use something like this
 # (They all do exactly the same thing btw)
@@ -68,6 +68,7 @@
 # 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.
 
@@ -85,6 +86,14 @@
 # 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
@@ -350,7 +359,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.
 
@@ -577,10 +586,27 @@
 #vlan_start_eth0="no"
 
 # If you do the above then you may want to depend on eth0 like so
-# rc_need_vlan1="net.eth0"
+# rc_net_vlan1_need="net.eth0"
 # NOTE: depend functions only work in /etc/conf.d/net
 # and not in profile configs such as /etc/conf.d/net.foo
 
+# Also, you might want to make eth0 not provide net in this case so that
+# dependent services will start when the vlan is active instead of the
+# physical interface.
+# rc_net_eth0_provide="!net"
+
+# 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
@@ -590,14 +616,27 @@
 #slaves_bond0="eth0 eth1 eth2"
 #config_bond0="null" # You may not want to assign an IP the the bond
 
-# You can also configure the bond here, which must be done via sysfs on 2.6
+# Please note, that you should generally NOT try to change the MAC addresses of
-# kernels or newer. See the kernel bonding documentation for a description of
+# a bond interface yourself. If you do so, the kernel and your network switches
-# these options.
+# may not work quite right. It is permissible to set the MAC addresses of bond
+# slaves BEFORE the bond comes up, but not after the bond is up (it will change
+# MAC addresses of the slaves on it's own).
+
+# You can also configure the parameters of the bond here, which must be done
+# via sysfs on 2.6 kernels or newer. The description of all the options can be
+# found in the kernel: /usr/src/linux-*/Documentation/networking/bonding.txt
+# You will probably want the 'mode' option at the least.
+# Some possible parameters: mode fail_over_mac arp_validate arp_interval
+# arp_ip_target downdelay updelay lacp_rate ad_select xmit_hash_policy
+# num_grat_arp num_unsol_na miimon primary primary_reselect use_carrier
+# active_slave queue_id all_slaves_active resend_igmp min_links
+#mode_bond0="round-robin"
+#miimon_bond0="100"
 #arp_ip_target_bond0="+26.0.0.0"
 
 # If any of the slaves require extra configuration - for example wireless or
 # ppp devices - we need to depend function on the bonded interfaces
-#rc_need_bond0="net.eth0 net.eth1"
+#rc_net_bond0_need="net.eth0 net.eth1"
 
 
 #-----------------------------------------------------------------------------
@@ -714,7 +753,7 @@
 # If the link require extra configuration - for example wireless or
 # RFC 268 bridge - we need to depend on the bridge so they get
 # configured correctly.
-#rc_need_ppp0="net.nas0"
+#rc_net_ppp0_need="net.nas0"
 
 #WARNING: if MTU of the PPP interface is less than 1500 and you use this
 #machine as a router, you should add the following rule to your firewall
@@ -754,6 +793,8 @@
 
 #-----------------------------------------------------------------------------
 # MAC changer
+# Warning: Do NOT use this on bonding interfaces! Bonding changes MACs itself.
+#
 # To set a specific MAC address
 #mac_eth0="00:11:22:33:44:55"
 
@@ -778,7 +819,7 @@
 
 #-----------------------------------------------------------------------------
 # TUN/TAP
-# For TUN/TAP support emerge net-misc/openvpn or sys-apps/usermode-utilities
+# For TUN/TAP support install iproute2, openvpn or 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
@@ -789,6 +830,9 @@
 #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"
@@ -823,13 +867,13 @@
 
 # If any of the ports require extra configuration - for example wireless or
 # ppp devices - we need to depend on them like so.
-#rc_need_br0="net.eth0 net.eth1"
+#rc_net_br0_need="net.eth0 net.eth1"
 
 # Below is an example of configuring the bridge
 # Consult "man brctl" for more details
-#brctl_br0="setfd 0
+#brctl_br0="setfd 15
-#sethello 0
+#sethello 2
-#stp off"
+#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
@@ -874,7 +918,7 @@
 # link_6to4="eth0"		# Interface to base its addresses on
 # config_6to4="ip6to4"
 # You may want to depend on eth0 like so
-#rc_need_6to4="net.eth0"
+#rc_net_6to4_need="net.eth0"
 # To ensure that eth0 is configured before 6to4. Of course, the tunnel could be
 # any name and this also works for any configured interface.
 # NOTE: If you're not using iproute2 then your 6to4 tunnel has to be called
@@ -917,6 +961,8 @@
 # /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
@@ -931,6 +977,11 @@
 #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
@@ -1080,6 +1131,17 @@
 #
 # ${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,21 +1,28 @@
 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)
-# 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:^:\#:'
-MKRCSYS =
-endif
 rc.conf: rc.conf.in rc.conf.${OS}
 	${SED} ${SED_REPLACE} ${SED_EXTRA} $^ > $@

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.FreeBSD

@@ -4,11 +4,9 @@
 # This is the subsystem type. Valid options on FreeBSD:
 # ""        - nothing special
 # "jail"    - FreeBSD jails
-# "prefix"  - Prefix
+# If this is commented out, automatic detection will be used.
-# If this is commented out, automatic detection will be attempted.
-# Note that automatic detection does not work in a prefix environment.
 #
 # This should be set to the value representing the environment this file is
 # PRESENTLY in, not the virtualization the environment is capable of.
-rc_sys="@RC_SYS_DEFAULT@"
+#rc_sys=""
 

etc/rc.conf.Linux

@@ -5,20 +5,16 @@
 # ""        - nothing special
 # "lxc"     - Linux Containers
 # "openvz"  - Linux OpenVZ
-# "prefix"  - Prefix
 # "uml"     - Usermode Linux
 # "vserver" - Linux vserver
 # "xen0"    - Xen0 Domain
 # "xenU"    - XenU Domain
-# If this is commented out, automatic detection will be attempted.
+# If this is commented out, automatic detection will be used.
-# Note that autodetection will not work in a prefix environment or in a
-# linux container.
 #
 # This should be set to the value representing the environment this file is
 # PRESENTLY in, not the virtualization the environment is capable of.
-rc_sys="@RC_SYS_DEFAULT@"
+#rc_sys=""
 
 # 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.NetBSD

@@ -3,13 +3,11 @@
 
 # This is the subsystem type. Valid options on NetBSD:
 # ""        - nothing special
-# "prefix"  - Prefix
 # "xen0"    - Xen0 Domain
 # "xenU"    - XenU Domain
-# If this is commented out, automatic detection will be attempted.
+# If this is commented out, automatic detection will be used.
-# Note that automatic detection does not work in a prefix environment.
 #
 # This should be set to the value representing the environment this file is
 # PRESENTLY in, not the virtualization the environment is capable of.
-rc_sys="@RC_SYS_DEFAULT@"
+#rc_sys=""
 

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/.gitignore

@@ -11,6 +11,7 @@ network
 root
 savecache
 swap
+swapfiles
 sysctl
 urandom
 devfs

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 \
+	network.in root.in savecache.in staticroute.in swap.in swapfiles.in \
-	sysctl.in urandom.in
+	swclock.in sysctl.in urandom.in ${SRCS-${OS}}
 BIN=	${OBJS}
 
-# Build our old net foo or not
+INSTALLAFTER=	_installafter_net.lo
-ifeq (${MKOLDNET},yes)
+CLEANFILES+=	net.lo
-_OLDNET=	net.lo
+TARGETS+=	net.lo
-endif
-_NET_LO=	${_OLDNET}
-
-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
+
+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/adjkerntz.in

@@ -22,7 +22,7 @@ depend()
 	   [ "$clock" != "UTC" -a ! -e /etc/wall_cmos_clock ]; then
 		need root
 	fi
-	keyword -jail -prefix
+	keyword -jail
 }
 
 start()

init.d/bootmisc.in

@@ -7,15 +7,11 @@ depend()
 	need localmount
 	before logger
 	after clock sysctl
-	keyword -prefix -timeout
+	keyword -timeout
-}
-
-dir_writeable()
-{
-	mkdir "$1"/.test.$$ 2>/dev/null && rmdir "$1"/.test.$$
 }
 
 : ${wipe_tmp:=${WIPE_TMP:-yes}}
+: ${log_dmesg:=${LOG_DMESG:-yes}}
 
 cleanup_tmp_dir()
 {
@@ -24,7 +20,7 @@ cleanup_tmp_dir()
 	if ! [ -d "$dir" ]; then
 		mkdir -p "$dir" || return $?
 	fi
-	dir_writeable "$dir" || return 1
+	checkpath -W "$dir" || return 1
 	chmod a+rwt "$dir" 2> /dev/null
 	cd "$dir" || return 1
 	if yesno $wipe_tmp; then
@@ -71,6 +67,26 @@ 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
@@ -78,8 +94,16 @@ start()
 
 	local logw=false runw=false extra=
 	# Ensure that our basic dirs exist
-	[ "$RC_UNAME" = Linux ] && extra=/var/lib/misc # Satisfy Linux FHS
+	if [ "$RC_UNAME" = Linux ]; then
-	for x in /var/log /var/run /tmp $extra; do
+		# 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
 		if ! [ -d $x ]; then
 			if ! mkdir -p $x; then
 				eend 1 "failed to create needed directory $x"
@@ -88,7 +112,12 @@ start()
 		fi
 	done
 
-	if dir_writeable /var/run; then
+	if [ "$RC_UNAME" = Linux -a -d /run ] && false; then
+		migrate_to_run	/var/lock /run/lock
+		migrate_to_run	/var/run /run
+	fi
+
+	if checkpath -W /var/run; then
 		ebegin "Creating user login records"
 		local xtra=
 		[ "$RC_UNAME" = NetBSD ] && xtra=x
@@ -130,7 +159,7 @@ start()
 		cleanup_tmp_dir "$tmp"
 	done
 
-	if dir_writeable /tmp; then
+	if checkpath -W /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,15 +171,16 @@ start()
 		fi
 	fi
 
-	if $logw || dir_writeable /var/log; then
+	if yesno $log_dmesg; then
-		# Create an 'after-boot' dmesg log
+		if $logw || checkpath -W /var/log; then
-		if [ "$RC_SYS" != VSERVER -a "$RC_SYS" != OPENVZ ]; then
+			# Create an 'after-boot' dmesg log
-			dmesg > /var/log/dmesg
+			if [ "$RC_SYS" != VSERVER -a "$RC_SYS" != OPENVZ ]; then
-			chmod 640 /var/log/dmesg
+				dmesg > /var/log/dmesg
+				chmod 640 /var/log/dmesg
+			fi
 		fi
 	fi
 
-	[ -w /etc/nologin ] && rm -f /etc/nologin
 	return 0
 }
 

init.d/consolefont.in

@@ -8,7 +8,7 @@ depend()
 {
 	need localmount termencoding
 	after hotplug bootmisc
-	keyword -openvz -prefix -uml -vserver -xenu -lxc
+	keyword -openvz -uml -vserver -xenu -lxc
 }
 
 start()
@@ -49,12 +49,12 @@ start()
 			retval=1
 			break
 		fi
-		x=$(($x + 1))
+		: $(( x += 1 ))
 	done
 	eend $retval
 
 	# Store the last font so we can use it ASAP on boot
-	if [ $retval -eq 0 -a -w "$RC_LIBEXECDIR" ]; then
+	if [ $retval -eq 0 ] && checkpath -W "$RC_LIBEXECDIR"; then
 		mkdir -p "$RC_LIBEXECDIR"/console
 		for font in /usr/share/consolefonts/"$consolefont".*; do
 			:

init.d/devd.in

@@ -10,7 +10,7 @@ depend() {
 	need localmount
 	after bootmisc
 	before net.lo0
-	keyword -jail -prefix
+	keyword -jail
 }
 
 start_pre() {

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/devfs.in

@@ -6,7 +6,7 @@ description="Mount system critical filesystems in /dev."
 
 depend() {
 	use dev
-	keyword -prefix -vserver
+	keyword -vserver
 }
 
 start() {

init.d/dumpon.in

@@ -6,7 +6,7 @@ description="Configures a specific kernel dump device."
 
 depend() {
 	need swap
-	keyword -jail -prefix
+	keyword -jail
 }
 
 start() {
@@ -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

@@ -9,7 +9,7 @@ _IFS="
 depend()
 {
 	use dev clock modules
-	keyword -jail -openvz -prefix -timeout -vserver -lxc
+	keyword -jail -openvz -timeout -vserver -lxc
 }
 
 _abort() {
@@ -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,21 @@ 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"
+		local skiptypes x
-		if [ -z "$fsck_passno" ]; then
+		for x in $net_fs_list $extra_net_fs_list; do
+			skiptypes="${skiptypes}no${x},"
+		done
+		skiptypes="${skiptypes}noopts=_netdev"
+		fsck_opts="$fsck_opts -C0 -T -t $skiptypes"
+		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 +107,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/hostid.in

@@ -9,7 +9,7 @@ depend()
 {
 	use root
 	before devd net
-	keyword -jail -prefix
+	keyword -jail
 }
 
 _set()

init.d/hostname.in

@@ -5,12 +5,38 @@
 description="Sets the hostname of the machine."
 
 depend() {
-	keyword -prefix -lxc
+	need root
 }
 
 start()
 {
 	hostname=${hostname-${HOSTNAME-localhost}}
+	out=$hostname
+	short=${hostname%%.*}
+	if [ "$short" != "$hostname" ]; then
+		out="$out $short"
+	fi
+	if [ "$nisdomainname" != "" ]; then
+		ebegin "Setting NIS domain name to $nisdomainname"
+		nisdomainname $nisdomainname
+		eend $? "Failed to set the NIS domain name"
+	fi
+	if [ "$short" != "localhost" ]; then
+		out="$out localhost"
+	fi
+	if [ "$hostname" != "localhost.localdomain" ]; then
+		out="$out localhost.localdomain"
+	fi
+	[ -n "$aliases" ] && out="$out $aliases"
+	ebegin "Configuring /etc/hosts"
+	[ -e /etc/hosts ] && sed -i -e '/[[:space:]]*127.0.0.1[[:space:]]/d' -e '/[[:space:]]*::1[[:space:]]/d' /etc/hosts
+	cat <<END >> /etc/hosts
+127.0.0.1	$out
+::1		$out
+END
+	chmod 0644 /etc/hosts
+	eend $?
+	[ "$RC_SYS" = "LXC" ] && return 0
 	ebegin "Setting hostname to $hostname"
 	hostname "$hostname"
 	eend $? "Failed to set the hostname"

init.d/hwclock.in

@@ -28,7 +28,7 @@ depend()
 	else
 		before *
 	fi
-	keyword -openvz -prefix -uml -vserver -xenu -lxc
+	keyword -openvz -uml -vserver -xenu -lxc
 }
 
 setupopts()
@@ -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
@@ -94,12 +94,12 @@ start()
 		"$utc_cmd" != --utc -o \
 		-n "$clock_args" ];
 	then
-		if yesno $clock_hctosys; then
+		if yesno ${clock_hctosys:-YES}; then
 			_hwclock --hctosys $utc_cmd $clock_args
 		else
 			_hwclock --systz $utc_cmd $clock_args
 		fi
-		retval=$(($retval + $?))
+		: $(( retval += $? ))
 	fi
 
 	eend $retval "Failed to set the system clock"
@@ -111,7 +111,7 @@ stop()
 {
 	# Don't tweak the hardware clock on LiveCD halt.
 	[ -n "$CDBOOT" ] && return 0
-	yesno $clock_systohc || return 0
+	yesno ${clock_systohc:-YES} || return 0
 
 	local retval=0 errstr=""
 	setupopts

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

@@ -8,7 +8,7 @@ depend()
 {
 	need localmount termencoding
 	after bootmisc
-	keyword -openvz -prefix -uml -vserver -xenu -lxc
+	keyword -openvz -uml -vserver -xenu -lxc
 }
 
 start()
@@ -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
 
@@ -63,7 +63,7 @@ start()
 	fi
 
 	# Save the keymapping for use immediately at boot
-	if [ -w "$RC_LIBEXECDIR" ]; then
+	if checkpath -W "$RC_LIBEXECDIR"; then
 		mkdir -p "$RC_LIBEXECDIR"/console
 		dumpkeys >"$RC_LIBEXECDIR"/console/keymap
 	fi

init.d/killprocs.in

@@ -4,11 +4,6 @@
 
 description="Kill all processes so we can unmount disks cleanly."
 
-depend()
-{
-	keyword -prefix
-}
-
 start()
 {
 	ebegin "Terminating remaining processes"

init.d/localmount.in

@@ -9,7 +9,7 @@ depend()
 	need fsck
 	use lvm modules mtab
 	after lvm modules
-	keyword -jail -openvz -prefix -vserver -lxc
+	keyword -jail -vserver -lxc
 }
 
 start()
@@ -33,9 +33,14 @@ start()
 
 stop()
 {
+	yesno $RC_GOINGDOWN || return 0
 	# 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 IFS="$IFS:"
 	for x in $no_umounts $RC_NO_UMOUNTS; do
@@ -43,7 +48,7 @@ stop()
 	done
 
 	if [ "$RC_UNAME" = Linux ]; then
-		no_umounts_r="$no_umounts_r|/proc|/proc/.*|/run|/sys|/sys/.*"
+		no_umounts_r="$no_umounts_r|/proc|/proc/.*|/run|/sys|/sys/.*|/usr"
 	fi
 	no_umounts_r="^($no_umounts_r)$"
 
@@ -69,7 +74,7 @@ stop()
 	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

@@ -7,7 +7,7 @@ extra_commands="restore"
 depend()
 {
 	need localmount
-	keyword -jail -prefix
+	keyword -jail
 }
 
 restore()
@@ -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

@@ -7,7 +7,7 @@ description="Loads a user defined list of kernel modules."
 depend()
 {
 	use isapnp
-	keyword -openvz -prefix -vserver -lxc
+	keyword -openvz -vserver -lxc
 }
 
 start()
@@ -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

@@ -7,7 +7,7 @@ description="Re-mount filesytems read-only for a clean reboot."
 depend()
 {
 	need killprocs savecache
-	keyword -prefix -openvz -vserver -lxc
+	keyword -openvz -vserver -lxc
 }
 
 start()
@@ -19,8 +19,12 @@ 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/.*|/run|${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 IFS="$IFS:"
 	for x in $no_umounts $RC_NO_UMOUNTS; do
@@ -34,7 +38,7 @@ start()
 	[ -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

@@ -16,7 +16,7 @@ depend()
 {
 	need localmount
 	after bootmisc
-	keyword -jail -prefix
+	keyword -jail
 }
 
 start()
@@ -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

@@ -7,12 +7,11 @@ description="Update /etc/mtab to match what the kernel knows about"
 depend()
 {
 	need root
-	keyword -prefix
 }
 
 start()
 {
-	if [ -l /etc/mtab ]
+	if [ -L /etc/mtab ]
 	then
 		einfo "Skipping mtab update (mtab is a symbolic link)"
 		return 0

init.d/net.lo.in

@@ -19,13 +19,18 @@ depend()
 	local IFVAR=$(shell_var "${IFACE}")
 
 	need localmount
+	if [ "$RC_UNAME" = Linux ]; then
+		need sysfs
+	fi
 	after bootmisc
-	provide net
+	keyword -jail -vserver
-	keyword -jail -prefix -vserver
 
 	case "${IFACE}" in
-		lo|lo0);;
+		lo|lo0) provide lo;;
-		*) after net.lo net.lo0;;
+		*)
+			after net.lo net.lo0 dbus
+			provide net
+			;;
 	esac
 
 	if [ "$(command -v "depend_${IFVAR}")" = "depend_${IFVAR}" ]; then
@@ -37,11 +42,23 @@ depend()
 		eval prov=\$rc_${dep}_${IFVAR}
 		if [ -n "${prov}" ]; then
 			${dep} ${prov}
+			ewarn "rc_${dep}_${IFVAR} is deprecated."
+			ewarn "Please use rc_net_${IFVAR}_${dep} instead."
 		fi
 	done
 }
 
 # 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=
@@ -60,10 +77,7 @@ _get_array()
 		esac
 	fi
 
-	eval _a=\$$1
+	_array_helper $1
-	printf "%s" "${_a}"
-	printf "\n"
-	[ -n "${_a}" ]
 }
 
 # Flatten bash arrays to simple strings
@@ -84,10 +98,7 @@ _flatten_array()
 		esac
 	fi
 
-	eval _a=\$$1
+	_array_helper $1
-	printf "%s" "${_a}"
-	printf "\n"
-	[ -n "${_a}" ]
 }
 
 _wait_for_carrier()
@@ -111,7 +122,7 @@ _wait_for_carrier()
 			eend 0
 			return 0
 		fi
-		timeout=$((${timeout} - 1))
+		: $(( timeout -= 1 ))
 		[ "${efunc}" = "einfon" ] && printf "."
 	done
 
@@ -140,9 +151,9 @@ _netmask2cidr()
 	local i= len=
 	local IFS=.
 	for i in $1; do
-		while [ ${i} != "0" ]; do
+		while [ ${i} -ne 0 ]; do
-			len=$((${len} + ${i} % 2))
+			: $(( len += i % 2 ))
-			i=$((${i} >> 1))
+			: $(( i >>= 1 ))
 		done
 	done
 
@@ -165,6 +176,36 @@ _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}")"
@@ -273,7 +314,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}"
 	)
@@ -300,18 +341,17 @@ _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
 
 		eval set -- \$module_${i}_program
 		if [ -n "$1" ]; then
-			x=
+			if ! _program_available "$@" >/dev/null; then
-			for x; do
+				vewarn "Skipping module $mod due to missing program: $@"
-				[ -x "${x}" ] && break
+				continue
-			done
+			fi
-			[ -x "${x}" ] || continue
 		fi
 		if ${starting}; then
 			eval set -- \$module_${i}_program_start
@@ -319,15 +359,10 @@ _load_modules()
 			eval set -- \$module_${i}_program_stop
 		fi
 		if [ -n "$1" ]; then
-			x=
+			if ! _program_available "$@" >/dev/null; then
-			for x; do
+				vewarn "Skipping module $mod due to missing program: $@"
-				case "${x}" in
+				continue
-					/*) [ -x "${x}" ] && break;;
+			fi
-					*) type "${x}" >/dev/null 2>&1 && break;;
-				esac
-				unset x
-			done
-			[ -n "${x}" ] || continue
 		fi
 
 		eval provides=\$module_${i}_provide
@@ -403,16 +438,18 @@ _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.
-		case "$2" in
+		# If the NEXT argument is a v4 or v6 address, it's the next config.
-			netmask|broadcast|brd|brd+|peer|pointopoint)
+		# Otherwise, it's arguments to the first config...
-				local IFS="$__IFS"
+		if [ "${2#*.*}" = "${2}" -a "${2#*:*}" = "${2}" ]; then
-				set -- ${config}
+			# Not an IPv4/IPv6
-				;;
+			local IFS="$__IFS"
-		esac
+			set -- ${config}
+		fi
 	fi
 
 	# Ensure that loopback has the correct address
@@ -434,7 +471,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}=
@@ -442,7 +479,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}=
@@ -484,7 +521,9 @@ start()
 {
 	local IFACE=${RC_SVCNAME#*.} oneworked=false fallback=false module=
 	local IFVAR=$(shell_var "${IFACE}") cmd= our_metric=
-	local metric=0
+	local metric=0 _up_before_preup
+	eval _up_before_preup="\$up_before_preup_${IFVAR}"
+	[ -z "${_up_before_preup}" ] && _up_before_preup=$up_before_preup
 
 	einfo "Bringing up interface ${IFACE}"
 	eindent
@@ -498,7 +537,7 @@ start()
 	# available in preup and afterwards incase the user inadvertently
 	# brings it down
 	if [ "$(command -v preup)" = "preup" ]; then
-		_up 2>/dev/null
+		yesno "${_up_before_preup:-yes}" && _up 2>/dev/null
 		ebegin "Running preup"
 		eindent
 		preup || return 1
@@ -537,7 +576,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
@@ -577,11 +616,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

@@ -35,7 +35,7 @@ depend()
 	need net $pmap
 	use afc-client amd autofs openvpn
 	use dns nfs nfsmount portmap rpcbind rpc.statd rpc.lockd
-	keyword -jail -prefix -vserver
+	keyword -jail -vserver
 }
 
 start()

init.d/network.in

@@ -13,7 +13,7 @@ depend()
 	need localmount
 	after bootmisc
 	provide net
-	keyword -jail -prefix -vserver
+	keyword -jail -vserver
 }
 
 uniqify()
@@ -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/newsyslog.in

@@ -7,7 +7,6 @@ required_files="/etc/newsyslog.conf"
 depend()
 {
 	need localmount
-	keyword -prefix
 }
 
 start()

init.d/numlock.in

@@ -9,7 +9,7 @@ ttyn=${rc_tty_number:-${RC_TTY_NUMBER:-12}}
 depend()
 {
 	need localmount
-	keyword -openvz -prefix -vserver -lxc
+	keyword -openvz -vserver -lxc
 }
 
 _setleds()
@@ -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/pf.in

@@ -11,7 +11,7 @@ extra_started_commands="reload"
 
 depend() {
 	need localmount
-	keyword -jail -prefix
+	keyword -jail
 }
 
 start()

init.d/powerd.in

@@ -12,7 +12,7 @@ depend()
 	need localmount
 	use logger
 	after bootmisc
-	keyword -jail -prefix
+	keyword -jail
 }
 
 start_pre()

init.d/procfs.in

@@ -8,7 +8,7 @@ depend()
 {
 	use modules devfs
 	need localmount
-	keyword -openvz -prefix -vserver -lxc
+	keyword -openvz -vserver -lxc
 }
 
 start()
@@ -20,6 +20,29 @@ start()
 
 	[ -e /proc/filesystems ] || return 0
 
+	# Setup Kernel Support for miscellaneous Binary Formats
+	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
+			if eend $? ; then
+				local fmts
+				ebegin "Loading custom binary format handlers"
+				fmts=$(grep -hsv -e '^[#;]' -e '^[[:space:]]*$' \
+					/run/binfmt.d/*.conf \
+					@SYSCONFDIR@/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
+
+	[ "$RC_SYS" = "OPENVZ" ] && return 0
+
 	# Check what USB fs the kernel support.  Currently
 	# 2.5+ kernels, and later 2.4 kernels have 'usbfs',
 	# while older kernels have 'usbdevfs'.
@@ -37,27 +60,6 @@ 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 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 $?
-		fi
-	fi
-
 	# Setup Kernel Support for SELinux
 	if [ -d /selinux ] && ! mountinfo -q /selinux; then
 		if grep -qs selinuxfs /proc/filesystems; then

init.d/rc-enabled.in

@@ -7,7 +7,6 @@ depend()
 	need localmount net
 	after *
 	before local
-	keyword -prefix
 }
 
 start()
@@ -33,7 +32,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 +45,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/root.in

@@ -7,26 +7,47 @@ description="Mount the root fs read/write"
 depend()
 {
 	need fsck
-	keyword -jail -openvz -prefix -vserver -lxc
+	keyword -jail -openvz -vserver -lxc
 }
 
 start()
 {
 	case ",$(fstabinfo -o /)," in
-	*,ro,*) return 0;;
+		*,ro,*)
+		;;
+		*)
+			# Check if the rootfs isn't already writable.
+			if checkpath -W /; then
+				rm -f /fastboot /forcefsck
+			else
+				ebegin "Remounting root filesystem read/write"
+				case "$RC_UNAME" in
+					Linux)
+						mount -n -o remount,rw /
+					;;
+					*)
+						mount -u -o rw /
+					;;
+				esac
+				eend $? "Root filesystem could not be mounted read/write"
+				if [ $?  -eq 0 ]; then
+					rm -f /fastboot /forcefsck
+				fi
+			fi
+		;;
 	esac
 
-	if echo 2>/dev/null >/.test.$$; then
+	ebegin "Remounting filesystems"
-		rm -f /.test.$$ /fastboot /forcefsck
+	local mountpoint
-		return 0
+	for mountpoint in $(fstabinfo); do
-	fi
+		case "${mountpoint}" in
-
+			/)
-	ebegin "Remounting root filesystem read/write"
+			;;
-	case "$RC_UNAME" in
+			/*)
-		Linux)	mount -n -o remount,rw /;;
+				mountinfo -q "${mountpoint}" && \
-		*)	mount -u -o rw /;;
+					fstabinfo --remount "${mountpoint}"
-	esac
+			;;
-	if eend $? "Root filesystem could not be mounted read/write"; then
+		esac
-		rm -f /fastboot /forcefsck
+	done
-	fi
+	eend 0
 }

init.d/savecore.in

@@ -7,7 +7,7 @@ description="Saves a kernel dump."
 depend()
 {
 	need localmount
-	keyword -jail -prefix
+	keyword -jail
 }
 
 start()

init.d/staticroute.in

@@ -12,7 +12,7 @@ depend()
 {
 	provide net
 	use network
-	keyword -jail -prefix -vserver
+	keyword -jail -vserver
 }
 
 pre_flight_checks()
@@ -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/swap-blk.in

@@ -5,7 +5,7 @@
 depend()
 {
 	before fsck
-	keyword -jail -prefix
+	keyword -jail
 }
 
 start()

init.d/swap.in

@@ -4,14 +4,15 @@
 
 depend()
 {
-	need localmount
+	before localmount
-	keyword -jail -openvz -prefix -vserver -lxc
+	keyword -jail -openvz -vserver -lxc
 }
 
 start()
 {
 	ebegin "Activating swap devices"
 	case "$RC_UNAME" in
+		Linux)		swapon -a -e >/dev/null;;
 		NetBSD|OpenBSD) swapctl -A -t noblk >/dev/null;;
 		*)		swapon -a >/dev/null;;
 	esac
@@ -23,7 +24,7 @@ stop()
 	ebegin "Deactivating swap devices"
 
 	# Try to unmount all tmpfs filesystems not in use, else a deadlock may
-	# occure. As $RC_SVCDIR may also be tmpfs we cd to it to lock it
+	# occur. As $RC_SVCDIR may also be tmpfs we cd to it to lock it
 	cd "$RC_SVCDIR"
 	umount -a -t tmpfs 2>/dev/null
 

init.d/swapfiles.in

@@ -0,0 +1,45 @@
+#!@PREFIX@/sbin/runscript
+# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.
+
+depend()
+{
+	need localmount
+	keyword -jail -openvz -prefix -vserver -lxc
+}
+
+start()
+{
+	ebegin "Activating additional swap space"
+	case "$RC_UNAME" in
+		NetBSD|OpenBSD) swapctl -A -t noblk >/dev/null;;
+		*)		swapon -a >/dev/null;;
+	esac
+	eend 0 # If swapon has nothing todo it errors, so always return 0
+}
+
+stop()
+{
+	ebegin "Deactivating additional swap space"
+
+	# Try to unmount all tmpfs filesystems not in use, else a deadlock may
+	# occur. As $RC_SVCDIR may also be tmpfs we cd to it to lock it
+	# fixme: Do we need this here since we are only unmounting swap files
+	# and loopback swap?
+	cd "$RC_SVCDIR"
+	umount -a -t tmpfs 2>/dev/null
+
+	case "$RC_UNAME" in
+		Linux)
+			while read filename type rest; do
+				case "$type" in
+					file) swapoff $filename >/dev/null;;
+				esac
+				case "$filename" in
+					/dev/loop*) swapoff $filename >/dev/null;;
+				esac
+			done < /proc/swaps
+			;;
+	esac
+	eend 0
+}

init.d/swclock.in

@@ -8,7 +8,7 @@ depend()
 {
 	before *
 	provide clock
-	keyword -openvz -prefix -uml -vserver -xenu -lxc
+	keyword -openvz -uml -vserver -xenu -lxc
 }
 
 # swclock is an OpenRC built in

init.d/syscons.in

@@ -4,7 +4,7 @@
 
 depend() {
 	need localmount
-	keyword -jail -prefix
+	keyword -jail
 }
 
 start() {

init.d/sysctl.BSD.in

@@ -5,7 +5,6 @@
 depend()
 {
 	before bootmisc logger
-	keyword -prefix
 }
 
 start()
@@ -14,7 +13,7 @@ start()
 	local retval=0 var= comments= conf=
 	ebegin "Configuring kernel parameters"
 	eindent
-	for conf in /etc/sysctl.d/*.conf /etc/sysctl.conf; do
+	for conf in @SYSCONFDIR@/sysctl.conf @SYSCONFDIR@/sysctl.d/*.conf; do
 		if [ -r "$conf" ]; then
 			vebegin "applying $conf"
 			while read var comments; do

init.d/sysctl.Linux.in

@@ -5,7 +5,7 @@
 depend()
 {
 	before bootmisc logger
-	keyword -prefix -vserver
+	keyword -lxc -vserver
 }
 
 start()
@@ -15,12 +15,20 @@ start()
 	ebegin "Configuring kernel parameters"
 	eindent
 
-	for conf in /etc/sysctl.d/*.conf /etc/sysctl.conf; do
+	# default sysctl System V max shared memory to 1/4 of RAM:
+	mem_bytes=`awk '/MemTotal:/ { printf "%0.f",$2 * 1024}' /proc/meminfo`
+	mem_max=`expr $mem_bytes / 4` 
+	page_size=`getconf PAGE_SIZE`
+	shmall=`expr $mem_bytes / $page_size`
+	sysctl kernel.shmmax=$mem_max > /dev/null
+	sysctl kernel.shmall=$shmall > /dev/null
+
+	for conf in @SYSCONFDIR@/sysctl.conf @SYSCONFDIR@/sysctl.d/*.conf; do
 		if [ -r "$conf" ]; then
 			vebegin "applying $conf"
-			if ! err=$(sysctl -q -p "$conf" 2>&1) ; then
+			if ! err=$(sysctl -p "$conf" 2>&1 >/dev/null) ; then
 				errs="${errs} ${err}"
-				sysctl -q -e -p "${conf}"
+				sysctl -e -p "${conf}" >/dev/null
 			fi
 			veend $? || retval=1
 		fi

init.d/sysfs.in

@@ -6,7 +6,7 @@ description="Mount the sys filesystem."
 
 depend()
 {
-	keyword -prefix -vserver
+	keyword -vserver
 }
 
 mount_sys()
@@ -50,6 +50,47 @@ 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} && [ -e /proc/cgroups ] && \
+		mountinfo -q /sys/fs/cgroup || return 0
+
+	local agent="@LIBEXECDIR@/sh/cgroup-release-agent.sh"
+	mkdir /sys/fs/cgroup/openrc
+	mount -n -t cgroup \
+		-o none,nodev,noexec,nosuid,name=openrc,release_agent="$agent" \
+		openrc /sys/fs/cgroup/openrc
+	echo 1 > /sys/fs/cgroup/openrc/notify_on_release
+	while read name hier groups enabled rest; do
+		case "${enabled}" in
+			1)	mkdir /sys/fs/cgroup/${name}
+				mount -n -t cgroup -o nodev,noexec,nosuid,${name} \
+					${name} /sys/fs/cgroup/${name}
+				;;
+		esac
+	done < /proc/cgroups
 }
 
 start()
@@ -59,6 +100,11 @@ start()
 	retval=$?
 	if [ $retval -eq 0 ]; then
 		mount_misc
+		retval=$?
+	fi
+	if [ $retval -eq 0 ]; then
+		mount_cgroups
+		retval=$?
 	fi
 	return $retval
 }

init.d/syslogd.in

@@ -16,5 +16,4 @@ depend()
 	use net newsyslog
 	need localmount
 	after bootmisc
-	keyword -prefix
 }

init.d/termencoding.in

@@ -9,8 +9,8 @@ ttyn=${rc_tty_number:-${RC_TTY_NUMBER:-12}}
 
 depend()
 {
-	keyword -openvz -prefix -uml -vserver -xenu
+	keyword -lxc -openvz -uml -vserver -xenu
-	need root
+	use root
 	after bootmisc
 }
 
@@ -31,11 +31,11 @@ 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
-	if [ -w "$RC_LIBEXECDIR" ]; then
+	if checkpath -W "$RC_LIBEXECDIR"; then
 		mkdir -p "$RC_LIBEXECDIR"/console
 		if yesno ${unicode:-${UNICODE}}; then
 			echo "" > "$RC_LIBEXECDIR"/console/unicode

init.d/ttys.in

@@ -5,7 +5,6 @@
 depend()
 {
 	after fsck
-	keyword -prefix
 }
 
 start()

init.d/urandom.in

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

init.d/wscons.in

@@ -5,7 +5,6 @@
 depend()
 {
 	need localmount
-	keyword -prefix
 }
 
 start()

man/Makefile

@@ -27,7 +27,7 @@ install:
 	for man in ${MAN3}; do \
 		${INSTALL} -m ${MANMODE} "$$man" ${DESTDIR}/${MANDIR}/man3 || exit $$?; \
 		${MAKE_LINKS} \
-	done	
+	done
 	${INSTALL} -d ${DESTDIR}/${MANDIR}/man8
 	for man in ${MAN8}; do \
 		${INSTALL} -m ${MANMODE} "$$man" ${DESTDIR}/${MANDIR}/man8 || exit $$?; \

man/einfo.3

@@ -115,7 +115,7 @@ to true.
 These functions are designed to output a whole line, so they also
 append a newline to the string. To stop this behaviour, you can use the
 functions
-.Fn einfon , 
+.Fn einfon ,
 .Fn ewarnn ,
 .Fn eerrorn ,
 .Fn einfovn ,
@@ -149,7 +149,7 @@ does the same as
 .Fn eend
 but prints
 .Fa msg
-instead of ok or !! in the color 
+instead of ok or !! in the color
 .Fa color
 at the column
 .Fa col .

man/rc-service.8

@@ -26,7 +26,7 @@
 .Os OpenRC
 .Sh NAME
 .Nm rc-service
-.Nd locate and run an OpenRC service with the given arguments 
+.Nd locate and run an OpenRC service with the given arguments
 .Sh SYNOPSIS
 .Nm
 .Op Fl i , -ifexists
@@ -41,7 +41,7 @@
 .Fl r , -resolve
 .Ar service
 .Sh DESCRIPTION
-Service scripts could be in different places on different systems. 
+Service scripts could be in different places on different systems.
 .Nm
 locates the specified service and runs it with the given arguments.
 If

man/rc-status.8

@@ -33,8 +33,8 @@
 .Op Ar runlevel
 .Sh DESCRIPTION
 .Nm
-gathers and displays information about the status of services 
+gathers and displays information about the status of services
-in different runlevels.  The default behavior is to show information 
+in different runlevels.  The default behavior is to show information
 about the current runlevel and any unassigned services that are not stopped,
 but any runlevel can be quickly examined.
 .Pp

man/rc-update.8

@@ -26,7 +26,7 @@
 .Os OpenRC
 .Sh NAME
 .Nm rc-update
-.Nd add and remove services to and from a runlevel 
+.Nd add and remove services to and from a runlevel
 .Sh SYNOPSIS
 .Nm
 .Op Fl s , -stack
@@ -44,7 +44,7 @@
 .Ar show
 .Op Ar runlevel ...
 .Sh DESCRIPTION
-OpenRC uses named runlevels.  Rather than editing some obscure 
+OpenRC uses named runlevels.  Rather than editing some obscure
 file or managing a directory of symlinks,
 .Nm
 exists to quickly add or delete services to and from from different runlevels.

man/rc_deptree.3

@@ -32,7 +32,7 @@
 .Sh LIBRARY
 Run Command library (librc, -lrc)
 .Sh SYNOPSIS
-.In rc.h 
+.In rc.h
 .Ft bool Fn rc_deptree_update void
 .Ft bool Fn rc_deptree_update_needed void
 .Ft RC_DEPTREE Fn rc_deptree_load void
@@ -77,7 +77,7 @@ loads the deptree and returns a pointer to it which needs to be freed by
 when done.
 .Pp
 .Fn rc_deptree_depend ,
-.Fn rc_deptree_depends 
+.Fn rc_deptree_depends
 and
 .Fn rc_deptree_order
 return a list of services from the

man/rc_runlevel.3

@@ -31,7 +31,7 @@
 .Sh LIBRARY
 Run Command library (librc, -lrc)
 .Sh SYNOPSIS
-.In rc.h 
+.In rc.h
 .Ft "char *" Fn rc_runlevel_get void
 .Ft bool Fn rc_runlevel_exists
 .Ft "RC_STRINGLIST *" Fn rc_runlevel_list void

man/rc_service.3

@@ -37,7 +37,7 @@
 .Sh LIBRARY
 Run Command library (librc, -lrc)
 .Sh SYNOPSIS
-.In rc.h 
+.In rc.h
 .Ft bool Fn rc_service_add "const char *runlevel" "const char *service"
 .Ft bool Fn rc_service_delete "const char *runlevel" "const char *service"
 .Ft bool Fo rc_service_daemon_set

man/rc_stringlist.3

@@ -32,7 +32,7 @@
 Run Command library (librc, -lrc)
 .Sh SYNOPSIS
 .In rc.h
-.Ft "RC_STRINGLIST *" Fn rc_stringlist_new void 
+.Ft "RC_STRINGLIST *" Fn rc_stringlist_new void
 .Ft "RC_STRING *" Fn rc_stringlist_add "RC_STRINGLIST *list" "const char *item"
 .Ft "RC_STRING *" Fn rc_stringlist_addu "RC_STRINGLIST *list" "const char *item"
 .Ft bool Fn rc_stringlist_delete RC_STRINGLIST "const char *item"

man/runscript.8

@@ -21,17 +21,18 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd November 4, 2009
+.Dd December 31, 2011
 .Dt RUNSCRIPT 8 SMM
 .Os OpenRC
 .Sh NAME
-.Nm runscript 
+.Nm runscript
 .Nd a means of hooking shell commands into a service
 .Sh SYNOPSIS
 .Nm
 .Op Fl D , -nodeps
 .Op Fl d , -debug
 .Op Fl s , -ifstarted
+.Op Fl S , -ifstopped
 .Op Fl Z , -dry-run
 .Op Ar command ...
 .Sh DESCRIPTION
@@ -76,6 +77,8 @@ Set xtrace on in the shell to assist in debugging.
 Ignore all dependency information the service supplies.
 .It Fl s , -ifstarted
 Only run the command if the service has been started.
+.It Fl S , -ifstopped
+Only run the command if the service has been stopped.
 .It Fl q , -quiet
 Turns off all informational output the service generates.
 Output from any non OpenRC commands is not affected.
@@ -89,24 +92,42 @@ or stopping them.
 The following variables affect the service script:
 .Bl -tag -width "RC_DEFAULTLEVEL"
 .It Ar extra_commands
-Space separated list of extra commands the service defines.
+Space separated list of extra commands the service defines. These should
+not depend on the service being stopped or started.
 .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 the.
+String describing the extra command.
+.It Ar start_stop_daemon_args
+List of arguments passed to start-stop-daemon when starting the daemon.
 .It Ar command
 Daemon to start or stop via
 .Nm start-stop-daemon
 if no start or stop function is defined by the service.
 .It Ar command_args
 List of arguments to pass to the daemon when starting.
+.It Ar command_background
+Set this to "true", "yes" or "1" (case-insensitive) to force the daemon into
+the background. This implies the "--make-pidfile" and "--pidfile" option of
+.Xr start-stop-daemon 8
+so the pidfile variable must be set.
 .It Ar pidfile
 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).
+.It Ar required_dirs
+A list of directories which must exist for the service to start.
+.It Ar required_files
+A list of files which must exist for the service to start.
 .El
 .Sh DEPENDENCIES
 You should define a
@@ -119,7 +140,7 @@ Here is a list of the functions you can use in a
 .Ic depend
 function. You simply pass the names of the services to it to add to that
 dependency type, or prefix it with ! to remove it.
-.Bl -tag -width "RC_DEFAULTLEVEL" 
+.Bl -tag -width "RC_DEFAULTLEVEL"
 .It Ic need
 The service will refuse to start until needed services have started and it
 will refuse to stop until any services that need it have stopped.
@@ -139,7 +160,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 normally quite safe as remaining daemons will be sent a SIGTERM just
+This is 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.
@@ -151,16 +172,14 @@ Other services should wait indefinitely for this service to start. Use
 this keyword if your service may take longer than 60 seconds to start.
 .It Dv -jail
 When in a jail, exclude this service from any dependencies. The service can
-still be run directly. Set via 
+still be run directly. Set via
-.Ic rc_sys 
+.Ic rc_sys
-in 
+in
 .Pa /etc/rc.conf
 .It Dv -lxc
 Same as -jail, but for Linux Resource Containers (LXC).
 .It Dv -openvz
 Same as -jail, but for OpenVZ systems.
-.It Dv -prefix
-Same as -jail, but for Prefix systems.
 .It Dv -uml
 Same as -jail, but for UML systems.
 .It Dv -vserver
@@ -221,7 +240,7 @@ seconds until all files exist.
 Returns 0 if all files exist, otherwise non zero.
 If
 .Ar timeout
-is less then 1 then we wait indefinitely.
+is less than 1 then we wait indefinitely.
 .It Ic is_newer_than Ar file1 Ar file2 ...
 If
 .Ar file1
@@ -288,14 +307,22 @@ 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 ...
 .Xc
 Checks to see if the path exists, is of the right type, owned by the right
 people and has the correct access modes. If not, then it corrects the path.
+.It Ic checkpath
+.Op Fl W , -writable
+.Ar path
+.Xc
+checks to see if the path is writable.
 .It Ic yesno Ar value
 If
 .Ar value
@@ -304,11 +331,18 @@ matches YES, TRUE, ON or 1 regardless of case then we return 0, otherwise 1.
 .Sh ENVIRONMENT
 .Nm
 sets the following environment variables for use in the service scripts:
-.Bl -tag -width "RC_DEFAULTLEVEL" 
+.Bl -tag -width "RC_DEFAULTLEVEL"
 .It Va RC_SVCNAME
 Name of the service.
 .It Va RC_RUNLEVEL
-Current runlevel that rc is in.
+Current runlevel that rc is in. Note that, in OpenRC, the reboot
+runlevel is mapped to the shutdown runlevel. This was done because most
+services do not need to know if a system is shutting down or rebooting.
+If you are writing a service that does need to know this, see the
+RC_REBOOT variable.
+.It Va RC_REBOOT
+This variable contains YES if the system is rebooting. If your service
+needs to know the system is rebooting, you should test this variable.
 .It Va RC_BOOTLEVEL
 Boot runlevel chosen. Default is boot.
 .It Va RC_DEFAULTLEVEL
@@ -354,9 +388,8 @@ rc_provide_tap1="!net"
 # To put in in /etc/rc.conf you would do it like this
 rc_net_tap1_provide="!net"
 
-# It's also possible to negate keywords. This is mainly useful for prefix
+# It's also possible to negate keywords.
-# users testing OpenRC.
+rc_keyword="-keyword"
-rc_keyword="!noprefix"
 .Ed
 .Sh EXAMPLES
 .Pp
@@ -399,7 +432,7 @@ depend()
 	_need=`service_get_value need`
     else
 	if _need_dbus; then
-	   _need="${_need} dbus" 
+	   _need="${_need} dbus"
 	fi
     fi
     need ${_need}
@@ -446,7 +479,7 @@ eat()
 	veinfo "Eating `basename ${food}`"
 	${command} --eat ${food}
 	retval=$?
-	: $((${result} += ${retval}))
+	: $(( result += retval ))
 	[ ${retval} = 0 ] && ate="${ate} `basename ${food}`"
     done
 
@@ -462,6 +495,12 @@ 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.

man/start-stop-daemon.8

@@ -58,7 +58,7 @@ is used in an OpenRC service, then OpenRC can in turn check to see if the
 daemon is still running. If not, then the service is marked as crashed.
 .Pp
 Here are the options to specify the daemon and how it should start or stop:
-.Bl -tag -width indent 
+.Bl -tag -width indent
 .It Fl x , -exec Ar daemon
 The
 .Ar daemon
@@ -162,9 +162,8 @@ 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
-You can either specify a timeout in seconds or a multiple signal/timeout
+The retry specification can be either a timeout in seconds or multiple
-pairs as a stopping schedule.
+signal/timeout pairs (like SIGTERM/5).
-If not specified then a default value of SIGTERM/5 is assumed.
 .El
 .Sh ENVIRONMENT
 .Va SSD_NICELEVEL