migrate-to-run: do not require a reboot

The script that migrates the @libexecdir@/rc/init.d directory to
/run/openrc should not require a reboot.

Reported-by: chainsaw@gentoo.org

Makefile

@@ -4,7 +4,12 @@
 
 include Makefile.inc
 
-SUBDIR=		conf.d doc etc init.d local.d sysctl.d man net scripts sh src
+SUBDIR=		conf.d etc init.d local.d man scripts sh src sysctl.d
+
+# Build our old net foo or not
+ifeq (${MKNET},oldnet)
+SUBDIR+=	net doc
+endif
 
 # Build pkgconfig or not
 MKPKGCONFIG?=	yes
@@ -25,6 +30,10 @@ include ${MK}/dist.mk
 include ${MK}/git.mk
 
 _installafter:
+ifeq (${MKPREFIX},yes)
 	${INSTALL} -d ${DESTDIR}/${LIBEXECDIR}/init.d
+else 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.9.3
+VERSION=	0.11.7
 PKG=		${NAME}-${VERSION}

README

@@ -10,7 +10,9 @@ You may wish to tweak the installation with the below arguments
 PROGLDFLAGS=-static
 LIBNAME=lib64
 DESTDIR=/tmp/openrc-image
+MKNET=oldnet
 MKPAM=pam
+MKPREFIX=yes
 MKPKGCONFIG=no
 MKSELINUX=yes
 MKSTATICLIBS=no
@@ -24,6 +26,8 @@ We don't support building a static OpenRC with PAM.
 You may need to use PROGLDFLAGS=-Wl,-Bstatic on glibc instead of just -static.
 If you debug memory under valgrind, add -DDEBUG_MEMORY to your CPPFLAGS
 so that all malloc memory should be freed at exit.
+If you are building OpenRC for a Gentoo Prefix installation, add
+MKPREFIX=yes.
 
 You can also brand OpenRC if you so wish like so
 BRANDING=\"Gentoo/$(uname -s)\"

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.

conf.d/Makefile

@@ -1,9 +1,12 @@
 DIR=	${CONFDIR}
-CONF=	bootmisc fsck hostname localmount network staticroute urandom \
-	${CONF-${OS}}
+CONF=	bootmisc fsck hostname localmount netmount urandom tmpfiles \
+		${CONF-${OS}}
 
+ifeq (${MKNET},)
+CONF+= network staticroute
 TARGETS+=	network staticroute
 CLEANFILES+=	network staticroute
+endif
 
 MK=	../mk
 include ${MK}/os.mk

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

@@ -1,3 +1,3 @@
 # Sets the level at which logging of messages is done to the
-# console.  See dmesg(8) for more info.
+# console.  See dmesg(1) for more info.
 dmesg_level="1"

conf.d/netmount

@@ -0,0 +1,40 @@
+# You will need to set the dependencies in the netmount script to match
+# the network configuration tools you are using. This should be done in
+# this file by following the examples below, and not by changing the
+# service script itself.
+#
+# Each of these examples is meant to be used separately. So, for
+# example, do not set rc_need to something like "net.eth0 dhcpcd".
+#
+# If you are using newnet and configuring your interfaces with static
+# addresses with the network script, you  should use this setting.
+#
+#rc_need="network"
+#
+# If you are using oldnet, you must list the specific net.* services you
+# need.
+#
+# This example assumes all of your netmounts can be reached on
+# eth0.
+#
+#rc_need="net.eth0"
+#
+# This example assumes some of your netmounts are on eth1 and some
+# are on eth2.
+#
+#rc_need="net.eth1 net.eth2"
+#
+# If you are using a dynamic network management tool like
+# networkmanager, dhcpcd in standalone mode, wicd, badvpn-ncd, etc, to
+# manage the network interfaces with the routes to your netmounts, you
+# should list that tool.
+#
+#rc_need="networkmanager"
+#rc_need="dhcpcd"
+#rc_need="wicd"
+#
+# The default setting is designed to be backward compatible with our
+# current setup, but you are highly discouraged from using this. In
+# other words, please change it to be more suited to your system.
+#
+rc_need="net"

conf.d/tmpfiles

@@ -0,0 +1,3 @@
+# Extra options for tmpfiles.sh
+#tmpfiles_opts="--verbose"
+tmpfiles_opts=""

doc/net.example.BSD.in

@@ -80,9 +80,9 @@
 # Most drivers that report carrier status function correctly, but some do not
 # One of these faulty drivers is for the Intel e1000 network card, but only
 # at boot time. To get around this you may alter the carrier_timeout value for
-# the interface. -1 is disable, 0 is infinite and any other number of seconds
-# is how long we wait for carrier. The current default is 3 seconds
-#carrier_timeout_eth0=-1
+# the interface. 0 is disable and any other number of seconds is how
+# long we wait for carrier. The current default is disabled.
+#carrier_timeout_eth0=0
 
 # You may wish to disable the interface being brought down when stopping.
 # This is only of use for WakeOnLan.

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)
@@ -126,6 +126,13 @@
 # tables you may have to set a global metric as the due to a simple read of
 # the routing table taking over a minute at a time.
 
+# Most drivers that report carrier status function correctly, but some do not
+# One of these faulty drivers is for the Intel e1000 network card, but only
+# at boot time. To get around this you may alter the carrier_timeout value for
+# the interface. 0 is disable and any other number of seconds is how
+# long we wait for carrier. The current default is disabled.
+#carrier_timeout_eth0=0
+
 # You may wish to disable the interface being brought down when stopping.
 # This is only of use for WakeOnLan.
 #ifdown_eth0="NO"
@@ -552,26 +559,34 @@
 # You can also configure the VLAN - see for ip man page for more details
 # To change the vlan interface name. If not set, the standard "iface.vlanid"
 # will be used. This is the replacement for the old 'vconfig set_name_type'
-# functionality.
+# functionality. If you previously relied on the DEV_PLUS_VID or
+# DEV_PLUS_VID_NO_PAD options to have different VLANs with same ID value, on
+# different interfaces, please note that you need to use both the interface and
+# vlan number in the numbering. This applies for all of the options: name,
+# txqueuelen, mac, broadcast, mtu, ingress, egress, flags
 #vlan1_name="vlan1"
-#vlan2_name="eth0.2"
+#eth0_vlan2_name="eth0.2"
+#eth1_vlan2_name="eth1.2"
 
 # The following shows the old set_name_type setting and what new option to set:
 # Using eth9 & VLAN VID 26 as an example.
 # VLAN_PLUS_VID         vlan26_name="vlan0026"
 # VLAN_PLUS_VID_NO_PAD  vlan26_name="vlan26"
-# DEV_PLUS_VID          vlan26_name="eth9.0026"
-# DEV_PLUS_VID_NO_PAD   vlan26_name="eth9.26"
+# DEV_PLUS_VID          eth9_vlan26_name="eth9.0026"
+# DEV_PLUS_VID_NO_PAD   eth9_vlan26_name="eth9.26"
 
 # Set the vlan flags
 #vlan1_flags="reorder_hdr off gvrp on loose_binding on"
+#eth0_vlan1_flags="reorder_hdr off gvrp on loose_binding on"
 
 # Configure in/egress maps
 #vlan1_ingress="2:6 3:5"
-#vlan1_egress="1:2"
+#eth0_vlan1_egress="1:2"
 
-#config_vlan1="172.16.3.1/23"
-#config_vlan2="172.16.2.1/23"
+#config_vlan1="172.16.2.1/24"
+#config_vlan2="172.16.3.1/24"
+#config_eth0_1="172.16.4.1/24"
+#config_eth1_1="172.16.5.1/24"
 
 # NOTE: Vlans can be configured with a . in their interface names
 # When configuring vlans with this name type, you need to replace . with a _
@@ -616,15 +631,39 @@
 #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
-# kernels or newer. See the kernel bonding documentation for a description of
-# these options.
+# Please note, that you should generally NOT try to change the MAC addresses of
+# a bond interface yourself. If you do so, the kernel and your network switches
+# 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_net_bond0_need="net.eth0 net.eth1"
 
+# Bonding subsume support (prevents crashes for root-on-NFS)
+#  - Only tested in the default bonding mode ('active-backup') with
+# IPv4
+#  - Only subsumes basic interface characteristics (IP, netmask) and
+#    excludes additional routes, interface properties such as MTU,
+#    interface-associated netfilter rules, etc.
+# In the example below, the (usually kernel-autoconfigured)
+# 'eth0' interface is a member of bond0, which subsumes the
+# existing interface configuration without upsetting NFS.
+#slaves_bond0="eth0 eth1"
+#subsume_bond0="eth0"
 
 #-----------------------------------------------------------------------------
 # Classical IP over ATM
@@ -780,6 +819,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"
 
@@ -1096,6 +1137,13 @@
 # Hypothetical network card that requires a change-eeprom toggle to enable flashing
 #ethtool_order_eth0="change-eeprom flash change pause coalesce ring offload nfc rxfh-indir ntuple"
 
+#-----------------------------------------------------------------------------
+# Firewalld support
+# If you are using the firewalld daemon to configure your firewall
+# settings and you have specific zones you want to apply to your
+# interfaces, you can do this here.
+#firewalld_zone_eth0="myzone"
+
 ##############################################################################
 # ADVANCED CONFIGURATION
 #

etc/rc.conf.FreeBSD

@@ -4,6 +4,7 @@
 # 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.
 #
 # This should be set to the value representing the environment this file is

etc/rc.conf.Linux

@@ -5,6 +5,7 @@
 # ""        - nothing special
 # "lxc"     - Linux Containers
 # "openvz"  - Linux OpenVZ
+# "prefix"  - Prefix
 # "uml"     - Usermode Linux
 # "vserver" - Linux vserver
 # "xen0"    - Xen0 Domain
@@ -18,3 +19,11 @@
 # This is the number of tty's used in most of the rc-scripts (like
 # consolefont, numlock, etc ...)
 rc_tty_number=12
+
+# If you have cgroups turned on in your kernel, this switch controls
+# whether or not a group for each controller is mounted under
+# /sys/fs/cgroup.
+# Support for process management by cgroups is planned in the future,
+# so if you turn this off, be aware that you may not be able to use that
+# feature.
+#rc_controller_cgroups="YES"

etc/rc.conf.NetBSD

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

etc/rc.conf.in

@@ -94,6 +94,10 @@
 # These variables are documented here, but should be configured in
 # /etc/conf.d/foo for service foo and NOT enabled here unless you
 # really want them to work on a global basis.
+# If your service has characters in its name which are not legal in
+# shell variable names and you configure the variables for it in this
+# file, those characters should be replaced with underscores in the
+# variable names as shown below.
 
 # Some daemons are started and stopped via start-stop-daemon.
 # We can set some things on a per service basis, like the nicelevel.
@@ -116,6 +120,13 @@
 #rc_foo_need="openvpn"
 #rc_foo_after="clock"
 
+# Below is an example for service foo-bar. Note that the '-' is illegal
+# in a shell variable name, so we convert it to an underscore.
+# example for service foo-bar.
+#rc_foo_bar_config="/etc/foo-bar"
+#rc_foo_bar_need="openvpn"
+#rc_foo_bar_after="clock"
+
 # You can also remove dependencies.
 # This is mainly used for saying which servies do NOT provide net.
 #rc_net_tap0_provide="!net"

init.d/.gitignore

@@ -41,3 +41,4 @@ syslogd
 termencoding
 ttys
 wscons
+tmpfiles.setup

init.d/Makefile

@@ -1,12 +1,18 @@
 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 swapfiles.in \
-	swclock.in sysctl.in urandom.in ${SRCS-${OS}}
+	root.in savecache.in swap.in swapfiles.in \
+	tmpfiles.setup.in swclock.in sysctl.in urandom.in ${SRCS-${OS}}
 BIN=	${OBJS}
 
+# Build our old net foo or not
+ifeq (${MKNET},)
+SRCS+= network.in staticroute.in
+endif
+
+ifeq (${MKNET},oldnet)
 INSTALLAFTER=	_installafter_net.lo
-CLEANFILES+=	net.lo
-TARGETS+=	net.lo
+SRCS+= net.lo.in
+endif
 
 MK=	../mk
 include ${MK}/os.mk
@@ -16,8 +22,8 @@ NET_LO-FreeBSD=	net.lo0
 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
+SRCS-FreeBSD+=	adjkerntz.in devd.in dumpon.in encswap.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 \

init.d/adjkerntz.in

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

init.d/bootmisc.in

@@ -7,7 +7,7 @@ depend()
 	need localmount
 	before logger
 	after clock sysctl
-	keyword -timeout
+	keyword -prefix -timeout
 }
 
 : ${wipe_tmp:=${WIPE_TMP:-yes}}
@@ -112,7 +112,7 @@ start()
 		fi
 	done
 
-	if [ "$RC_UNAME" = Linux -a -d /run ] && false; then
+	if [ "$RC_UNAME" = Linux -a -d /run ]; then
 		migrate_to_run	/var/lock /run/lock
 		migrate_to_run	/var/run /run
 	fi
@@ -196,3 +196,5 @@ stop()
 
 	return 0
 }
+
+# vim: ft=sh

init.d/consolefont.in

@@ -8,7 +8,7 @@ depend()
 {
 	need localmount termencoding
 	after hotplug bootmisc
-	keyword -openvz -uml -vserver -xenu -lxc
+	keyword -openvz -prefix -uml -vserver -xenu -lxc
 }
 
 start()

init.d/devd.in

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

init.d/devfs.in

@@ -5,8 +5,9 @@
 description="Mount system critical filesystems in /dev."
 
 depend() {
-	use dev
-	keyword -vserver
+	use dev-mount
+	before dev
+	keyword -prefix -vserver
 }
 
 start() {

init.d/dmesg.in

@@ -7,7 +7,7 @@ description="Set the dmesg level for a cleaner boot"
 depend()
 {
 	before dev modules
-	keyword -vserver
+	keyword -lxc -prefix -vserver
 }
 
 start()

init.d/dumpon.in

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

init.d/encswap.in

@@ -0,0 +1,43 @@
+#!@PREFIX@/sbin/runscript
+# Copyright 1992-2012 FreeBSD Project
+# Released under the 2-clause BSD license
+
+depend() {
+	before swap
+}
+
+start() {
+	while read device mountpoint type options rest ; do
+		case ":${device}:${type}:${options}" in
+		:#*)
+			;;
+		*.bde:swap:sw)
+			passphrase=$(dd if=/dev/random count=1 2>/dev/null | md5 -q)
+			device="${device%.bde}"
+			gbde init "${device}" -P "${passphrase}" || return 1
+			gbde attach "${device}" -p "${passphrase}" || return 1
+			;;
+		*.eli:swap:sw)
+			device="${device%.eli}"
+			geli onetime ${geli_swap_flags} "${device}" || return 1
+			;;
+		esac
+	done < /etc/fstab
+}
+
+stop() {
+	while read device mountpoint type options rest ; do
+		case ":${device}:${type}:${options}" in
+		:#*)
+			;;
+		*.bde:swap:sw)
+			device="${device%.bde}"
+			gbde detach "${device}"
+			;;
+		*.eli:swap:sw)
+			# Nothing here, because geli swap devices should be
+			# created with the auto-detach-on-last-close option.
+			;;
+		esac
+	done < /etc/fstab
+}

init.d/fsck.in

@@ -9,7 +9,7 @@ _IFS="
 depend()
 {
 	use dev clock modules
-	keyword -jail -openvz -timeout -vserver -lxc
+	keyword -jail -openvz -prefix -timeout -vserver -lxc
 }
 
 _abort() {
@@ -71,7 +71,12 @@ start()
 	done
 
 	if [ "$RC_UNAME" = Linux ]; then
-		fsck_opts="$fsck_opts -C0 -T"
+		local skiptypes x
+		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

init.d/hostid.in

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

init.d/hostname.in

@@ -5,7 +5,7 @@
 description="Sets the hostname of the machine."
 
 depend() {
-	keyword -lxc
+	keyword -prefix -lxc
 }
 
 start()

init.d/hwclock.in

@@ -28,7 +28,7 @@ depend()
 	else
 		before *
 	fi
-	keyword -openvz -uml -vserver -xenu -lxc
+	keyword -openvz -prefix -uml -vserver -xenu -lxc
 }
 
 setupopts()

init.d/keymaps.in

@@ -8,7 +8,7 @@ depend()
 {
 	need localmount termencoding
 	after bootmisc
-	keyword -openvz -uml -vserver -xenu -lxc
+	keyword -openvz -prefix -uml -vserver -xenu -lxc
 }
 
 start()

init.d/killprocs.in

@@ -4,6 +4,11 @@
 
 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 -vserver -lxc
+	keyword -jail -openvz -prefix -vserver -lxc
 }
 
 start()
@@ -22,6 +22,9 @@ start()
 
 	if [ "$RC_UNAME" = Linux ]; then
 		no_netdev="-O no_netdev"
+		if mountinfo -q /usr; then
+			touch $RC_SVCDIR/usr_premounted
+		fi
 	fi
 	ebegin "Mounting local filesystems"
 	mount -at "$types" $no_netdev
@@ -33,6 +36,7 @@ start()
 
 stop()
 {
+	yesno $RC_GOINGDOWN || return 0
 	# We never unmount / or /dev or $RC_SVCDIR
 
 	# Bug 381783
@@ -48,6 +52,9 @@ stop()
 
 	if [ "$RC_UNAME" = Linux ]; then
 		no_umounts_r="$no_umounts_r|/proc|/proc/.*|/run|/sys|/sys/.*"
+		if [ -e $rc_svcdir/usr_premounted ]; then
+			no_umounts_r="$no_umounts_r|/usr"
+		fi
 	fi
 	no_umounts_r="^($no_umounts_r)$"
 

init.d/mixer.in

@@ -7,7 +7,7 @@ extra_commands="restore"
 depend()
 {
 	need localmount
-	keyword -jail
+	keyword -jail -prefix
 }
 
 restore()

init.d/modules.in

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

init.d/mount-ro.in

@@ -7,11 +7,13 @@ description="Re-mount filesytems read-only for a clean reboot."
 depend()
 {
 	need killprocs savecache
-	keyword -openvz -vserver -lxc
+	keyword -openvz -prefix -vserver -lxc
 }
 
 start()
 {
+	local ret=0
+
 	# Flush all pending disk writes now
 	sync; sync
 
@@ -23,7 +25,7 @@ start()
 	# 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=
+	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:"
@@ -39,6 +41,9 @@ start()
 	do_unmount "umount -r" \
 		--skip-point-regex "$m" \
 		"${fs:+--skip-fstype-regex}" $fs --nonetdev
+	ret=$?
+
 	eoutdent
-	eend $?
+
+	eend $ret
 }

init.d/moused.in

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

init.d/mtab.in

@@ -7,6 +7,7 @@ description="Update /etc/mtab to match what the kernel knows about"
 depend()
 {
 	need root
+	keyword -prefix
 }
 
 start()

init.d/net.lo.in

@@ -19,11 +19,14 @@ depend()
 	local IFVAR=$(shell_var "${IFACE}")
 
 	need localmount
+	if [ "$RC_UNAME" = Linux -a "$IFACE" != lo ]; then
+		need sysfs
+	fi
 	after bootmisc
-	keyword -jail -vserver
+	keyword -jail -prefix -vserver
 
 	case "${IFACE}" in
-		lo|lo0) provide lo;;
+		lo|lo0) ;;
 		*)
 			after net.lo net.lo0 dbus
 			provide net
@@ -105,7 +108,7 @@ _wait_for_carrier()
 	_has_carrier  && return 0
 
 	eval timeout=\$carrier_timeout_${IFVAR}
-	timeout=${timeout:-${carrier_timeout:-5}}
+	timeout=${timeout:-${carrier_timeout:-0}}
 
 	# Incase users don't want this nice feature ...
 	[ ${timeout} -le 0 ] && return 0

init.d/netmount.in

@@ -2,62 +2,26 @@
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
-description="Mounts network shares according to /etc/fstab."
-
-need_portmap()
-{
-	local opts=
-	local IFS="
-"
-	set -- $(fstabinfo --options --fstype nfs,nfs4)
-	for opts; do
-		case ,$opts, in
-			*,noauto,*|*,nolock,*);;
-			*) return 0;;
-		esac
-	done
-	return 1
-}
+description="Mounts network shares, other than NFS, according to /etc/fstab."
+# We skip all NFS shares in this script because they require extra
+# daemons to be running on the client in order to work correctly.
+# It is best to allow nfs-utils to handle all nfs shares.
 
 depend()
 {
-	# Only have portmap as a dependency if there is a nfs mount in fstab
-	# that is set to mount at boot
-	local pmap=
-	if need_portmap; then
-		pmap="rpc.statd"
-		[ -x @SYSCONFDIR@/init.d/rpcbind ] \
-			&& pmap="$pmap rpcbind" \
-			|| pmap="$pmap portmap"
-	fi
-
 	config /etc/fstab
-	need net $pmap
 	use afc-client amd autofs openvpn
-	use dns nfs nfsmount portmap rpcbind rpc.statd rpc.lockd
-	keyword -jail -vserver
+	use dns
+	keyword -jail -prefix -vserver
 }
 
 start()
 {
-	local myneed= myuse= pmap="portmap" nfsmounts=
-	[ -x @SYSCONFDIR@/init.d/rpcbind ] && pmap="rpcbind"
-
 	local x= fs= rc=
 	for x in $net_fs_list $extra_net_fs_list; do
 		case "$x" in
 			nfs|nfs4)
-			# If the nfsmount script took care of the nfs
-			# filesystems, then there's no point in trying
-			# them twice
-			service_started nfsmount && continue
-
-			# Only try to mount NFS filesystems if portmap was
-			# started. This is to fix "hang" problems for new
-			# users who do not add portmap to the default runlevel.
-			if need_portmap && ! service_started "$pmap"; then
-				continue
-			fi
+			continue
 			;;
 		esac
 		fs="$fs${fs:+,}$x"
@@ -82,7 +46,14 @@ stop()
 	. "$RC_LIBEXECDIR"/sh/rc-mount.sh
 
 	for x in $net_fs_list $extra_net_fs_list; do
-		fs="$fs${fs:+,}$x"
+		case "$x" in
+			nfs|nfs4)
+				continue
+				;;
+			*)
+				fs="$fs${fs:+,}$x"
+				;;
+		esac
 	done
 	if [ -n "$fs" ]; then
 		umount -at $fs || eerror "Failed to simply unmount filesystems"
@@ -91,7 +62,14 @@ stop()
 	eindent
 	fs=
 	for x in $net_fs_list $extra_net_fs_list; do
-		fs="$fs${fs:+|}$x"
+		case "$x" in
+			nfs|nfs4)
+				continue
+				;;
+			*)
+				fs="$fs${fs:+|}$x"
+				;;
+		esac
 	done
 	[ -n "$fs" ] && fs="^($fs)$"
 	do_unmount umount ${fs:+--fstype-regex} $fs --netdev

init.d/network.in

@@ -12,8 +12,10 @@ depend()
 {
 	need localmount
 	after bootmisc
-	provide net
-	keyword -jail -vserver
+	if [ -n "$(interfaces)" ]; then
+		provide net
+	fi
+	keyword -jail -prefix -vserver
 }
 
 uniqify()
@@ -219,12 +221,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

init.d/newsyslog.in

@@ -7,6 +7,7 @@ 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 -vserver -lxc
+	keyword -openvz -prefix -vserver -lxc
 }
 
 _setleds()

init.d/pf.in

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

init.d/powerd.in

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

init.d/procfs.in

@@ -8,7 +8,7 @@ depend()
 {
 	use modules devfs
 	need localmount
-	keyword -openvz -vserver -lxc
+	keyword -openvz -prefix -vserver -lxc
 }
 
 start()
@@ -41,7 +41,7 @@ start()
 		fi
 	fi
 
-	[ "$RC_SYS" == "OPENVZ" ] && return 0
+	[ "$RC_SYS" = "OPENVZ" ] && return 0
 
 	# Check what USB fs the kernel support.  Currently
 	# 2.5+ kernels, and later 2.4 kernels have 'usbfs',

init.d/rc-enabled.in

@@ -7,6 +7,7 @@ depend()
 	need localmount net
 	after *
 	before local
+	keyword -prefix
 }
 
 start()

init.d/root.in

@@ -7,7 +7,7 @@ description="Mount the root fs read/write"
 depend()
 {
 	need fsck
-	keyword -jail -openvz -vserver -lxc
+	keyword -jail -openvz -prefix -vserver -lxc
 }
 
 start()

init.d/savecache.in

@@ -13,6 +13,14 @@ start()
 			return 1
 		fi
 	fi
+	if ! checkpath -W "$RC_LIBEXECDIR"; then
+		ewarn "WARNING: ${RC_LIBEXECDIR} is not writable!"
+		if ! yesno "${RC_GOINGDOWN}"; then
+			ewarn "Unable to save deptree cache"
+			return 1
+		fi
+		return 0
+	fi
 	ebegin "Saving dependency cache"
 	local rc=
 	if [ ! -d "$RC_LIBEXECDIR"/cache ]; then

init.d/savecore.in

@@ -6,8 +6,9 @@ description="Saves a kernel dump."
 
 depend()
 {
-	need localmount
-	keyword -jail
+	need dumpon localmount
+	before encswap
+	keyword -jail -prefix
 }
 
 start()

init.d/staticroute.in

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

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

init.d/swap.in

@@ -5,7 +5,7 @@
 depend()
 {
 	before localmount
-	keyword -jail -openvz -vserver -lxc
+	keyword -jail -openvz -prefix -vserver -lxc
 }
 
 start()

init.d/swapfiles.in

@@ -31,14 +31,16 @@ stop()
 
 	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
+			if [ -e /proc/swaps ]; then
+				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
+			fi
 			;;
 	esac
 	eend 0

init.d/swclock.in

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

init.d/syscons.in

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

init.d/sysctl.BSD.in

@@ -5,6 +5,7 @@
 depend()
 {
 	before bootmisc logger
+	keyword -prefix
 }
 
 start()
@@ -13,7 +14,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 -vserver
+	keyword -lxc -prefix -vserver
 }
 
 start()
@@ -15,12 +15,12 @@ start()
 	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"
-			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 -vserver
+	keyword -lxc -prefix -vserver
 }
 
 mount_sys()
@@ -74,7 +74,6 @@ mount_misc()
 
 mount_cgroups()
 {
-	yesno ${rc_cgroups:-YES} && [ -e /proc/cgroups ] && \
 		mountinfo -q /sys/fs/cgroup || return 0
 
 	local agent="@LIBEXECDIR@/sh/cgroup-release-agent.sh"
@@ -83,6 +82,8 @@ mount_cgroups()
 		-o none,nodev,noexec,nosuid,name=openrc,release_agent="$agent" \
 		openrc /sys/fs/cgroup/openrc
 	echo 1 > /sys/fs/cgroup/openrc/notify_on_release
+
+	yesno ${rc_controller_cgroups:-YES} && [ -e /proc/cgroups ] || return 0
 	while read name hier groups enabled rest; do
 		case "${enabled}" in
 			1)	mkdir /sys/fs/cgroup/${name}

init.d/syslogd.in

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

init.d/termencoding.in

@@ -9,7 +9,7 @@ ttyn=${rc_tty_number:-${RC_TTY_NUMBER:-12}}
 
 depend()
 {
-	keyword -openvz -uml -vserver -xenu
+	keyword -lxc -openvz -prefix -uml -vserver -xenu
 	use root
 	after bootmisc
 }

init.d/tmpfiles.setup.in

@@ -0,0 +1,18 @@
+#!@PREFIX@/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Released under the 2-clause BSD license.
+
+description="set up tmpfiles.d entries"
+
+depend()
+{
+	need localmount
+}
+
+start()
+{
+	ebegin "setting up tmpfiles.d entries"
+	@LIBEXECDIR@/sh/tmpfiles.sh --create --remove ${tmpfiles_opts}
+	eend $?
+	return 0
+}

init.d/ttys.in

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

init.d/urandom.in

@@ -8,7 +8,7 @@ description="Initializes the random number generator."
 depend()
 {
 	need localmount
-	keyword -jail -openvz
+	keyword -jail -lxc -openvz -prefix
 }
 
 save_seed()

init.d/wscons.in

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

man/rc-status.8

@@ -46,7 +46,7 @@ Show all runlevels and their services.
 List all services that have crashed.
 .It Fl l , -list
 List all defined runlevels.
-.It fl r , -runlevel
+.It Fl r , -runlevel
 Print the current runlevel name.
 .It Fl s , -servicelist
 Show all services.

man/runscript.8

@@ -37,7 +37,7 @@
 .Op Ar command ...
 .Sh DESCRIPTION
 .Nm
-is basically an interpreter for shell scripts which provide an easy interface
+is basically an interpreter for shell scripts which provides an easy interface
 to the often complex system commands and daemons.
 When a service runs a command it first loads its multiplexed configuration
 file, then its master configuration file, then
@@ -124,6 +124,10 @@ 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
@@ -152,7 +156,7 @@ We provide this virtual service. For example, named provides dns.
 .It Ic config
 We should recalculate our dependencies if the listed files have changed.
 .It Ic keyword
-Tags a service with a keyword. Here's the keywords we currently understand:-
+Tags a service with a keyword. These are the keywords we currently understand:
 .Bl -tag -width indent
 .It Dv -shutdown
 Don't stop this service when shutting the system down.
@@ -176,6 +180,8 @@ in
 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
@@ -346,8 +352,14 @@ Default runlevel chosen. Default is default.
 .It Va RC_SYS
 A special variable to describe the system more.
 Possible values are OPENVZ, XENU, XEN0, UML and VSERVER.
+.It Va RC_PREFIX
+In a Gentoo Prefix installation, this variable contains the prefix
+offset. Otherwise it is undefined.
 .It Va RC_UNAME
 The result of `uname -s`.
+.It Va RC_CMD
+This contains the name of the command the service script is executing, such
+as start, stop, restart etc.
 .El
 .Sh FILES
 .Pp
@@ -384,8 +396,9 @@ 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.
-rc_keyword="-keyword"
+# It's also possible to negate keywords. This is mainly useful for prefix
+# users testing OpenRC.
+rc_keyword="!-prefix"
 .Ed
 .Sh EXAMPLES
 .Pp
@@ -434,8 +447,22 @@ depend()
     need ${_need}
 }
 
+# This function does any pre-start setup. If it fails, the service will
+# not be started.
+# If you need this function to behave differently for a restart command,
+# you should check the value of RC_CMD for "restart".
+# This also applies to start_post, stop_pre and stop_post.
 start_pre()
 {
+	if [ "$RC_CMD" = restart ]; then
+		# This block will only execute for a restart command. Use a
+		# structure like this if you need special processing for a
+		# restart which you do not need for a normal start.
+		# The function can also fail from here, which will mean that a
+		# restart can fail.
+		# This logic can also be used in start_post, stop_pre and
+		# stop_post.
+	fi
     # Ensure that our dirs are correct
     checkpath --dir --owner foo:foo --mode 0664 \\
 	/var/run/foo /var/cache/foo

mk/os-prefix.mk

@@ -0,0 +1,6 @@
+# Copyright (c) 2012 William Hubbs <w.d.hubbs@gmail.com>
+# Released under the 2-clause BSD license.
+
+ifeq (${MKPREFIX},yes)
+CPPFLAGS+=	-DPREFIX
+endif

mk/os.mk

@@ -7,5 +7,6 @@ _OS_SH=		uname -s
 _OS:= 		$(shell ${_OS_SH})
 OS?= 		${_OS}
 include ${MK}/os-${OS}.mk
+include ${MK}/os-prefix.mk
 
 RC_LIB=		/$(LIBNAME)/rc

mk/sys.mk

@@ -11,9 +11,14 @@ SED?=			sed
 SH=			/bin/sh
 
 PREFIX?=
-_UPREFIX_SH=		case "${PREFIX}" in "") echo /usr;; *) echo "${PREFIX}";; esac
-_UPREFIX:=		$(shell ${_UPREFIX_SH})
-UPREFIX=		${_UPREFIX}
+ifeq (${PREFIX},)
+UPREFIX= /usr
+else
+UPREFIX= ${PREFIX}
+ifeq (${MKPREFIX},yes)
+UPREFIX= ${PREFIX}/usr
+endif
+endif
 LOCAL_PREFIX=		/usr/local
 
 PICFLAG?=		-fPIC

net/Makefile

@@ -13,7 +13,7 @@ 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
+		vlan.sh macvlan.sh ip6rd.sh firewalld.sh
 
 SRCS-NetBSD=
 INC-NetBSD=	ifwatchd.sh

net/bonding.sh

@@ -4,6 +4,12 @@
 bonding_depend()
 {
 	before interface macchanger
+	program /sbin/ifconfig /bin/ifconfig
+	# If you do not have sysfs, you MUST have this binary instead for ioctl
+	# Also you will loose some functionality that cannot be done via sysfs:
+	if [ ! -d /sys/class/net ]; then
+		program /sbin/ifenslave
+	fi
 }
 
 _config_vars="$_config_vars slaves"
@@ -23,6 +29,9 @@ bonding_pre_start()
 	eval primary="\$primary_${IFVAR}"
 	unset primary_${IFVAR}
 
+	eval subsume="\$subsume_${IFVAR}"
+	unset subsume_${IFVAR}
+
 
 	[ -z "${slaves}" ] && return 0
 
@@ -34,6 +43,10 @@ bonding_pre_start()
 		fi
 	fi
 
+	if [ ! -d /sys/class/net ]; then
+		ewarn "sysfs is not available! You will be unable to create new bonds, or change dynamic parameters!"
+	fi
+
 	# We can create the interface name we like now, but this
 	# requires sysfs
 	if ! _exists && [ -d /sys/class/net ]; then
@@ -51,7 +64,18 @@ bonding_pre_start()
 
 	# Configure the bond mode, then we can reloop to ensure we configure
 	# All other options
-	for x in /sys/class/net/"${IFACE}"/bonding/mode; do
+	[ -d /sys/class/net ] && for x in /sys/class/net/"${IFACE}"/bonding/mode; do
+		[ -f "${x}" ] || continue
+		n=${x##*/}
+		eval s=\$${n}_${IFVAR}
+		if [ -n "${s}" ]; then
+			einfo "Setting ${n}: ${s}"
+			echo "${s}" >"${x}" || \
+			eerror "Failed to configure $n (${n}_${IFVAR})"
+		fi
+	done
+	# Configure link monitoring
+	for x in /sys/class/net/"${IFACE}"/bonding/miimon; do
 		[ -f "${x}" ] || continue
 		n=${x##*/}
 		eval s=\$${n}_${IFVAR}
@@ -62,11 +86,11 @@ bonding_pre_start()
 		fi
 	done
 	# Nice and dynamic for remaining options:)
-	for x in /sys/class/net/"${IFACE}"/bonding/*; do
+	[ -d /sys/class/net ] && for x in /sys/class/net/"${IFACE}"/bonding/*; do
 		[ -f "${x}" ] || continue
 		n=${x##*/}
 		eval s=\$${n}_${IFVAR}
-		[ "${n}" != "mode" ] || continue
+		[ "${n}" != "mode" -o "${n}" != "miimon" ] || continue
 		if [ -n "${s}" ]; then
 			einfo "Setting ${n}: ${s}"
 			echo "${s}" >"${x}" || \
@@ -84,15 +108,44 @@ bonding_pre_start()
 		_exists true || return 1
 	done
 
-	# Must force the slaves to a particular state before adding them
-	for IFACE in ${slaves}; do
-		_delete_addresses
-		_down
-	done
+	# Unless we are subsuming an existing interface (NFS root), we down
+	# slave interfaces to work around bugs supposedly in some chipsets
+	# that cause failure to enslave from other states.
+	if [ -z "${subsume}" ]; then
+		for IFACE in ${slaves}; do
+			_delete_addresses
+			_down
+		done
+	fi
 	)
 
-	# now force the master to up
-	_up
+	# Now force the master to up
+	#  - First test for interface subsume request (required for NFS root)
+	if [ -n "${subsume}" ]; then
+		einfo "Subsuming ${subsume} interface characteristics."
+		eindent
+		local oiface=${IFACE}
+		IFACE=${subsume}
+		local addr="$(_get_inet_address)"
+		einfo "address: ${addr}"
+		IFACE=${oiface}
+		unset oiface
+		eoutdent
+		# subsume (presumably kernel auto-)configured IP
+		ifconfig ${IFACE} ${addr} up
+	else
+		# warn if root on nfs and no subsume interface supplied
+		local root_fs_type=$(mountinfo -s /)
+		if [ "${root_fs_type}" == "nfs" ]; then
+			warn_nfs=1
+			ewarn "NFS root detected!!!"
+			ewarn " If your system crashes here, /etc/conf.d/net needs"
+			ewarn " subsume_${IFACE}=\"<iface>\" ... where <iface> is the"
+			ewarn " existing, (usually kernel auto-)configured interface."
+		fi
+		# up the interface
+		_up
+    fi
 
 	# finally add in slaves
 	# things needed in the process, and if they are done by ifenslave, openrc, and/or the kernel.
@@ -121,7 +174,7 @@ bonding_pre_start()
 			fi
 		done
 	else
-		/sbin/ifenslave "${IFACE}" ${slaves} >/dev/null
+		ifenslave "${IFACE}" ${slaves} >/dev/null
 	fi
 	eend $?
 
@@ -132,6 +185,11 @@ bonding_stop()
 {
 	_is_bond || return 0
 
+	# Wipe subsumed interface
+	if [ -n "${subsume}" ]; then
+		ifconfig ${subsume} 0.0.0.0
+	fi
+
 	local slaves= s=
 	slaves=$( \
 		sed -n -e 's/^Slave Interface: //p' "/proc/net/bonding/${IFACE}" \
@@ -149,7 +207,7 @@ bonding_stop()
 			echo -"${s}" > /sys/class/net/"${IFACE}"/bonding/slaves
 		done
 	else
-		/sbin/ifenslave -d "${IFACE}" ${slaves}
+		ifenslave -d "${IFACE}" ${slaves}
 	fi
 
 	# reset all slaves

net/bridge.sh

@@ -119,10 +119,8 @@ bridge_pre_start()
 				return 1
 			fi
 			# The interface is known to exist now
-			_set_flag promisc
 			_up
 			if ! brctl addif "${BR_IFACE}" "${x}"; then
-				_set_flag -promisc
 				eend 1
 				return 1
 			fi
@@ -144,6 +142,7 @@ bridge_pre_start()
 	) || return 1
 
 	# Bring up the bridge
+	_set_flag promisc
 	_up
 }
 

net/firewalld.sh

@@ -0,0 +1,38 @@
+# Copyright (c) 2012 Doug Goldstein <cardoe@cardoe.com>
+# Released under the 2-clause BSD license.
+
+firewalld_depend()
+{
+	after interface
+	before dhcp
+	program firewall-cmd
+	[ "$IFACE" != "lo" ] && need firewalld
+}
+
+_config_vars="$_config_vars firewalld_zone"
+
+firewalld_post_start()
+{
+	local firewalld_zone=
+	eval firewalld_zone=\$firewalld_zone_${IFVAR}
+
+	_exists || return 0
+
+	if [ "${IFACE}" != "lo" ]; then
+		firewall-cmd --zone="${firewalld_zone}" \
+			--change-interface="${IFACE}" > /dev/null 2>&1
+	fi
+
+	return 0
+}
+
+firewalld_pre_stop()
+{
+	_exists || return 0
+
+	if [ "${IFACE}" != "lo" ]; then
+		firewall-cmd --remove-interface="${IFACE}" > /dev/null 2>&1
+	fi
+
+	return 0
+}

net/ifconfig.sh.Linux.in

@@ -24,19 +24,19 @@ _exists()
 
 _ifindex()
 {
-	local line= i=-2
-	while read line; do
-		: $(( i += 1 ))
-		[ ${i} -lt 1 ] && continue
-		case "${line}" in
-			"${IFACE}:"*) echo "${i}"; return 0;;
-		esac
-	done < /proc/net/dev
-
-	# Return the next available index
-	: $(( i += 1 ))
-	echo "${i}"
-	return 1
+	local index=-1
+	local f v
+	if [ -e /sys/class/net/"${IFACE}"/ifindex ]; then
+		index=$(cat /sys/class/net/"${IFACE}"/ifindex)
+	else
+		for f in /sys/class/net/*/ifindex ; do
+			v=$(cat $f)
+			[ $v -gt $index ] && index=$v
+		done
+		: $(( index += 1 ))
+	fi
+	echo "${index}"
+	return 0
 }
 
 _is_wireless()

net/iproute2.sh

@@ -10,12 +10,12 @@ iproute2_depend()
 
 _up()
 {
-	ip link set "${IFACE}" up
+	ip link set dev "${IFACE}" up
 }
 
 _down()
 {
-	ip link set "${IFACE}" down
+	ip link set dev "${IFACE}" down
 }
 
 _exists()
@@ -25,19 +25,19 @@ _exists()
 
 _ifindex()
 {
-	local line= i=-2
-	while read line; do
-		: $(( i += 1 ))
-		[ ${i} -lt 1 ] && continue
-		case "${line}" in
-			"${IFACE}:"*) echo "${i}"; return 0;;
-		esac
-	done < /proc/net/dev
-
-	# Return the next available index
-	: $(( i += 1 ))
-	echo "${i}"
-	return 1
+	local index=-1
+	local f v
+	if [ -e /sys/class/net/"${IFACE}"/ifindex ]; then
+		index=$(cat /sys/class/net/"${IFACE}"/ifindex)
+	else
+		for f in /sys/class/net/*/ifindex ; do
+			v=$(cat $f)
+			[ $v -gt $index ] && index=$v
+		done
+		: $(( index += 1 ))
+	fi
+	echo "${index}"
+	return 0
 }
 
 _is_wireless()
@@ -57,7 +57,7 @@ _set_flag()
 		flag=${flag#-}
 		opt="off"
 	fi
-	ip link set "${IFACE}" "${flag}" "${opt}"
+	ip link set dev "${IFACE}" "${flag}" "${opt}"
 }
 
 _get_mac_address()
@@ -79,7 +79,7 @@ _get_mac_address()
 
 _set_mac_address()
 {
-	ip link set "${IFACE}" address "$1"
+	ip link set dev "${IFACE}" address "$1"
 }
 
 _get_inet_addresses()
@@ -212,7 +212,7 @@ _delete_addresses()
 
 _has_carrier()
 {
-	return 0
+	LC_ALL=C ip link show dev "${IFACE}" | grep -q "LOWER_UP"
 }
 
 _tunnel()
@@ -274,12 +274,12 @@ iproute2_pre_start()
 	# MTU support
 	local mtu=
 	eval mtu=\$mtu_${IFVAR}
-	[ -n "${mtu}" ] && ip link set "${IFACE}" mtu "${mtu}"
+	[ -n "${mtu}" ] && ip link set dev "${IFACE}" mtu "${mtu}"
 
 	# TX Queue Length support
 	local len=
 	eval len=\$txqueuelen_${IFVAR}
-	[ -n "${len}" ] && ip link set "${IFACE}" txqueuelen "${len}"
+	[ -n "${len}" ] && ip link set dev "${IFACE}" txqueuelen "${len}"
 
 	return 0
 }
@@ -287,7 +287,7 @@ iproute2_pre_start()
 _iproute2_ipv6_tentative()
 {
 	# Only check tentative when we have a carrier.
-	LC_ALL=C ip link show dev "${IFACE}" | grep -q "NO-CARRIER" && return 1
+	_has_carrier || return 1
 	LC_ALL=C ip addr show dev "${IFACE}" | \
 		grep -q "^[[:space:]]*inet6 .* tentative"
 }

net/udhcpc.sh

@@ -61,12 +61,12 @@ udhcpc_start()
 	esac
 
 	case " ${args} " in
-		*" --hosname="*|*" -h "*|*" -H "*);;
+		*" --hostname="*|*" -h "*|*" -H "*);;
 		*)
 			if ${sendhost}; then
 				local hname="$(hostname)"
 				if [ "${hname}" != "(none)" ] && [ "${hname}" != "localhost" ]; then
-					args="${args} --hostname='${hname}'"
+					args="${args} -x hostname:'${hname}'"
 				fi
 			fi
 			;;

net/vlan.sh

@@ -66,26 +66,41 @@ vlan_post_start()
 		einfo "Adding VLAN ${vlan} to ${IFACE}"
 		# We need to gather all interface configuration options
 		# 1) naming. Default to the standard "${IFACE}.${vlan}" but it can be anything
-		eval vname=\$vlan${vlan}_name
+		eval vname=\$${IFACE}_vlan${vlan}_name
+		[ -z "${vname}" ] && eval vname=\$vlan${vlan}_name
 		[ -z "${vname}" ] && vname="${IFACE}.${vlan}"
 		# 2) flags
-		eval vflags=\$vlan${vlan}_flags
+		eval vflags=\$${IFACE}_vlan${vlan}_flags
+		[ -z "${vname}" ] && eval vflags=\$vlan${vlan}_flags
 		# 3) ingress/egress map
-		eval vingress=\$vlan${vlan}_ingress
+		eval vingress=\$${IFACE}_vlan${vlan}_ingress
+		[ -z "${vingress}" ] && eval vingress=\$vlan${vlan}_ingress
 		[ -z "${vingress}" ] || vingress="ingress-qos-map ${vingress}"
-		eval vegress=\$vlan${vlan}_egress
+		eval vegress=\$${IFACE}_vlan${vlan}_egress
+		[ -z "${vegress}" ] && eval vegress=\$vlan${vlan}_egress
 		[ -z "${vegress}" ] || vegress="egress-qos-map ${vegress}"
 
+		# txqueue
 		local txqueuelen=
-		eval txqueuelen=\$txqueuelen_vlan${vlan}
+		eval txqueuelen=\$txqueuelen_${IFACE}_vlan${vlan}
+		[ -z "${txqueuelen}" ] && eval txqueuelen=\$txqueuelen_vlan${vlan}
+		# mac
 		local mac=
-		eval mac=\$mac_vlan${vlan}
+		eval mac=\$mac_${IFACE}_vlan${vlan}
+		[ -z "${mac}" ] && eval mac=\$mac_vlan${vlan}
+		# broadcast
 		local broadcast=
-		eval broadcast=\$broadcast_vlan${vlan}
+		eval broadcast=\$broadcast_${IFACE}_vlan${vlan}
+		[ -z "${broadcast}" ] && eval broadcast=\$broadcast_vlan${vlan}
+		# mtu
 		local mtu=
-		eval mtu=\$mtu_vlan${vlan}
+		eval mtu=\$mtu_${IFACE}_vlan${vlan}
+		[ -z "${mtu}" ] && eval mtu=\$mtu_vlan${vlan}
+
+		# combine it all
 		local opts="${txqueuelen:+txqueuelen} ${txqueuelen} ${mac:+address} ${mac} ${broadcast:+broadcast} ${broadcast} ${mtu:+mtu} ${mtu}"
 
+		veinfo "ip link add link \"${IFACE}\" name \"${vname}\" ${opts} type vlan id \"${vlan}\" ${vflags} ${vingress} ${vegress}"
 		e="$(ip link add link "${IFACE}" name "${vname}" ${opts} type vlan id "${vlan}" ${vflags} ${vingress} ${vegress} 2>&1 1>/dev/null)"
 		if [ -n "${e}" ]; then
 			eend 1 "${e}"

runlevels/Makefile

@@ -10,6 +10,12 @@ BOOTDIR=	${LEVELDIR}/boot
 DEFAULTDIR=	${LEVELDIR}/default
 SHUTDOWNDIR=	${LEVELDIR}/shutdown
 
+ifeq (${MKNET},)
+BOOT+= network staticroute
+endif
+
+INITFILES=	../init.d
+
 MK=		../mk
 include ${MK}/sys.mk
 include ${MK}/os.mk
@@ -19,19 +25,25 @@ BOOT-${OS}=
 SHUTDOWN-${OS}=
 SYSINIT-${OS}=
 
+ifeq (${MKNET},oldnet)
+BOOT-FreeBSD+= net.lo0
+BOOT-Linux+= net.lo
+BOOT-NetBSD+= net.lo0
+endif
+
 BOOT-BSD=	hostid newsyslog savecore syslogd swap-blk
 
 # Generic BSD stuff
-BOOT-FreeBSD=	hostid net.lo0 newsyslog savecore syslogd
+BOOT-FreeBSD+=	hostid newsyslog savecore syslogd
 # FreeBSD specific stuff
 BOOT-FreeBSD+=	adjkerntz dumpon syscons
 
-BOOT-Linux=	hwclock keymaps modules mtab net.lo procfs termencoding
+BOOT-Linux+=	hwclock keymaps modules mtab procfs termencoding tmpfiles.setup
 SHUTDOWN-Linux=	killprocs mount-ro
-SYSINIT-Linux=	devfs dmesg
+SYSINIT-Linux=	devfs dmesg sysfs
 
 # Generic BSD stuff
-BOOT-NetBSD=	hostid net.lo0 newsyslog savecore syslogd
+BOOT-NetBSD+=	hostid newsyslog savecore syslogd
 # NetBSD specific stuff
 BOOT-NetBSD+=	devdb swap-blk ttys wscons
 
@@ -41,25 +53,35 @@ install:
 	if ! test -d "${SYSINITDIR}"; then \
 		${INSTALL} -d ${SYSINITDIR} || exit $$?; \
 		for x in ${SYSINIT}; do \
-			ln -snf ${PREFIX}/etc/init.d/"$$x" ${SYSINITDIR}/"$$x" || exit $$?; \
-		done \
+			if test -n "${PREFIX}"; then \
+				grep -q "keyword .*-prefix" ${INITFILES}/"$$x" && continue; \
+			fi; \
+			ln -snf ${INITDIR}/"$$x" ${SYSINITDIR}/"$$x" || exit $$?; done \
 	fi
 	if ! test -d "${BOOTDIR}"; then \
 		${INSTALL} -d ${BOOTDIR} || exit $$?; \
 		for x in ${BOOT}; do \
-			ln -snf ${PREFIX}/etc/init.d/"$$x" ${BOOTDIR}/"$$x" || exit $$?; \
+			if test -n "${PREFIX}"; then \
+				grep -q "keyword .*-prefix" ${INITFILES}/"$$x" && continue; \
+			fi; \
+			ln -snf ${INITDIR}/"$$x" ${BOOTDIR}/"$$x" || exit $$?; \
 		done \
 	fi
 	if ! test -d "${DEFAULTDIR}"; then \
 		${INSTALL} -d ${DEFAULTDIR} || exit $$?; \
 		for x in ${DEFAULT}; do \
-			ln -snf ${PREFIX}/etc/init.d/"$$x" ${DEFAULTDIR}/"$$x" || exit $$?; \
-		done \
+			if test -n "${PREFIX}"; then \
+				grep -q "keyword .*-prefix" ${INITFILES}/"$$x" && continue; \
+			fi; \
+			ln -snf ${INITDIR}/"$$x" ${DEFAULTDIR}/"$$x" || exit $$?; done \
 	fi
 	if ! test -d "${SHUTDOWNDIR}"; then \
 		${INSTALL} -d ${SHUTDOWNDIR} || exit $$?; \
 		for x in ${SHUTDOWN}; do \
-			ln -snf ${PREFIX}/etc/init.d/"$$x" ${SHUTDOWNDIR}/"$$x" || exit $$?; done \
+			if test -n "${PREFIX}"; then \
+				grep -q "keyword .*-prefix" ${INITFILES}/"$$x" && continue; \
+			fi; \
+			ln -snf ${INITDIR}/"$$x" ${SHUTDOWNDIR}/"$$x" || exit $$?; done \
 	fi
 
 check test::

sh/.gitignore

@@ -9,3 +9,5 @@ init-early.sh
 ifwatchd-carrier.sh
 ifwatchd-nocarrier.sh
 udhcpc-hook.sh
+tmpfiles.sh
+migrate-to-run.sh

sh/Makefile

@@ -1,8 +1,8 @@
 DIR=	${LIBEXECDIR}/sh
 SRCS=	init.sh.in functions.sh.in gendepends.sh.in init-common-post.sh.in \
-	rc-functions.sh.in runscript.sh.in ${SRCS-${OS}}
+	rc-functions.sh.in runscript.sh.in tmpfiles.sh.in ${SRCS-${OS}}
 INC=	init-common-post.sh rc-mount.sh functions.sh rc-functions.sh
-BIN=	gendepends.sh init.sh runscript.sh ${BIN-${OS}}
+BIN=	gendepends.sh init.sh runscript.sh tmpfiles.sh ${BIN-${OS}}
 
 INSTALLAFTER=	_installafter
 
@@ -12,8 +12,10 @@ include ${MK}/os.mk
 SRCS-FreeBSD=
 BIN-FreeBSD=
 
-SRCS-Linux=	cgroup-release-agent.sh.in init-early.sh.in udhcpc-hook.sh.in
-BIN-Linux=	cgroup-release-agent.sh init-early.sh udhcpc-hook.sh
+SRCS-Linux=	cgroup-release-agent.sh.in init-early.sh.in migrate-to-run.sh.in \
+	udhcpc-hook.sh.in
+BIN-Linux=	cgroup-release-agent.sh init-early.sh migrate-to-run.sh \
+	udhcpc-hook.sh
 
 SRCS-NetBSD=	ifwatchd-carrier.sh.in ifwatchd-nocarrier.sh.in
 BIN-NetBSD=	ifwatchd-carrier.sh ifwatchd-nocarrier.sh

sh/functions.sh.in

@@ -105,7 +105,7 @@ else
 	# the last ecmd
 	for _e in ebegin eend error errorn einfo einfon ewarn ewarnn ewend \
 		vebegin veend veinfo vewarn vewend; do
-		eval "$_e() { local _r; @LIBEXECDIR@/bin/$_e \"\$@\"; _r=\$?; \
+		eval "$_e() { local _r; command $_e \"\$@\"; _r=\$?; \
 		export EINFO_LASTCMD=$_e; return \$_r; }"
 	done
 	unset _e

sh/gendepends.sh.in

@@ -4,7 +4,7 @@
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
-. @SYSCONFDIR@/init.d/functions.sh
+. @LIBEXECDIR@/sh/functions.sh
 . @LIBEXECDIR@/sh/rc-functions.sh
 
 config() {

sh/init.sh.Linux.in

@@ -3,62 +3,6 @@
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
-# This basically mounts $RC_SVCDIR as a ramdisk.
-# The tricky part is finding something our kernel supports
-# tmpfs and ramfs are easy, so force one or the other.
-svcdir_restorecon()
-{
-	local rc=0
-	if [ -x /usr/sbin/selinuxenabled -a -c /selinux/null ] &&
-	  selinuxenabled; then
-		restorecon $RC_SVCDIR
-		rc=$?
-	fi
-	return $rc
-}
-
-mount_svcdir()
-{
-	# mount from fstab if we can
-	fstabinfo --mount "$RC_SVCDIR" && return 0
-
-	local fs= fsopts="-o rw,noexec,nodev,nosuid"
-	local svcsize=${rc_svcsize:-1024}
-
-	# Some buggy kernels report tmpfs even when not present :(
-	if grep -Eq "[[:space:]]+tmpfs$" /proc/filesystems; then
-		local tmpfsopts="${fsopts},mode=755,size=${svcsize}k"
-		mount -n -t tmpfs $tmpfsopts rc-svcdir "$RC_SVCDIR"
-		if [ $? -eq 0 ]; then
-			svcdir_restorecon
-			[ $? -eq 0 ] && return 0
-		fi
-	fi
-
-	if grep -Eq "[[:space:]]+ramfs$" /proc/filesystems; then
-		fs="ramfs"
-		# ramfs has no special options
-	elif [ -e /dev/ram0 ] \
-		&& grep -Eq "[[:space:]]+ext2$" /proc/filesystems; then
-		devdir="/dev/ram0"
-		fs="ext2"
-		dd if=/dev/zero of="$devdir" bs=1k count="$svcsize"
-		mkfs -t "$fs" -i 1024 -vm0 "$devdir" "$svcsize"
-	else
-		echo
-		eerror "OpenRC requires tmpfs, ramfs or a ramdisk + ext2"
-		eerror "compiled into the kernel"
-		echo
-		return 1
-	fi
-
-	mount -n -t "$fs" $fsopts rc-svcdir "$RC_SVCDIR"
-	if [ $? -eq 0 ]; then
-		svcdir_restorecon
-		[ $? -eq 0 ] && return 0
-	fi
-}
-
 . "$RC_LIBEXECDIR"/sh/functions.sh
 [ -r /etc/rc.conf ] && . /etc/rc.conf
 
@@ -75,7 +19,7 @@ if [ -e $f ]; then
 	if [ "$(VAR=a cat $f)" = "$(VAR=b cat $f)" ]; then
 		eerror "You have cruft in /proc that should be deleted"
 	else
-		einfo "/proc is already mounted, skipping"
+		einfo "/proc is already mounted"
 		mountproc=false
 	fi
 fi
@@ -91,24 +35,45 @@ if $mountproc; then
 	eend $?
 fi
 
-# Mount tmpfs on /run when directory exists.
 # /run is a new directory for storing volatile runtime data.
 # Read more about /run at https://lwn.net/Articles/436012
-if [ -d /run ]; then
-	if mountinfo -q /run; then
-		einfo "/run is already mounted, skipping"
-	else
-		ebegin "Mounting /run"
-		if ! fstabinfo --mount /run; then
-			mount -t tmpfs -o mode=0755,nosuid,nodev tmpfs /run
+sys="$(rc --sys)"
+
+if [ ! -d /run ]; then
+	if [ "$sys" = VSERVER ]; then
+		if [ -e /run ]; then
+		rm -rf /run
 		fi
-		eend $?
+		mkdir /run
+	else
+		eerror "The /run directory does not exist. Unable to continue."
+		return 1
 	fi
-	checkpath -d -m 0775 -o root:uucp /run/lock
-elif [ -e /run ]; then
-	einfo "Unable to mount /run since it is not a directory"
 fi
 
+if [ -L /run/openrc ]; then
+	rm /run/openrc
+fi
+
+if [ "$sys" = VSERVER ]; then
+	rm -rf /run/*
+elif ! mountinfo -q /run; then
+	ebegin "Mounting /run"
+	rc=0
+	if ! fstabinfo --mount /run; then
+		mount -t tmpfs -o mode=0755,nosuid,nodev tmpfs /run
+		rc=$?
+	fi
+	if [ $rc != 0 ]; then
+		eerror "Unable to mount tmpfs on /run."
+		eerror "Can't continue."
+		exit 1
+	fi
+fi
+
+checkpath -d $RC_SVCDIR
+checkpath -d -m 0775 -o root:uucp /run/lock
+
 # Try to mount xenfs as early as possible, otherwise rc_sys() will always
 # return RC_SYS_XENU and will think that we are in a domU while it's not.
 if grep -Eq "[[:space:]]+xenfs$" /proc/filesystems; then
@@ -119,4 +84,13 @@ if grep -Eq "[[:space:]]+xenfs$" /proc/filesystems; then
 	eend $?
 fi
 
-. "$RC_LIBEXECDIR"/sh/init-common-post.sh
+if [ -e "$RC_LIBEXECDIR"/cache/deptree ]; then
+	cp -p "$RC_LIBEXECDIR"/cache/* "$RC_SVCDIR" 2>/dev/null
+fi
+
+if [ -e "$RC_LIBEXECDIR"/init.d ]; then
+	rm -rf "$RC_LIBEXECDIR"/init.d
+fi
+
+echo sysinit >"$RC_SVCDIR"/softlevel
+exit 0

sh/migrate-to-run.sh.in

@@ -0,0 +1,29 @@
+#!@SHELL@
+# Copyright (c) 2012 William Hubbs <w.d.hubbs@gmail.com>
+# Released under the 2-clause BSD license.
+
+. "@LIBEXECDIR@/sh/functions.sh"
+
+if ! mountinfo -q -f tmpfs "@LIBEXECDIR@/init.d"; then
+	einfo "The OpenRC dependency data has already been migrated."
+	exit 0
+fi
+
+if [ ! -d /run ]; then
+	eerror "/run is not a directory."
+	eerror "moving /run to /run.pre-openrc"
+	mv /run /run.pre-openrc
+	mkdir /run
+fi
+
+rm -rf /run/openrc
+
+if ! mountinfo -q -f tmpfs /run; then
+	ln -s "@LIBEXECDIR@"/init.d /run/openrc
+else
+	cp -a "@LIBEXECDIR@/init.d" /run/openrc
+	rc-update -u
+fi
+
+einfo "The OpenRC dependency data was migrated successfully."
+exit 0

sh/runscript.sh.in

@@ -32,7 +32,7 @@ sourcex()
 	fi
 }
 
-sourcex "@SYSCONFDIR@/init.d/functions.sh"
+sourcex "@LIBEXECDIR@/sh/functions.sh"
 sourcex "@LIBEXECDIR@/sh/rc-functions.sh"
 
 # Support LiveCD foo
@@ -233,7 +233,12 @@ while [ -n "$1" ]; do
 	# Special case depend
 	if [ "$1" = depend ]; then
 		shift
+
+		# Enter the dir of the init script to fix the globbing
+		# bug 412677
+		cd ${RC_SERVICE%/*}
 		_depend
+		cd /
 		continue
 	fi
 	# See if we have the required function and run it

sh/tmpfiles.sh.in

@@ -0,0 +1,297 @@
+#!/bin/sh
+# This is a reimplementation of the systemd tmpfiles.d code
+# Control creation, deletion, and cleaning of volatile and temporary files
+#
+# Copyright (c) 2012 Gentoo Foundation
+#
+# This instance based on the Arch Linux version:
+# http://projects.archlinux.org/initscripts.git/tree/arch-tmpfiles
+# As of 2012/01/01
+#
+# See the tmpfiles.d manpage as well:
+# http://0pointer.de/public/systemd-man/tmpfiles.d.html
+# This script should match the manpage as of 2012/03/12
+#
+
+DRYRUN=0
+
+warninvalid() {
+	printf "tmpfiles: ignoring invalid entry on line %d of \`%s'\n" "$LINENUM" "$FILE"
+	error=$(( error+1 ))
+} >&2
+
+dryrun_or_real() {
+	local dryrun=
+	[ $DRYRUN -eq 1 ] && dryrun=echo
+	$dryrun "$@"
+}
+
+relabel() {
+	local path
+	local paths=$1 mode=$2 uid=$3 gid=$4
+
+	for path in ${paths}; do
+		if [ -e "$path" ]; then
+			[ $uid != '-' ] && dryrun_or_real chown $CHOPTS "$uid" "$path"
+			[ $gid != '-' ] && dryrun_or_real chgrp $CHOPTS "$gid" "$path"
+			[ $mode != '-' ] && dryrun_or_real chmod $CHOPTS "$mode" "$path"
+			[ -x /sbin/restorecon ] && dryrun_or_real restorecon $CHOPTS "$path"
+		fi
+	done
+}
+
+_b() {
+	# Create a block device node if it doesn't exist yet
+	local path=$1 mode=$2 uid=$3 gid=$4 age=$5 arg=$6
+	[ ! -e "$path" ] && dryrun_or_real mknod $path b ${arg%:*} ${arg#*:}
+}
+
+_c() {
+	# Create a character device node if it doesn't exist yet
+	local path=$1 mode=$2 uid=$3 gid=$4 age=$5 arg=$6
+	[ ! -e "$path" ] && dryrun_or_real mknod $path c ${arg%:*} ${arg#*:}
+}
+
+
+_f() {
+	# Create a file if it doesn't exist yet
+	local path=$1 mode=$2 uid=$3 gid=$4 age=$5 arg=$6
+
+	[ $CREATE -gt 0 ] || return 0
+
+	if [ ! -e "$path" ]; then
+		dryrun_or_real install -m"$mode" -o"$uid" -g"$gid" /dev/null "$path"
+		[ -z "$arg" ] || _w "$@"
+	fi
+}
+
+_F() {
+	# Create or truncate a file
+	local path=$1 mode=$2 uid=$3 gid=$4 age=$5 arg=$6
+
+	[ $CREATE -gt 0 ] || return 0
+
+	dryrun_or_real install -m"$mode" -o"$uid" -g"$gid" /dev/null "$path"
+	[ -z "$arg" ] || _w "$@"
+}
+
+_d() {
+	# Create a directory if it doesn't exist yet
+	local path=$1 mode=$2 uid=$3 gid=$4
+
+	[ $CREATE -gt 0 ] || return 0
+
+	if [ ! -d "$path" ]; then
+		dryrun_or_real install -d -m"$mode" -o"$uid" -g"$gid" "$path"
+	fi
+}
+
+_D() {
+	# Create or empty a directory
+	local path=$1 mode=$2 uid=$3 gid=$4
+
+	if [ -d "$path" ] && [ $REMOVE -gt 0 ]; then
+		dryrun_or_real find "$path" -mindepth 1 -maxdepth 1 -xdev -exec rm -rf {} +
+	fi
+
+	if [ $CREATE -gt 0 ]; then
+		dryrun_or_real install -d -m"$mode" -o"$uid" -g"$gid" "$path"
+	fi
+}
+
+_L() {
+	# Create a symlink if it doesn't exist yet
+	local path=$1 mode=$2 uid=$3 gid=$4 age=$5 arg=$6
+	[ ! -e "$path" ] && dryrun_or_real ln -s "$args" "$path"
+}
+
+_p() {
+	# Create a named pipe (FIFO) if it doesn't exist yet
+	local path=$1 mode=$2 uid=$3 gid=$4
+
+	[ $CREATE -gt 0 ] || return 0
+
+	if [ ! -p "$path" ]; then
+		dryrun_or_real mkfifo -m$mode "$path"
+		dryrun_or_real chown "$uid:$gid" "$path"
+	fi
+}
+
+_x() {
+	# Ignore a path during cleaning. Use this type to exclude paths from clean-up as
+	# controlled with the Age parameter. Note that lines of this type do not
+	# influence the effect of r or R lines. Lines of this type accept shell-style
+	# globs in place of of normal path names.
+	:
+	# XXX: we don't implement this
+}
+
+_r() {
+	# Remove a file or directory if it exists. This may not be used to remove
+	# non-empty directories, use R for that. Lines of this type accept shell-style
+	# globs in place of normal path names.
+	local path
+	local paths=$1
+
+	[ $REMOVE -gt 0 ] || return 0
+
+	for path in ${paths}; do
+		if [ -f "$path" ]; then
+			dryrun_or_real rm -f "$path"
+		elif [ -d "$path" ]; then
+			dryrun_or_real rmdir "$path"
+		fi
+	done
+}
+
+_R() {
+	# Recursively remove a path and all its subdirectories (if it is a directory).
+	# Lines of this type accept shell-style globs in place of normal path names.
+	local path
+	local paths=$1
+
+	[ $REMOVE -gt 0 ] || return 0
+
+	for path in ${paths}; do
+		[ -d "$path" ] && dryrun_or_real rm -rf --one-file-system "$path"
+	done
+}
+
+_w() {
+	# Write the argument parameter to a file, if it exists.
+	local path=$1 mode=$2 uid=$3 gid=$4 age=$5 arg=$6
+	if [ -f "$path" ]; then
+		if [ $DRYRUN -eq 1 ]; then
+			echo "echo \"$arg\" >>\"$path\""
+		else
+			echo "$arg" >>"$path"
+		fi
+	fi
+}
+
+_z() {
+	# Set ownership, access mode and relabel security context of a file or
+	# directory if it exists. Lines of this type accept shell-style globs in
+	# place of normal path names.
+	[ $CREATE -gt 0 ] || return 0
+
+	relabel "$@"
+}
+
+_Z() {
+	# Recursively set ownership, access mode and relabel security context of a
+	# path and all its subdirectories (if it is a directory). Lines of this type
+	# accept shell-style globs in place of normal path names.
+	[ $CREATE -gt 0 ] || return 0
+
+	CHOPTS=-R relabel "$@"
+}
+
+CREATE=0 REMOVE=0 CLEAN=0 VERBOSE=0 DRYRUN=0 error=0 LINENO=0
+FILE=
+fragments=
+# XXX: The harcoding of /usr/lib/ is an explicit choice by upstream
+tmpfiles_dirs='/usr/lib/tmpfiles.d/ /etc/tmpfiles.d/ /run/tmpfiles.d/'
+tmpfiles_basenames=''
+tmpfiles_d=''
+# Build a list of sorted unique basenames
+# directories declared later in the tmpfiles_d array will override earlier
+# directories, on a per file basename basis.
+# `/etc/tmpfiles.d/foo.conf' supersedes `/usr/lib/tmpfiles.d/foo.conf'.
+# `/run/tmpfiles/foo.conf' will always be read after `/etc/tmpfiles.d/bar.conf'
+for d in ${tmpfiles_dirs} ; do
+	[ -d $d ] && for f in ${d}/*.conf ; do
+		[ "$f" = "$d/systemd.conf" ] && continue
+		[ -f $f ] && tmpfiles_basenames="${tmpfiles_basenames}\n${f##*/}"
+	done # for f in ${d}
+done # for d in ${tmpfiles_dirs}
+tmpfiles_basenames="`printf "${tmpfiles_basenames}\n" | sort | uniq`"
+
+for b in $tmpfiles_basenames ; do
+	real_f=''
+	for d in $tmpfiles_dirs ; do
+		f=${d}/${b}
+		[ -f "${f}" ] && real_f=$f
+	done
+	[ -f "${real_f}" ] && tmpfiles_d="${tmpfiles_d} ${real_f}"
+done
+
+while [ $# -gt 0 ]; do
+	case $1 in
+		--create) CREATE=1 ;;
+		--remove) REMOVE=1 ;;
+		--clean) CLEAN=1 ;; # TODO: Not implemented
+		--verbose) VERBOSE=1 ;;
+		--dryrun|--dry-run) DRYRUN=1 ;;
+	esac
+	shift
+done
+
+if [ $(( CLEAN )) -eq 1 ] ; then
+	printf '%s clean mode is not implemented\n' "${0##*/}"
+	exit 1
+fi
+
+if [ "$CREATE$REMOVE" = '00' ]; then
+	printf 'usage: %s [--create] [--remove] [--clean] [--verbose] [--dry-run]\n' "${0##*/}"
+	exit 1
+fi
+
+error=0
+
+# loop through the gathered fragments, sorted globally by filename.
+# `/run/tmpfiles/foo.conf' will always be read after `/etc/tmpfiles.d/bar.conf'
+for FILE in $tmpfiles_d ; do
+	LINENUM=0
+
+	### FILE FORMAT ###
+	# XXX: We ignore the 'Age' parameter
+	# 1    2              3    4    5    6   7
+	# Cmd  Path           Mode UID  GID  Age Argument
+	# d    /run/user      0755 root root 10d -
+	# Mode, UID, GID, Age, Argument may be omitted!
+
+	# XXX: Upstream says whitespace is NOT permitted in the Path argument.
+	# But IS allowed when globs are expanded for the x/r/R/z/Z types.
+	while read cmd path mode uid gid age arg; do
+		LINENUM=$(( LINENUM+1 ))
+
+		# Unless we have both command and path, skip this line.
+		if [ -z "$cmd" -o -z "$path" ]; then
+			continue
+		fi
+
+		# whine about invalid entries
+		case $cmd in
+			f|F|w|d|D|p|L|c|b|x|r|R|z|Z) ;;
+			\#) continue ;;
+			*) warninvalid ; continue ;;
+		esac
+
+		# fall back on defaults when parameters are passed as '-'
+		if [ "$mode" = '-' -o "$mode" = '' ]; then
+			case "$cmd" in
+				p|f|F) mode=0644 ;;
+				d|D) mode=0755 ;;
+				z|Z|x|r|R|L) ;;
+			esac
+		fi
+
+		[ "$uid" = '-' -o "$uid" = '' ] && uid=0
+		[ "$gid" = '-' -o "$gid" = '' ] && gid=0
+		[ "$age" = '-' -o "$age" = '' ] && age=0
+		[ "$arg" = '-' -o "$arg" = '' ] && arg=''
+		set -- "$path" "$mode" "$uid" "$gid" "$age" "$arg"
+
+		[ "$VERBOSE" -eq "1" ] && echo _$cmd "$@"
+		_$cmd "$@"
+		rc=$?
+		if [ "${DRYRUN}" -eq "0" ]; then
+			[ $rc -ne 0 ] && error=$((error + 1))
+		fi
+	done <$FILE
+done
+
+exit $error
+
+# vim: set ts=2 sw=2 sts=2 noet ft=sh:

src/includes/helpers.h

@@ -0,0 +1,139 @@
+/*
+  helpers.h
+  This is private to us and not for user consumption
+*/
+
+/*
+ * Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef __HELPERS_H__
+#define __HELPERS_H__
+
+#define ERRX fprintf (stderr, "out of memory\n"); exit (1)
+
+#define UNCONST(a)		((void *)(unsigned long)(const void *)(a))
+
+#ifdef lint
+# define _unused
+#endif
+#if __GNUC__ > 2 || defined(__INTEL_COMPILER)
+# define _dead __attribute__((__noreturn__))
+# define _unused __attribute__((__unused__))
+#else
+# define _dead
+# define _unused
+#endif
+
+#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
+
+/* Some libc implemntations don't have these */
+#ifndef TAILQ_CONCAT
+#define TAILQ_CONCAT(head1, head2, field) do {				      \
+		if (!TAILQ_EMPTY(head2)) {				      \
+			*(head1)->tqh_last = (head2)->tqh_first;	      \
+			(head2)->tqh_first->field.tqe_prev = (head1)->tqh_last; \
+			(head1)->tqh_last = (head2)->tqh_last;		      \
+			TAILQ_INIT((head2));				      \
+		}							      \
+	} while (0)
+#endif
+
+#ifndef TAILQ_FOREACH_SAFE
+#define	TAILQ_FOREACH_SAFE(var, head, field, tvar)			      \
+	for ((var) = TAILQ_FIRST((head));				      \
+	     (var) && ((tvar) = TAILQ_NEXT((var), field), 1);		      \
+	     (var) = (tvar))
+#endif
+
+#ifdef __GLIBC__
+#  if ! defined (__UCLIBC__) && ! defined (__dietlibc__)
+#    define strlcpy(dst, src, size) snprintf(dst, size, "%s", src)
+#  endif
+#endif
+
+#ifndef timespecsub
+#define	timespecsub(tsp, usp, vsp)					      \
+	do {								      \
+		(vsp)->tv_sec = (tsp)->tv_sec - (usp)->tv_sec;		      \
+		(vsp)->tv_nsec = (tsp)->tv_nsec - (usp)->tv_nsec;	      \
+		if ((vsp)->tv_nsec < 0) {				      \
+			(vsp)->tv_sec--;				      \
+			(vsp)->tv_nsec += 1000000000L;			      \
+		}							      \
+	} while (/* CONSTCOND */ 0)
+#endif
+
+_unused static void *xmalloc (size_t size)
+{
+	void *value = malloc(size);
+
+	if (value)
+		return (value);
+
+	ERRX;
+	/* NOTREACHED */
+}
+
+_unused static void *xrealloc(void *ptr, size_t size)
+{
+	void *value = realloc(ptr, size);
+
+	if (value)
+		return (value);
+
+	ERRX;
+	/* NOTREACHED */
+}
+
+_unused static char *xstrdup(const char *str)
+{
+	char *value;
+
+	if (! str)
+		return (NULL);
+
+	value = strdup(str);
+
+	if (value)
+		return (value);
+
+	ERRX;
+	/* NOTREACHED */
+}
+
+#undef ERRX
+
+/* basename_c never modifies the argument. As such, if there is a trailing
+ * slash then an empty string is returned. */
+_unused static const char *basename_c(const char *path)
+{
+	const char *slash = strrchr(path, '/');
+
+	if (slash)
+		return (++slash);
+	return (path);
+}
+
+#endif

src/includes/rc-misc.h

@@ -38,6 +38,8 @@
 #include <string.h>
 #include <unistd.h>
 
+#include "helpers.h"
+
 #define RC_LEVEL_BOOT           "boot"
 #define RC_LEVEL_DEFAULT        "default"
 
@@ -52,98 +54,6 @@
 #define RC_SVCDIR_STARTED       RC_SVCDIR "/started"
 #define RC_SVCDIR_COLDPLUGGED	RC_SVCDIR "/coldplugged"
 
-#define ERRX fprintf (stderr, "out of memory\n"); exit (1)
-
-#define UNCONST(a)		((void *)(unsigned long)(const void *)(a))
-
-#ifdef lint
-# define _unused
-#endif
-#if __GNUC__ > 2 || defined(__INTEL_COMPILER)
-# define _dead __attribute__((__noreturn__))
-# define _unused __attribute__((__unused__))
-#else
-# define _dead
-# define _unused
-#endif
-
-/* Some libc implemntations don't have these */
-#ifndef TAILQ_CONCAT
-#define TAILQ_CONCAT(head1, head2, field) do {				      \
-		if (!TAILQ_EMPTY(head2)) {				      \
-			*(head1)->tqh_last = (head2)->tqh_first;	      \
-			(head2)->tqh_first->field.tqe_prev = (head1)->tqh_last; \
-			(head1)->tqh_last = (head2)->tqh_last;		      \
-			TAILQ_INIT((head2));				      \
-		}							      \
-	} while (0)
-#endif
-
-#ifndef TAILQ_FOREACH_SAFE
-#define	TAILQ_FOREACH_SAFE(var, head, field, tvar)			      \
-	for ((var) = TAILQ_FIRST((head));				      \
-	     (var) && ((tvar) = TAILQ_NEXT((var), field), 1);		      \
-	     (var) = (tvar))
-#endif
-
-#ifdef __GLIBC__
-#  if ! defined (__UCLIBC__) && ! defined (__dietlibc__)
-#    define strlcpy(dst, src, size) snprintf(dst, size, "%s", src)
-#  endif
-#endif
-
-#ifndef timespecsub
-#define	timespecsub(tsp, usp, vsp)					      \
-	do {								      \
-		(vsp)->tv_sec = (tsp)->tv_sec - (usp)->tv_sec;		      \
-		(vsp)->tv_nsec = (tsp)->tv_nsec - (usp)->tv_nsec;	      \
-		if ((vsp)->tv_nsec < 0) {				      \
-			(vsp)->tv_sec--;				      \
-			(vsp)->tv_nsec += 1000000000L;			      \
-		}							      \
-	} while (/* CONSTCOND */ 0)
-#endif
-
-_unused static void *xmalloc (size_t size)
-{
-	void *value = malloc(size);
-
-	if (value)
-		return (value);
-
-	ERRX;
-	/* NOTREACHED */
-}
-
-_unused static void *xrealloc(void *ptr, size_t size)
-{
-	void *value = realloc(ptr, size);
-
-	if (value)
-		return (value);
-
-	ERRX;
-	/* NOTREACHED */
-}
-
-_unused static char *xstrdup(const char *str)
-{
-	char *value;
-
-	if (! str)
-		return (NULL);
-
-	value = strdup(str);
-
-	if (value)
-		return (value);
-
-	ERRX;
-	/* NOTREACHED */
-}
-
-#undef ERRX
-
 _unused static bool exists(const char *pathname)
 {
 	struct stat buf;
@@ -176,16 +86,5 @@ int is_writable(const char *);
 #define service_start(service) exec_service(service, "start");
 #define service_stop(service)  exec_service(service, "stop");
 
-/* basename_c never modifies the argument. As such, if there is a trailing
- * slash then an empty string is returned. */
-_unused static const char *basename_c(const char *path)
-{
-	const char *slash = strrchr(path, '/');
-
-	if (slash)
-		return (++slash);
-	return (path);
-}
-
 int parse_mode(mode_t *, char *);
 #endif

src/libeinfo/libeinfo.c

@@ -51,6 +51,7 @@ const char libeinfo_copyright[] = "Copyright (c) 2007-2008 Roy Marples";
 #include <unistd.h>
 
 #include "einfo.h"
+#include "helpers.h"
 #include "hidden-visibility.h"
 
 hidden_proto(ecolor)
@@ -134,7 +135,7 @@ static const struct ecolor ecolors[] = {
 	{ ECOLOR_BRACKET, BRACKET, "bracket" },
 	{ ECOLOR_NORMAL,  0,       NULL      },
 };
-static const char *ecolors_str[sizeof(ecolors)/sizeof(ecolors[0])];
+static const char *ecolors_str[ARRAY_SIZE(ecolors)];
 
 static char *flush = NULL;
 static char *up = NULL;
@@ -225,27 +226,6 @@ strlcat(char *dst, const char *src, size_t size)
 
 	return dst_n + (s - src);
 }
-
-static size_t
-strlcpy(char *dst, const char *src, size_t size)
-{
-	const char *s = src;
-	size_t n = size;
-
-	if (n && --n)
-		do {
-			if (!(*dst++ = *src++))
-				break;
-		} while (--n);
-
-	if (!n) {
-		if (size)
-			*dst = '\0';
-		while (*src++);
-	}
-
-	return src - s - 1;
-}
 #  endif
 #endif
 
@@ -462,7 +442,7 @@ colour_terminal(FILE * EINFO_RESTRICT f)
 
 	/* Now setup our colours */
 	p = ebuffer;
-	for (i = 0; i < sizeof(ecolors) / sizeof(ecolors[0]); i++) {
+	for (i = 0; i < ARRAY_SIZE(ecolors); ++i) {
 		tmp[0] = '\0';
 		if (ecolors[i].name) {
 			bold = _md;
@@ -598,7 +578,7 @@ _ecolor(FILE * EINFO_RESTRICT f, ECOLOR color)
 	if (!colour_terminal(f))
 		return "";
 
-	for (i = 0; i < sizeof(ecolors) / sizeof(ecolors[0]); i++)
+	for (i = 0; i < ARRAY_SIZE(ecolors); ++i)
 		if (ecolors[i].color == color)
 			return ecolors_str[i];
 	return "";

src/librc/librc-depend.c

@@ -28,6 +28,8 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/utsname.h>
+
 #include "librc.h"
 
 #define GENDEP          RC_LIBEXECDIR "/sh/gendepends.sh"
@@ -687,27 +689,27 @@ rc_deptree_update_needed(time_t *newest, char *file)
 	if (!existss(RC_DEPTREE_CACHE))
 		return true;
 	if (!rc_newer_than(RC_DEPTREE_CACHE, RC_INITDIR, newest, file))
-		newer = true;
+		return true;
 	if (!rc_newer_than(RC_DEPTREE_CACHE, RC_CONFDIR, newest, file))
-		newer = true;
+		return true;
 #ifdef RC_PKG_INITDIR
 	if (!rc_newer_than(RC_DEPTREE_CACHE, RC_PKG_INITDIR, newest, file))
-		newer = true;
+		return true;
 #endif
 #ifdef RC_PKG_CONFDIR
 	if (!rc_newer_than(RC_DEPTREE_CACHE, RC_PKG_CONFDIR, newest, file))
-		newer = true;
+		return true;
 #endif
 #ifdef RC_LOCAL_INITDIR
 	if (!rc_newer_than(RC_DEPTREE_CACHE, RC_LOCAL_INITDIR, newest, file))
-		newer = true;
+		return true;
 #endif
 #ifdef RC_LOCAL_CONFDIR
 	if (!rc_newer_than(RC_DEPTREE_CACHE, RC_LOCAL_CONFDIR, newest, file))
-		newer = true;
+		return true;
 #endif
 	if (!rc_newer_than(RC_DEPTREE_CACHE, RC_CONF, newest, file))
-		newer = true;
+		return true;
 
 	/* Some init scripts dependencies change depending on config files
 	 * outside of baselayout, like syslog-ng, so we check those too. */
@@ -715,8 +717,7 @@ rc_deptree_update_needed(time_t *newest, char *file)
 	TAILQ_FOREACH(s, config, entries) {
 		if (!rc_newer_than(RC_DEPTREE_CACHE, s->value, newest, file)) {
 			newer = true;
-			if (newest == NULL)
-				break;
+			break;
 		}
 	}
 	rc_stringlist_free(config);
@@ -748,12 +749,15 @@ rc_deptree_update(void)
 	size_t i, k, l;
 	bool retval = true;
 	const char *sys = rc_sys();
+	struct utsname uts;
 
 	/* Some init scripts need RC_LIBEXECDIR to source stuff
 	   Ideally we should be setting our full env instead */
 	if (!getenv("RC_LIBEXECDIR"))
 		setenv("RC_LIBEXECDIR", RC_LIBEXECDIR, 0);
 
+	if (uname(&uts) == 0)
+		setenv("RC_UNAME", uts.sysname, 1);
 	/* Phase 1 - source all init scripts and print dependencies */
 	if (!(fp = popen(GENDEP, "r")))
 		return false;

src/librc/librc-misc.c

@@ -29,7 +29,6 @@
  */
 
 #include "librc.h"
-#include "einfo.h"
 
 bool
 rc_yesno(const char *value)
@@ -139,15 +138,13 @@ rc_proc_getent(const char *ent)
 	if (!exists("/proc/cmdline"))
 		return NULL;
 
-	if (!(fp = fopen("/proc/cmdline", "r"))) {
-		eerror("failed to open `/proc/cmdline': %s", strerror(errno));
+	if (!(fp = fopen("/proc/cmdline", "r")))
 		return NULL;
-	}
 
 	proc = NULL;
 	i = 0;
 	if (rc_getline(&proc, &i, fp) == -1 || proc == NULL)
-		eerror("rc_getline: %s", strerror(errno));
+		return NULL;
 
 	if (proc != NULL) {
 		len = strlen(ent);
@@ -394,13 +391,10 @@ rc_conf_value(const char *setting)
 		atexit(_free_rc_conf);
 #endif
 
-		/* Support old configs, but complain about it. */
+		/* Support old configs. */
 		if (exists(RC_CONF_OLD)) {
 			old = rc_config_load(RC_CONF_OLD);
 			TAILQ_CONCAT(rc_conf, old, entries);
-			ewarn("Your system still has %s", RC_CONF_OLD);
-			ewarn("Please migrate to the appropriate settings in %s", RC_CONF);
-			ewarn("and delete %s.", RC_CONF_OLD);
 #ifdef DEBUG_MEMORY
 			free(old);
 #endif

src/librc/librc.c

@@ -216,6 +216,7 @@ rc_sys_v2(void)
 		}
 		/* Now do detection */
 		__STRING_SWITCH(systype)
+		__STRING_CASE(RC_SYS_PREFIX)	{ return RC_SYS_PREFIX; }
 #ifdef __FreeBSD__
 		__STRING_CASE(RC_SYS_JAIL) { return RC_SYS_JAIL; }
 #endif /* __FreeBSD__ */
@@ -245,6 +246,10 @@ librc_hidden_def(rc_sys_v2)
 const char *
 rc_sys_v1(void)
 {
+#ifdef PREFIX
+	return RC_SYS_PREFIX;
+#else
+
 #ifdef __FreeBSD__
 	int jailed = 0;
 	size_t len = sizeof(jailed);
@@ -281,6 +286,7 @@ rc_sys_v1(void)
 #endif
 
 	return NULL;
+#endif /* PREFIX */
 }
 librc_hidden_def(rc_sys_v1)
 

src/librc/rc.h.in

@@ -33,10 +33,17 @@
 
 __BEGIN_DECLS
 
+#define RC_PREFIX "@PREFIX@"
 #define RC_SYSCONFDIR		"@SYSCONFDIR@"
 #define RC_LIBDIR               "@PREFIX@/@LIB@/rc"
 #define RC_LIBEXECDIR           "@LIBEXECDIR@"
+#if defined(PREFIX)
 #define RC_SVCDIR               RC_LIBEXECDIR "/init.d"
+#elif defined(__linux__)
+#define RC_SVCDIR               "/run/openrc"
+#else
+#define RC_SVCDIR               RC_LIBEXECDIR "/init.d"
+#endif
 #define RC_RUNLEVELDIR          RC_SYSCONFDIR "/runlevels"
 #define RC_INITDIR              RC_SYSCONFDIR "/init.d"
 #define RC_CONFDIR              RC_SYSCONFDIR "/conf.d"
@@ -276,6 +283,7 @@ bool rc_service_daemons_crashed(const char *);
 #define RC_SYS_JAIL    "JAIL"
 #define RC_SYS_OPENVZ  "OPENVZ"
 #define RC_SYS_LXC     "LXC"
+#define RC_SYS_PREFIX  "PREFIX"
 #define RC_SYS_UML     "UML"
 #define RC_SYS_VSERVER "VSERVER"
 #define RC_SYS_XEN0    "XEN0"

src/rc/_usage.h

@@ -38,7 +38,7 @@
 	"Disable color output",						      \
 	"Display software version",			              \
 	"Run verbosely",						      \
-	"Run quietly"
+	"Run quietly (Does not affect errors)"
 
 #define case_RC_COMMON_getopt_case_C  setenv ("EINFO_COLOR", "NO", 1);
 #define case_RC_COMMON_getopt_case_h  usage (EXIT_SUCCESS);

src/rc/checkpath.c

@@ -60,7 +60,8 @@ extern const char *applet;
  * See systemd's src/label.c:label_mkdir
  */
 static int
-do_check(char *path, uid_t uid, gid_t gid, mode_t mode, inode_t type, bool trunc)
+do_check(char *path, uid_t uid, gid_t gid, mode_t mode, inode_t type,
+		bool trunc, bool chowner)
 {
 	struct stat st;
 	int fd, flags;
@@ -132,14 +133,14 @@ do_check(char *path, uid_t uid, gid_t gid, mode_t mode, inode_t type, bool trunc
 	}
 
 	if (mode && (st.st_mode & 0777) != mode) {
-		einfo("%s: correcting mode", applet);
+		einfo("%s: correcting mode", path);
 		if (chmod(path, mode)) {
 			eerror("%s: chmod: %s", applet, strerror(errno));
 			return -1;
 		}
 	}
 
-	if (st.st_uid != uid || st.st_gid != gid) {
+	if (chowner && (st.st_uid != uid || st.st_gid != gid)) {
 		if (st.st_dev || st.st_ino)
 			einfo("%s: correcting owner", path);
 		if (chown(path, uid, gid)) {
@@ -222,19 +223,20 @@ checkpath(int argc, char **argv)
 	struct group *gr = NULL;
 	inode_t type = inode_unknown;
 	int retval = EXIT_SUCCESS;
-	bool trunc = 0;
+	bool trunc = false;
+	bool chowner = false;
 
 	while ((opt = getopt_long(argc, argv, getoptstring,
 		    longopts, (int *) 0)) != -1)
 	{
 		switch (opt) {
 		case 'D':
-			trunc = 1;
+			trunc = true;
 		case 'd':
 			type = inode_dir;
 			break;
 		case 'F':
-			trunc = 1;
+			trunc = true;
 		case 'f':
 			type = inode_file;
 			break;
@@ -247,6 +249,7 @@ checkpath(int argc, char **argv)
 				    applet, optarg);
 			break;
 		case 'o':
+			chowner = true;
 			if (parse_owner(&pw, &gr, optarg) != 0)
 				eerrorx("%s: owner `%s' not found",
 				    applet, optarg);
@@ -272,7 +275,7 @@ checkpath(int argc, char **argv)
 		gid = gr->gr_gid;
 
 	while (optind < argc) {
-		if (do_check(argv[optind], uid, gid, mode, type, trunc))
+		if (do_check(argv[optind], uid, gid, mode, type, trunc, chowner))
 			retval = EXIT_FAILURE;
 		optind++;
 	}

src/rc/fstabinfo.c

@@ -282,7 +282,7 @@ fstabinfo(int argc, char **argv)
 		END_ENT;
 
 		if (!TAILQ_FIRST(files))
-			eerrorx("%s: emtpy fstab", argv[0]);
+			eerrorx("%s: empty fstab", argv[0]);
 	}
 
 	if (!TAILQ_FIRST(files)) {

src/rc/mountinfo.c

@@ -390,12 +390,8 @@ mountinfo(int argc, char **argv)
 	char real_path[PATH_MAX + 1];
 	int opt;
 	int result;
-	bool quiet;
 	char *this_path;
 
-	/* Ensure that we are only quiet when explicitly told to be */
-	unsetenv("EINFO_QUIET");
-
 #define DO_REG(_var)							      \
 	if (_var) free(_var);						      \
 	_var = get_regex(optarg);
@@ -475,7 +471,6 @@ mountinfo(int argc, char **argv)
 	REG_FREE(args.skip_options_regex);
 
 	result = EXIT_FAILURE;
-	quiet = rc_yesno(getenv("EINFO_QUIET"));
 
 	/* We should report the mounts in reverse order to ease unmounting */
 	TAILQ_FOREACH_REVERSE(s, nodes, rc_stringlist, entries) {
@@ -485,7 +480,7 @@ mountinfo(int argc, char **argv)
 		if (skip_point_regex &&
 		    regexec(skip_point_regex, s->value, 0, NULL, 0) == 0)
 			continue;
-		if (! quiet)
+		if (! rc_yesno(getenv("EINFO_QUIET")))
 			printf("%s\n", s->value);
 		result = EXIT_SUCCESS;
 	}

src/rc/rc-applets.c

@@ -253,13 +253,38 @@ do_e(int argc, char **argv)
 	return retval;
 }
 
+static const struct {
+	const char * const name;
+	RC_SERVICE bit;
+} service_bits[] = {
+	{ "service_started",     RC_SERVICE_STARTED,     },
+	{ "service_stopped",     RC_SERVICE_STOPPED,     },
+	{ "service_inactive",    RC_SERVICE_INACTIVE,    },
+	{ "service_starting",    RC_SERVICE_STARTING,    },
+	{ "service_stopping",    RC_SERVICE_STOPPING,    },
+	{ "service_hotplugged",  RC_SERVICE_HOTPLUGGED,  },
+	{ "service_wasinactive", RC_SERVICE_WASINACTIVE, },
+	{ "service_failed",      RC_SERVICE_FAILED,      },
+};
+
+static RC_SERVICE
+lookup_service_state(const char *service)
+{
+	size_t i;
+	for (i = 0; i < ARRAY_SIZE(service_bits); ++i)
+		if (!strcmp(service, service_bits[i].name))
+			return service_bits[i].bit;
+	return 0;
+}
+
 static int
 do_service(int argc, char **argv)
 {
 	bool ok = false;
 	char *service;
 	char *exec;
-	int idx = 0;
+	int idx;
+	RC_SERVICE state, bit;
 
 	if (argc > 1)
 		service = argv[1];
@@ -269,21 +294,11 @@ do_service(int argc, char **argv)
 	if (service == NULL || *service == '\0')
 		eerrorx("%s: no service specified", applet);
 
-	if (strcmp(applet, "service_started") == 0)
-		ok = (rc_service_state(service) & RC_SERVICE_STARTED);
-	else if (strcmp(applet, "service_stopped") == 0)
-		ok = (rc_service_state(service) & RC_SERVICE_STOPPED);
-	else if (strcmp(applet, "service_inactive") == 0)
-		ok = (rc_service_state(service) & RC_SERVICE_INACTIVE);
-	else if (strcmp(applet, "service_starting") == 0)
-		ok = (rc_service_state(service) & RC_SERVICE_STARTING);
-	else if (strcmp(applet, "service_stopping") == 0)
-		ok = (rc_service_state(service) & RC_SERVICE_STOPPING);
-	else if (strcmp(applet, "service_hotplugged") == 0)
-		ok = (rc_service_state(service) & RC_SERVICE_HOTPLUGGED);
-	else if (strcmp(applet, "service_wasinactive") == 0)
-		ok = (rc_service_state(service) & RC_SERVICE_WASINACTIVE);
-	else if (strcmp(applet, "service_started_daemon") == 0) {
+	state = rc_service_state(service);
+	bit = lookup_service_state(applet);
+	if (bit) {
+		ok = (state & bit);
+	} else if (strcmp(applet, "service_started_daemon") == 0) {
 		service = getenv("RC_SVCNAME");
 		exec = argv[1];
 		if (argc > 3) {
@@ -315,37 +330,34 @@ do_mark_service(int argc, char **argv)
 	char *svcname = getenv("RC_SVCNAME");
 	char *service = NULL;
 	char *runscript_pid;
-	char *mtime;
+	/* char *mtime; */
 	pid_t pid;
-	size_t l;
+	RC_SERVICE bit;
+	/* size_t l; */
 
 	if (argc > 1)
 		service = argv[1];
 	else
-		service = getenv("RC_SVCNAME");
+		service = svcname;
 
 	if (service == NULL || *service == '\0')
 		eerrorx("%s: no service specified", applet);
 
-	if (strcmp(applet, "mark_service_started") == 0)
-		ok = rc_service_mark(service, RC_SERVICE_STARTED);
-	else if (strcmp(applet, "mark_service_stopped") == 0)
-		ok = rc_service_mark(service, RC_SERVICE_STOPPED);
-	else if (strcmp(applet, "mark_service_inactive") == 0)
-		ok = rc_service_mark(service, RC_SERVICE_INACTIVE);
-	else if (strcmp(applet, "mark_service_starting") == 0)
-		ok = rc_service_mark(service, RC_SERVICE_STARTING);
-	else if (strcmp(applet, "mark_service_stopping") == 0)
-		ok = rc_service_mark(service, RC_SERVICE_STOPPING);
-	else if (strcmp(applet, "mark_service_hotplugged") == 0)
-		ok = rc_service_mark(service, RC_SERVICE_HOTPLUGGED);
-	else if (strcmp(applet, "mark_service_failed") == 0)
-		ok = rc_service_mark(service, RC_SERVICE_FAILED);
+	if (!strncmp(applet, "mark_", 5) &&
+	    (bit = lookup_service_state(applet + 5)))
+		ok = rc_service_mark(service, bit);
 	else
 		eerrorx("%s: unknown applet", applet);
 
 	/* If we're marking ourselves then we need to inform our parent
 	   runscript process so they do not mark us based on our exit code */
+	/*
+	 * FIXME: svcname and service are almost always equal except called from a
+	 * shell with just argv[1] - So that doesn't seem to do what Roy initially
+	 * expected.
+	 * See 20120424041423.GA23657@odin.qasl.de (Tue, 24 Apr 2012 06:14:23 +0200,
+	 * openrc@gentoo.org).
+	 */
 	if (ok && svcname && strcmp(svcname, service) == 0) {
 		runscript_pid = getenv("RC_RUNSCRIPT_PID");
 		if (runscript_pid && sscanf(runscript_pid, "%d", &pid) == 1)
@@ -355,6 +367,7 @@ do_mark_service(int argc, char **argv)
 
 		/* Remove the exclusive time test. This ensures that it's not
 		   in control as well */
+		/*
 		l = strlen(RC_SVCDIR "/exclusive") + strlen(svcname) +
 		    strlen(runscript_pid) + 4;
 		mtime = xmalloc(l);
@@ -363,6 +376,7 @@ do_mark_service(int argc, char **argv)
 		if (exists(mtime) && unlink(mtime) != 0)
 			eerror("%s: unlink: %s", applet, strerror(errno));
 		free(mtime);
+		*/
 	}
 
 	return ok ? EXIT_SUCCESS : EXIT_FAILURE;
@@ -400,7 +414,7 @@ do_value(int argc, char **argv)
 }
 
 static int
-do_shell_var(int argc, char **argv)
+shell_var(int argc, char **argv)
 {
 	int i;
 	char *p;
@@ -421,106 +435,127 @@ do_shell_var(int argc, char **argv)
 	return EXIT_SUCCESS;
 }
 
+static int
+is_older_than(int argc, char **argv)
+{
+	int i;
+
+	if (argc < 3)
+		return EXIT_FAILURE;
+
+	/* This test is perverted - historically the baselayout function
+	 * returns 0 on *failure*, which is plain wrong */
+	for (i = 2; i < argc; ++i)
+		if (!rc_newer_than(argv[1], argv[i], NULL, NULL))
+			return EXIT_SUCCESS;
+
+	return EXIT_FAILURE;
+}
+
+static int
+is_newer_than(int argc, char **argv)
+{
+	int i;
+
+	if (argc < 3)
+		return EXIT_FAILURE;
+
+	/* This test is correct as it's not present in baselayout */
+	for (i = 2; i < argc; ++i)
+		if (!rc_newer_than(argv[1], argv[i], NULL, NULL))
+			return EXIT_FAILURE;
+
+	return EXIT_SUCCESS;
+}
+
+static int
+is_runlevel_start(_unused int argc, _unused char **argv)
+{
+	return rc_runlevel_starting() ? 0 : 1;
+}
+
+static int
+is_runlevel_stop(_unused int argc, _unused char **argv)
+{
+	return rc_runlevel_stopping() ? 0 : 1;
+}
+
+static int
+rc_abort(_unused int argc, _unused char **argv)
+{
+	const char *p = getenv("RC_PID");
+	int pid;
+
+	if (p && sscanf(p, "%d", &pid) == 1) {
+		if (kill(pid, SIGUSR1) != 0)
+			eerrorx("rc-abort: failed to signal parent %d: %s",
+			    pid, strerror(errno));
+		return EXIT_SUCCESS;
+	}
+
+	return EXIT_FAILURE;
+}
+
+static const struct {
+	const char * const name;
+	int (* const applet)(int argc, char **argv);
+} applets[] = {
+#define A(a) { #a, a }
+	A(fstabinfo),
+	A(mountinfo),
+	{ "rc-depend",           rc_depend,         },
+	{ "rc-service",          rc_service,        },
+	{ "rc-status",           rc_status,         },
+	{ "rc-update",           rc_update,         },
+	{ "update-rc",           rc_update,         },
+	A(runscript),
+	{ "start-stop-daemon",   start_stop_daemon, },
+	A(checkpath),
+	A(swclock),
+	A(shell_var),
+	A(is_older_than),
+	A(is_newer_than),
+	A(is_runlevel_start),
+	A(is_runlevel_stop),
+	{ "rc-abort",            rc_abort,          },
+	/* These are purely for init scripts and do not make sense as
+	 * anything else */
+	{ "service_get_value",   do_value,          },
+	{ "service_set_value",   do_value,          },
+	{ "get_options",         do_value,          },
+	{ "save_options",        do_value,          },
+#undef A
+};
+
 void
 run_applets(int argc, char **argv)
 {
-	int i = 2;
-	char *p;
-	pid_t pid = 0;
+	size_t i;
 
 	/* Bug 351712: We need an extra way to explicitly select an applet OTHER
 	 * than trusting argv[0], as argv[0] is not going to be the applet value if
 	 * we are doing SELinux context switching. For this, we allow calls such as
 	 * 'rc --applet APPLET', and shift ALL of argv down by two array items. */
 	if (strcmp(applet, "rc") == 0 && argc >= 3 &&
-		    (strcmp(argv[1],"--applet") == 0 || strcmp(argv[1], "-a") == 0)) {
+		(strcmp(argv[1],"--applet") == 0 || strcmp(argv[1], "-a") == 0)) {
 		applet = argv[2];
 		argv += 2;
 		argc -= 2;
 	}
 
-	/* These are designed to be applications in their own right */
-	if (strcmp(applet, "fstabinfo") == 0)
-		exit(fstabinfo(argc, argv));
-	else if (strcmp(applet, "mountinfo") == 0)
-		exit(mountinfo(argc, argv));
-	else if (strcmp(applet, "rc-depend") == 0)
-		exit(rc_depend(argc, argv));
-	else if (strcmp(applet, "rc-service") == 0)
-		exit(rc_service(argc, argv));
-	else if (strcmp(applet, "rc-status") == 0)
-		exit(rc_status(argc, argv));
-	else if (strcmp(applet, "rc-update") == 0 ||
-	    strcmp(applet, "update-rc") == 0)
-		exit(rc_update(argc, argv));
-	else if (strcmp(applet, "runscript") == 0)
-		exit(runscript(argc, argv));
-	else if (strcmp(applet, "start-stop-daemon") == 0)
-		exit(start_stop_daemon(argc, argv));
-	else if (strcmp (applet, "checkpath") == 0)
-		exit(checkpath(argc, argv));
-	else if (strcmp(applet, "swclock") == 0)
-		exit(swclock(argc, argv));
-
-	/* These could also be applications in their own right */
-	if (strcmp(applet, "shell_var") == 0)
-		exit(do_shell_var(argc, argv));
-
-	/* This test is perverted - historically the baselayout function
-	 * returns 0 on *failure*, which is plain wrong */
-	if (strcmp(applet, "is_older_than") == 0) {
-		if (argc < 3)
-			exit (EXIT_FAILURE);
-		while (i < argc) {
-			if (!rc_newer_than(argv[1], argv[i++], NULL, NULL))
-				exit(EXIT_SUCCESS);
-		}
-		exit(EXIT_FAILURE);
-	};
-	/* This test is correct as it's not present in baselayout */
-	if (strcmp(applet, "is_newer_than") == 0) {
-		if (argc < 3)
-			exit (EXIT_FAILURE);
-		while (i < argc) {
-			if (!rc_newer_than(argv[1], argv[i++], NULL, NULL))
-				exit(EXIT_FAILURE);
-		}
-		exit(EXIT_SUCCESS);
-	};
+	for (i = 0; i < ARRAY_SIZE(applets); ++i)
+		if (!strcmp(applet, applets[i].name))
+			exit(applets[i].applet(argc, argv));
 
 	if (applet[0] == 'e' || (applet[0] == 'v' && applet[1] == 'e'))
 		exit(do_e(argc, argv));
 
-	/* These are purely for init scripts and do not make sense as
-	 * anything else */
-	if (strcmp(applet, "service_get_value") == 0 ||
-	    strcmp(applet, "service_set_value") == 0 ||
-	    strcmp(applet, "get_options") == 0 ||
-	    strcmp(applet, "save_options") == 0)
-		exit(do_value(argc, argv));
-
 	if (strncmp(applet, "service_", strlen("service_")) == 0)
 		exit(do_service(argc, argv));
 
 	if (strncmp(applet, "mark_service_", strlen("mark_service_")) == 0)
 		exit(do_mark_service(argc, argv));
 
-	if (strcmp(applet, "is_runlevel_start") == 0)
-		exit(rc_runlevel_starting() ? 0 : 1);
-	else if (strcmp (applet, "is_runlevel_stop") == 0)
-		exit(rc_runlevel_stopping() ? 0 : 1);
-
-	if (strcmp(applet, "rc-abort") == 0) {
-		p = getenv("RC_PID");
-		if (p && sscanf(p, "%d", &pid) == 1) {
-			if (kill(pid, SIGUSR1) != 0)
-				eerrorx("rc-abort: failed to signal parent %d: %s",
-				    pid, strerror(errno));
-			exit(EXIT_SUCCESS);
-		}
-		exit(EXIT_FAILURE);
-	}
-
 	if (strcmp(applet, "rc") != 0)
 		eerrorx("%s: unknown applet", applet);
 }

src/rc/rc-misc.c

@@ -191,6 +191,10 @@ env_config(void)
 	if (sys)
 		setenv("RC_SYS", sys, 1);
 
+#ifdef PREFIX
+	setenv("RC_PREFIX", RC_PREFIX, 1);
+#endif
+
 	/* Some scripts may need to take a different code path if
 	   Linux/FreeBSD, etc
 	   To save on calling uname, we store it in an environment variable */

src/rc/rc.c

@@ -793,6 +793,13 @@ main(int argc, char **argv)
 	env_filter();
 	env_config();
 
+	/* complain about old configuration settings if they exist */
+	if (exists(RC_CONF_OLD)) {
+		ewarn("%s still exists on your system and should be removed.",
+				RC_CONF_OLD);
+		ewarn("Please migrate to the appropriate settings in %s", RC_CONF);
+	}
+
 	argc++;
 	argv--;
 	while ((opt = getopt_long(argc, argv, getoptstring,