Update ChangeLog

This makes the cgroups handling consistent between cgroups v1 and v2.
Also, it fixes #167.

.gitignore

@@ -1,4 +1,4 @@
-*.bz2
+*.gz
 
 *.diff
 *.patch

BUSYBOX.md

@@ -22,9 +22,6 @@ or recognize the nofail option in fstab.
 
 CONFIG_SETFONT -- The setfont applet does not support the -u option from kbd.
 
-CONFIG_IP -- The ip applet  doesn't support the "scope" modifier for
-"ip route add" and "ip address add".
-
 CONFIG_BB_SYSCTL -- The sysctl applet does not support the --system command
 line switch.
 

Makefile

@@ -13,7 +13,7 @@ MK=			${TOP}/mk
 
 include ${TOP}/Makefile.inc
 
-SUBDIR=		conf.d etc init.d local.d man scripts sh src sysctl.d
+SUBDIR=		conf.d etc init.d local.d man scripts sh src support sysctl.d
 
 # Build pkgconfig or not
 MKPKGCONFIG?=	yes

Makefile.inc

@@ -1,3 +1,3 @@
 NAME=		openrc
-VERSION=	0.21
+VERSION=	0.32
 PKG=		${NAME}-${VERSION}

NEWS.md

@@ -3,6 +3,76 @@
 This file will contain a list of notable changes for each release. Note
 the information in this file is in reverse order.
 
+## OpenRC 0.31
+
+This version adds support for Control Groups version 2, which is
+considered stable as of Linux-4.13. Please see /etc/rc.conf for
+documentation on how to configure control groups.
+
+## OpenRC-0.28
+
+This version mounts efivars read only due to concerns about changes in
+this file system making systems unbootable.  If you need to change something
+in this path, you will need to re-mount it read-write, make the change
+and re-mount it read-only.
+
+Also, you can override this behavior by adding a line for efivars to
+fstab if you want efivars mounted read-write.
+
+For more information on this issue, see the following url:
+
+https://github.com/openrc/openrc/issues/134
+
+## OpenRC-0.25
+
+This version contains an OpenRC-specific implementation of init for
+Linux which can be used in place of sysvinit or any other init process.
+For information on its usage, see the man pages for openrc-init (8) and
+openrc-shutdown (8).
+
+## OpenRC-0.24.1
+
+This version starts cleaning up the dependencies so that rc_parallel
+will work correctly.
+
+The first step in this process is to remove the 'before *' from the
+depend functions in the clock services. This means some  services not
+controlled by OpenRC may now start before instead of after the clock
+service. If it is important for these services to start after the clock
+service, they need to have 'after clock' added to their depend
+functions.
+
+## OpenRC-0.24
+
+Since the deptree2dot tool and the perl requirement are completely
+optional, the deptree2dot tool has been moved to the support directory.
+As a result, the MKTOOLS=yes/no switch has been removed from the makefiles.
+
+This version adds the agetty service which can be used to spawn
+agetty on a specific terminal. This is currently documented in the
+agetty-guide.md file at the top level of this distribution.
+
+## OpenRC-0.23
+
+The tmpfiles.d processing code, which was part of previous versions of
+OpenRC, has been separated into its own package [1]. If you need to
+process systemd style tmpfiles.d files, please install this package.
+
+[1] https://github.com/openrc/opentmpfiles
+
+## OpenRC-0.22
+
+In previous versions of OpenRC, configuration information was processed
+so that service-specific configuration stored in /etc/conf.d/* was
+overridden by global configuration stored in /etc/rc.conf. This release
+reverses that. Global configuration is now overridden by
+service-specific configuration.
+
+The swapfiles service, which was basically a copy of the swap service,
+has been removed. If you are only using swap partitions, this change
+will not affect you. If you are using swap files, please adjust the
+dependencies of the swap service as shown in /etc/conf.d/swap.
+
 ## OpenRC-0.21
 
 This version adds a daemon supervisor which can start daemons and
@@ -17,6 +87,19 @@ these files for the setup.
 The deprecation messages in 0.13.x for runscript and rc are now
 made visible in preparation for the removal of these binaries in 1.0.
 
+The steps you should take to get rid of these warnings is to run openrc
+in initialization steps instead of rc and change the shebang lines in
+service scripts to refer to "openrc-run" instead of "runscript".
+
+In 0.21.4, a modules-load service was added. This works like the
+equivalent service in systemd. It looks for files named *.conf first in
+/usr/lib/modules-load.d, then /run/modules-load.d, then
+/etc/modules-load.d. These files contain a list of modules, one per
+line, which should be loaded into the kernel. If a file name appears in
+/run/modules-load.d, it overrides a file of the same name in
+/usr/lib/modules-load.d. A file appearing in /etc/modules-load.d
+overrides a file of the same name in both previous directories.
+
 ## OpenRC-0.19
 
 This version adds a net-online service. By default, this

README.md

@@ -28,9 +28,9 @@ MKPREFIX=yes
 MKPKGCONFIG=no
 MKSELINUX=yes
 MKSTATICLIBS=no
+MKSYSVINIT=yes
 MKTERMCAP=ncurses
 MKTERMCAP=termcap
-MKTOOLS=yes
 PKG_PREFIX=/usr/pkg
 LOCAL_PREFIX=/usr/local
 PREFIX=/usr/local
@@ -43,9 +43,6 @@ 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`.
 
 `PKG_PREFIX` should be set to where packages install to by default.
@@ -76,10 +73,6 @@ Obviously, if you're installing this onto a system that does not use
 OpenRC by default then you may wish to backup the above listed files,
 remove them and then install so that the OS hooks into OpenRC.
 
-`init.d.misc` is not installed by default as the scripts will need
-tweaking on a per distro basis. They are also non essential to the
-operation of the system.
-
 ## Reporting Bugs
 
 If you are using Gentoo Linux, bugs can be filed on their bugzilla under

agetty-guide.md

@@ -0,0 +1,18 @@
+# Setting up the agetty service in OpenRC
+
+The agetty service is an OpenRC specific way to monitor and respawn a
+getty, using agetty, on Linux. To use this method, make sure you aren't
+spawning a getty manager for this port some other way (such as through
+sysvinit/inittab), then run the following commands as root.
+
+Note that [port] refers to the port you are spawning the getty on, for
+example, tty1 or ttyS0. The full path to it, for example, /dev/tty1
+should not be used.
+
+```
+# cd /etc/init.d
+# ln -s agetty agetty.[port]
+# cd /etc/conf.d
+# cp agetty agetty.[port]
+#rc-update add agetty.[port] [runlevel]
+```

conf.d/.gitignore

@@ -1,2 +0,0 @@
-network
-staticroute

conf.d/Makefile

@@ -1,29 +1,20 @@
 include ../mk/net.mk
 
 DIR=	${CONFDIR}
-CONF=	bootmisc fsck hostname localmount netmount urandom tmpfiles \
+CONF=	bootmisc fsck hostname localmount netmount swap urandom ${CONF-${OS}}
-		${CONF-${OS}}
 
 ifeq (${MKNET},yes)
 CONF+= network staticroute
-TARGETS+=	network staticroute
-CLEANFILES+=	network staticroute
 endif
 
 MK=	../mk
 include ${MK}/os.mk
 
-CONF-FreeBSD=	ipfw moused powerd rarpd savecore syscons
+CONF-FreeBSD=	ipfw modules moused powerd rarpd savecore syscons
 
-CONF-Linux=	consolefont devfs dmesg hwclock keymaps killprocs modules mtab \
+CONF-Linux=	agetty consolefont devfs dmesg hwclock keymaps killprocs modules \
-	net-online
+	mtab net-online
 
 CONF-NetBSD=	moused rarpd savecore
 
 include ${MK}/scripts.mk
-
-network: network.in network${SFX}
-	cat $^ > $@
-
-staticroute: staticroute${SFX}
-	cp $@${SFX} $@

conf.d/agetty

@@ -0,0 +1,8 @@
+# Set the baud rate of the terminal line
+#baud=""
+
+# set the terminal type
+#term_type="linux"
+
+# extra options to pass to agetty for this port
+#agetty_options=""

conf.d/killprocs

@@ -1,3 +1,6 @@
-# If you wish to pass any options to killall5 during shutdown,
+# If you wish to pass any options to kill_all during shutdown,
 # you should do so here.
+#
+# The setting is called killall5_opts because the options here are meant
+# to be identical to those you could pass to killall5.
 killall5_opts=""

conf.d/localmount

@@ -3,7 +3,7 @@
 #no_umounts="/dir1:/var/dir2"
 #
 # Mark certain mount points as critical.
-# This contains aspace separated list of mount points which should be
+# This contains a space separated list of mount points which should be
 # considered critical. If one of these mount points cannot be mounted,
 # localmount will fail.
 # By default, this is empty.

conf.d/modules

@@ -1,18 +1,22 @@
-# You can define a list modules for a specific kernel version,
+# Linux users can define a list of modules for a specific kernel version,
-# a released kernel version, a main kernel version or just a list.
+# a released kernel version, a main kernel version or all kernel versions.
 # The most specific versioned variable will take precedence.
+# FreeBSD users can only use the modules="foo bar" setting.
 #modules_2_6_23_gentoo_r5="ieee1394 ohci1394"
 #modules_2_6_23="tun ieee1394"
 #modules_2_6="tun"
 #modules_2="ipv6"
 #modules="ohci1394"
 
-# You can give modules a different name when they load - the new name
+# Linux users can give modules a different name when they load - the new name
 # will also be used to pick arguments below.
+# This is not supported on FreeBSD.
 #modules="dummy:dummy1"
 
-# Give the modules some arguments if needed, per version if necessary.
+# Linux users can give the modules some arguments if needed, per version
+# if necessary.
 # Again, the most specific versioned variable will take precedence.
+# This is not supported on FreeBSD.
 #module_ieee1394_args="debug"
 #module_ieee1394_args_2_6_23_gentoo_r5="debug2"
 #module_ieee1394_args_2_6_23="debug3"

conf.d/net-online

@@ -1,12 +1,15 @@
 # The interfaces setting controls which interfaces the net-online
-# service considers in deciding whether the network is active. By
+# service considers in deciding whether the network is active. The
-# default, it is all ethernet or wireless LAN interfaces.
+# default is all interfaces that support ethernet.
 #interfaces=""
 
-# This setting controls whether a ping to the default gateway is
+# This setting controls whether a ping test is included in the test for
-# included in the test for network connectivity after all interfaces
+# network connectivity after all interfaces are active.
-# are active.
+#include_ping_test=no
-#ping_default_gateway=no
+
+# This setting is the host to attempt to ping if the above is yes.
+# The default is google.com.
+#ping_test_host=some.host.name
 
 # The timeout setting controls how long the net-online service waits
 # for the network to be configured.

conf.d/network

@@ -0,0 +1,80 @@
+# Assign static IP addresses and run custom scripts per interface.
+# Seperate commands with ;
+# Prefix with ! to run a shell script.
+# Use \$int to represent the interface
+#ifconfig_eth0="192.168.0.10 netmask 255.255.255.0"
+
+# You also have ifup_eth0 and ifdown_eth0 to run other commands when
+# eth0 is started and stopped.
+# You should note that we don't stop the network at system shutdown by default.
+# If you really need this, then set keep_network=NO
+
+# Lastly, the interfaces variable pulls in virtual interfaces that cannot
+# be automatically detected.
+#interfaces="br0 bond0 vlan0"
+
+# You can also use files instead of variables here if you like:
+# /etc/ifconfig.eth0 is equivalent to ifconfig_eth0
+# /etc/ip.eth0 is equivalent to ifconfig_eth0
+# /etc/ifup.eth0 is equivalent to ifup_eth0
+# /etc/ifdown.eth0 is equivalent to ifdown_eth0
+# Any files found will automatically be put into the interfaces variable.
+# You don't need to escape variables in files, so use $int instead of \$int.
+
+# If you require DHCP, you should install dhcpcd and add it to the boot or
+# default runlevel.
+
+# NIS users can set the domain name here
+#domainname="foobar"
+
+# You can add a default route.
+# The way this is done is slightly different depending on the operating system.
+#
+# *BSD:
+#defaultroute="192.168.0.1"
+#defaultroute6="2001:a:b:c"
+#Hurd/Linux (ifconfig):
+#defaultroute="gw 192.168.0.1"
+#defaultroute6="gw 2001:a:b:c"
+
+# The remainder of this file applies to Linux only and shows how
+# iproute2 is supported along with other examples.
+
+# ifconfig under Linux is not that powerful and doesn't easily handle
+# multiple addresses
+# On the other hand, iproute2 is quite powerful and is also supported
+#ip_eth0="192.168.0.10/24; 192.168.10.10/24"
+
+# You can also use iproute2 to add the default route.
+#defaultiproute="via 192.168.0.1"
+#defaultiproute6="via 2001:a:b:c"
+
+# ip doesn't handle MTU like ifconfig, but we can do it like so
+#ifup_eth0="ip link set \$int mtu 1500"
+
+# Create a bonded interface
+#interfaces="bond0"
+#ifup_bond0="modprobe bonding; ifconfig \$int up; ifenslave \$int bge0"
+#ifconfig_bond0="192.168.0.10 netmask 255.255.255.0"
+#ifdown_bond0="rmmod bonding"
+
+# Create tap interface and a bridge interface.
+# We add the tap to the bridge.
+# An external program, like dhcpcd, will configure the IP on the bridge
+#interfaces="tun0 br0"
+#ifup_tun0="tunctl -t \$int"
+#ifdown_tun0="tunctl -d \$int"
+#ifup_br0="brctl addbr \$int; brctl add \$int eth1; brtctl add \$int eth2"
+#ifdown_br0="ifconfig \$int down; btctl delbr \$int"
+
+# Create VLAN
+#interfaces="eth0_2 eth0_3 eth0_4"
+#ifup_eth0="vconfig add \$int 2; vconfig add \$int 3; vconfig add \$int 4"
+#ifconfig_eth0_2="192.168.2.10 netmask 255.255.255.0"
+#ifconfig_eth0_3="192.168.3.10 netmask 255.255.255.0"
+#ifconfig_eth0_4="192.168.4.10 netmask 255.255.255.0"
+#ifdown_eth0="vconfig rem \$int.2; vconfig rem \$int.3; vconfig rem \$int.4"
+
+# Normally you would use wpa_supplicant to configure wireless, but you can
+# use iwconfig also
+#ifup_wlan0="iwconfig \$int key s:secretkey enc open essid foobar"

conf.d/network.BSD.in

@@ -1,4 +0,0 @@
-
-# You can assign a default route
-#defaultroute="192.168.0.1"
-#defaultroute6="2001:a:b:c"

conf.d/network.GNU-kFreeBSD.in

@@ -1,4 +0,0 @@
-
-# You can assign a default route
-#defaultroute="192.168.0.1"
-#defaultroute6="2001:a:b:c"

conf.d/network.GNU.in

@@ -1,4 +0,0 @@
-
-# You can assign a default route
-#defaultroute="gw 192.168.0.1"
-#defaultroute6="gw 2001:a:b:c"

conf.d/network.Linux.in

@@ -1,43 +0,0 @@
-
-# You can assign a default route
-#defaultroute="gw 192.168.0.1"
-#defaultroute6="gw 2001:a:b:c"
-
-# ifconfig under Linux is not that powerful and doesn't easily handle
-# multiple addresses
-# On the other hand, ip (iproute2) is quite powerful and is also supported
-#ip_eth0="192.168.0.10/24; 192.168.10.10/24"
-
-# You can also use ip to add the default route.
-#defaultiproute="via 192.168.0.1"
-#defaultiproute6="via 2001:a:b:c"
-
-# ip doesn't handle MTU like ifconfig, but we can do it like so
-#ifup_eth0="ip link set \$int mtu 1500"
-
-# Create a bonded interface
-#interfaces="bond0"
-#ifup_bond0="modprobe bonding; ifconfig \$int up; ifenslave \$int bge0"
-#ifconfig_bond0="192.168.0.10 netmask 255.255.255.0"
-#ifdown_bond0="rmmod bonding"
-
-# Create tap interface and a bridge interface.
-# We add the tap to the bridge.
-# An external program, like dhcpcd, will configure the IP on the bridge
-#interfaces="tun0 br0"
-#ifup_tun0="tunctl -t \$int"
-#ifdown_tun0="tunctl -d \$int"
-#ifup_br0="brctl addbr \$int; brctl add \$int eth1; brtctl add \$int eth2"
-#ifdown_br0="ifconfig \$int down; btctl delbr \$int"
-
-# Create VLAN
-#interfaces="eth0_2 eth0_3 eth0_4"
-#ifup_eth0="vconfig add \$int 2; vconfig add \$int 3; vconfig add \$int 4"
-#ifconfig_eth0_2="192.168.2.10 netmask 255.255.255.0"
-#ifconfig_eth0_3="192.168.3.10 netmask 255.255.255.0"
-#ifconfig_eth0_4="192.168.4.10 netmask 255.255.255.0"
-#ifdown_eth0="vconfig rem \$int.2; vconfig rem \$int.3; vconfig rem \$int.4"
-
-# Normally you would use wpa_supplicant to configure wireless, but you can
-# use iwconfig also
-#ifup_wlan0="iwconfig \$int key s:secretkey enc open essid foobar"

conf.d/network.in

@@ -1,28 +0,0 @@
-# Assign static IP addresses and run custom scripts per interface.
-# Seperate commands with ;
-# Prefix with ! to run a shell script.
-# Use \$int to represent the interface
-#ifconfig_eth0="192.168.0.10 netmask 255.255.255.0"
-
-# You also have ifup_eth0 and ifdown_eth0 to run other commands when
-# eth0 is started and stopped.
-# You should note that we don't stop the network at system shutdown by default.
-# If you really need this, then set keep_network=NO
-
-# Lastly, the interfaces variable pulls in virtual interfaces that cannot
-# be automatically detected.
-#interfaces="br0 bond0 vlan0"
-
-# You can also use files instead of variables here if you like:
-# /etc/ifconfig.eth0 is equivalent to ifconfig_eth0
-# /etc/ip.eth0 is equivalent to ifconfig_eth0
-# /etc/ifup.eth0 is equivalent to ifup_eth0
-# /etc/ifdown.eth0 is equivalent to ifdown_eth0
-# Any files found will automatically be put into the interfaces variable.
-# You don't need to escape variables in files, so use $int instead of \$int.
-
-# If you require DHCP, you should install dhcpcd and it to the boot or
-# default runlevel.
-
-# NIS users can set the domain name here
-#domainname="foobar"

conf.d/staticroute

@@ -0,0 +1,26 @@
+# Static routes are defined differently depending on your operating
+# system, so please be sure to use the correct syntax.
+# Do not use this file to define the default route.
+# In all settings, multiple routes should be separated using ; or new lines.
+
+# Define static routes on Linux using route. See route(8) for syntax.
+#staticroute="net 192.168.0.0 netmask 255.255.255.0 gw 10.73.1.1
+#net 192.168.1.0 netmask 255.255.255.0 gw 10.73.1.1"
+
+# Define static routes on Linux using iproute2. See ip(8) for syntax.
+#staticiproute="192.168.0.0/24 via 10.73.1.1; 192.168.1.0/24 via 10.73.1.1"
+
+# Define static routes on GNU/Hurd. See route(8) for syntax.
+# /etc/route.conf(5) takes precedence over this configuration.
+# FIXME: "net ..." not supported
+#staticroute="net 192.168.0.0 -netmask 255.255.255.0 --address 10.73.1.1
+#net 192.168.1.0 -netmask 255.255.255.0 --address 10.73.1.1"
+
+# Define static routes on GNU/KFreeBSD. See route(8) for syntax.
+#staticroute="net 192.168.0.0 10.73.1.1 netmask 255.255.255.0
+#net 192.168.1.0 10.73.1.1 netmask 255.255.255.0"
+
+# Define static routes on other BSD systems. See route(8) for syntax.
+# /etc/route.conf(5) takes precedence over this configuration.
+#staticroute="net 192.168.0.0 -netmask 255.255.255.0 10.73.1.1
+#net 192.168.1.0 -netmask 255.255.255.0 10.73.1.1"

conf.d/staticroute.BSD.in

@@ -1,6 +0,0 @@
-# Separate multiple routes using ; or new lines.
-# /etc/route.conf(5) takes precedence over this configuration.
-
-# Example static routes. See route(8) for syntax.
-#staticroute="net 192.168.0.0 -netmask 255.255.255.0 10.73.1.1
-#net 192.168.1.0 -netmask 255.255.255.0 10.73.1.1"

conf.d/staticroute.GNU-kFreeBSD.in

@@ -1,5 +0,0 @@
-# Separate multiple routes using ; or new lines.
-
-# Example static routes. See route(8) for syntax.
-#staticroute="net 192.168.0.0 10.73.1.1 netmask 255.255.255.0
-#net 192.168.1.0 10.73.1.1 netmask 255.255.255.0"

conf.d/staticroute.GNU.in

@@ -1,7 +0,0 @@
-# Separate multiple routes using ; or new lines.
-# /etc/route.conf(5) takes precedence over this configuration.
-
-# Example static routes. See route(8) for syntax.
-# FIXME: "net ..." not supported
-#staticroute="net 192.168.0.0 -netmask 255.255.255.0 --address 10.73.1.1
-#net 192.168.1.0 -netmask 255.255.255.0 --address 10.73.1.1"

conf.d/staticroute.Linux.in

@@ -1,8 +0,0 @@
-# Separate multiple routes using ; or new lines.
-
-# Example static routes. See route(8) for syntax.
-#staticroute="net 192.168.0.0 netmask 255.255.255.0 gw 10.73.1.1
-#net 192.168.1.0 netmask 255.255.255.0 gw 10.73.1.1"
-
-# Example static routes using iproute2. See ip(8) for syntax.
-#staticiproute="192.168.0.0/24 via 10.73.1.1; 192.168.1.0/24 via 10.73.1.1"

conf.d/swap

@@ -0,0 +1,13 @@
+# If you are only using local swap partitions, you should not change
+# this file. Otherwise, you need to uncomment the below rc_before line
+# followed by the appropriate rc_need line.
+#rc_before="!localmount"
+#
+# If you are using swap files stored on local file systems, uncomment
+# this line.
+#rc_need="localmount"
+#
+# If you are using swap files stored on network file systems or swap
+# partitions stored on network block devices such as iSCSI, uncomment
+# this line.
+#rc_need="netmount"

conf.d/tmpfiles

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

etc/.gitignore

@@ -1,3 +1,2 @@
-rc.conf
 rc
 rc.shutdown

etc/Makefile

@@ -1,10 +1,8 @@
 DIR=	${SYSCONFDIR}
-SRCS=	rc.conf.in rc.in rc.shutdown.in
+SRCS=	rc.in rc.shutdown.in
 BIN=	${BIN-${OS}}
 CONF=	rc.conf ${BIN-${OS}}
 
-CLEANFILES+=	rc.conf
-
 MK=	../mk
 include ${MK}/os.mk
 
@@ -23,6 +21,3 @@ CONF-NetBSD=
 SED_EXTRA=	${SED_EXTRA-${OS}}
 
 include ${MK}/scripts.mk
-
-rc.conf: rc.conf.in rc.conf.${OS}
-	${SED} ${SED_REPLACE} ${SED_EXTRA} $^ > $@

etc/rc.conf

@@ -0,0 +1,309 @@
+# Global OpenRC configuration settings
+
+# Set to "YES" if you want the rc system to try and start services
+# in parallel for a slight speed improvement. When running in parallel we
+# prefix the service output with its name as the output will get
+# jumbled up.
+# WARNING: whilst we have improved parallel, it can still potentially lock
+# the boot process. Don't file bugs about this unless you can supply
+# patches that fix it without breaking other things!
+#rc_parallel="NO"
+
+# Set rc_interactive to "YES" and you'll be able to press the I key during
+# boot so you can choose to start specific services. Set to "NO" to disable
+# this feature. This feature is automatically disabled if rc_parallel is
+# set to YES.
+#rc_interactive="YES"
+
+# If we need to drop to a shell, you can specify it here.
+# If not specified we use $SHELL, otherwise the one specified in /etc/passwd,
+# otherwise /bin/sh
+# Linux users could specify /sbin/sulogin
+#rc_shell=/bin/sh
+
+# Do we allow any started service in the runlevel to satisfy the dependency
+# or do we want all of them regardless of state? For example, if net.eth0
+# and net.eth1 are in the default runlevel then with rc_depend_strict="NO"
+# both will be started, but services that depend on 'net' will work if either
+# one comes up. With rc_depend_strict="YES" we would require them both to
+# come up.
+#rc_depend_strict="YES"
+
+# rc_hotplug controls which services we allow to be hotplugged.
+# A hotplugged service is one started by a dynamic dev manager when a matching
+# hardware device is found.
+# Hotplugged services appear in the "hotplugged" runlevel.
+# If rc_hotplug is set to any value, we compare the name of this service
+# to every pattern in the value, from left to right, and we allow the
+# service to be hotplugged if it matches a pattern, or if it matches no
+# patterns. Patterns can include shell wildcards.
+# To disable services from being hotplugged, prefix patterns with "!".
+#If rc_hotplug is not set or is empty, all hotplugging is disabled.
+# Example - rc_hotplug="net.wlan !net.*"
+# This allows net.wlan and any service not matching net.* to be hotplugged.
+# Example - rc_hotplug="!net.*"
+# This allows services that do not match "net.*" to be hotplugged.
+
+# rc_logger launches a logging daemon to log the entire rc process to
+# /var/log/rc.log
+# NOTE: Linux systems require the devfs service to be started before
+# logging can take place and as such cannot log the sysinit runlevel.
+#rc_logger="NO"
+
+# Through rc_log_path you can specify a custom log file.
+# The default value is: /var/log/rc.log
+#rc_log_path="/var/log/rc.log"
+
+# If you want verbose output for OpenRC, set this to yes. If you want
+# verbose output for service foo only, set it to yes in /etc/conf.d/foo.
+#rc_verbose=no
+
+# By default we filter the environment for our running scripts. To allow other
+# variables through, add them here. Use a * to allow all variables through.
+#rc_env_allow="VAR1 VAR2"
+
+# By default we assume that all daemons will start correctly.
+# However, some do not - a classic example is that they fork and return 0 AND
+# then child barfs on a configuration error. Or the daemon has a bug and the
+# child crashes. You can set the number of milliseconds start-stop-daemon
+# waits to check that the daemon is still running after starting here.
+# The default is 0 - no checking.
+#rc_start_wait=100
+
+# rc_nostop is a list of services which will not stop when changing runlevels.
+# This still allows the service itself to be stopped when called directly.
+#rc_nostop=""
+
+# rc will attempt to start crashed services by default.
+# However, it will not stop them by default as that could bring down other
+# critical services.
+#rc_crashed_stop=NO
+#rc_crashed_start=YES
+
+# Set rc_nocolor to yes if you do not want colors displayed in OpenRC
+# output.
+#rc_nocolor=NO
+
+##############################################################################
+# MISC CONFIGURATION VARIABLES
+# There variables are shared between many init scripts
+
+# Set unicode to YES to turn on unicode support for keyboards and screens.
+#unicode="NO"
+
+# This is how long fuser should wait for a remote server to respond. The
+# default is 60 seconds, but  it can be adjusted here.
+#rc_fuser_timeout=60
+
+# Below is the default list of network fstypes.
+#
+# afs ceph cifs coda davfs fuse fuse.sshfs gfs glusterfs lustre ncpfs
+# nfs nfs4 ocfs2 shfs smbfs
+#
+# If you would like to add to this list, you can do so by adding your
+# own fstypes to the following variable.
+#extra_net_fs_list=""
+
+##############################################################################
+# SERVICE CONFIGURATION VARIABLES
+# 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.
+#SSD_NICELEVEL="-19"
+# Or the ionice level. The format is class[:data] , just like the
+# --ionice start-stop-daemon parameter.
+#SSD_IONICELEVEL="2:2"
+
+# Pass ulimit parameters
+# If you are using bash in POSIX mode for your shell, note that the
+# ulimit command uses a block size of 512 bytes for the -c and -f
+# options
+#rc_ulimit="-u 30"
+
+# It's possible to define extra dependencies for services like so
+#rc_config="/etc/foo"
+#rc_need="openvpn"
+#rc_use="net.eth0"
+#rc_after="clock"
+#rc_before="local"
+#rc_provide="!net"
+
+# You can also enable the above commands here for each service. Below is an
+# example for service foo.
+#rc_foo_config="/etc/foo"
+#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 services do NOT provide net.
+#rc_net_tap0_provide="!net"
+
+# This is the subsystem type.
+# It is used to match against keywords set by the keyword call in the
+# depend function of service scripts.
+#
+# It should be set to the value representing the environment this file is
+# PRESENTLY in, not the virtualization the environment is capable of.
+# If it is commented out, automatic detection will be used.
+#
+# The list below shows all possible settings as well as the host
+# operating systems where they can be used and autodetected.
+#
+# ""               - nothing special
+# "docker"         - Docker container manager (Linux)
+# "jail"           - Jail (DragonflyBSD or FreeBSD)
+# "lxc"            - Linux Containers
+# "openvz"         - Linux OpenVZ
+# "prefix"         - Prefix
+# "rkt"            - CoreOS container management system (Linux)
+# "subhurd"        - Hurd subhurds (to be checked)
+# "systemd-nspawn" - Container created by systemd-nspawn (Linux)
+# "uml"            - Usermode Linux
+# "vserver"        - Linux vserver
+# "xen0"           - Xen0 Domain (Linux and NetBSD)
+# "xenU"           - XenU Domain (Linux and NetBSD)
+#rc_sys=""
+
+# if  you use openrc-init, which is currently only available on Linux,
+# this is the default runlevel to activate after "sysinit" and "boot"
+# when booting.
+#rc_default_runlevel="default"
+
+# on Linux and Hurd, this is the number of ttys allocated for logins
+# It is used in the consolefont, keymaps, numlock and termencoding
+# service scripts.
+rc_tty_number=12
+
+##############################################################################
+# LINUX CGROUPS RESOURCE MANAGEMENT
+
+# This sets the mode used to mount cgroups.
+# "hybrid" mounts cgroups version 2 on /sys/fs/cgroup/unified and
+# cgroups version 1 on /sys/fs/cgroup.
+# "legacy" mounts cgroups version 1 on /sys/fs/cgroup
+# "unified" mounts cgroups version 2 on /sys/fs/cgroup
+#rc_cgroup_mode="hybrid"
+
+# This is a list of controllers which should be enabled for cgroups version 2.
+# If hybrid mode is being used, controllers listed here will not be
+# available for cgroups version 1.
+# This is a global setting.
+#rc_cgroup_controllers=""
+
+# This variable contains the cgroups version 2 settings for your services.
+# If this is set in this file, the settings will apply to all services.
+# If you want different settings for each service, place the settings in
+# /etc/conf.d/foo for service foo.
+# The format is to specify the setting and value followed by a newline.
+# Multiple settings and values can be specified.
+# For example, you would use this to set the maximum memory and maximum
+# number of pids for a service.
+#rc_cgroup_settings="
+#memory.max 10485760
+#pids.max max
+#"
+#
+# For more information about the adjustments that can be made with
+# cgroups version 2, see Documentation/cgroups-v2.txt in the linux kernel
+# source tree.
+#rc_cgroup_settings=""
+
+# This switch controls whether or not cgroups version 1 controllers are
+# individually mounted under
+# /sys/fs/cgroup in hybrid or legacy mode.
+#rc_controller_cgroups="YES"
+
+# The following settings allow you to set up values for the cgroups version 1
+# controllers for your services.
+# They can be set in this file;, however, if you do this, the settings
+# will apply to all of your services.
+# If you want different settings for each service, place the settings in
+# /etc/conf.d/foo for service foo.
+# The format is to specify the names of the settings followed by their
+# values. Each variable can hold multiple settings.
+# For example, you would use this to set the cpu.shares setting in the
+# cpu controller to 512 for your service.
+# rc_cgroup_cpu="
+# cpu.shares 512
+# "
+#
+# For more information about the adjustments that can be made with
+# cgroups version 1, see Documentation/cgroups-v1/* in the linux kernel
+# source tree.
+
+# Set the blkio controller settings for this service.
+#rc_cgroup_blkio=""
+
+# Set the cpu controller settings for this service.
+#rc_cgroup_cpu=""
+
+# Add this service to the cpuacct controller (any value means yes).
+#rc_cgroup_cpuacct=""
+
+# Set the cpuset controller settings for this service.
+#rc_cgroup_cpuset=""
+
+# Set the devices controller settings for this service.
+#rc_cgroup_devices=""
+
+# Set the hugetlb controller settings for this service.
+#rc_cgroup_hugetlb=""
+
+# Set the memory controller settings for this service.
+#rc_cgroup_memory=""
+
+# Set the net_cls controller settings for this service.
+#rc_cgroup_net_cls=""
+
+# Set the net_prio controller settings for this service.
+#rc_cgroup_net_prio=""
+
+# Set the pids controller settings for this service.
+#rc_cgroup_pids=""
+
+# Set this to YES if you want all of the processes in a service's cgroup
+# killed when the service is stopped or restarted.
+# Be aware that setting this to yes means all of a service's
+# child processes will be killed. Keep this in mind if you set this to
+# yes here instead of for the individual services in
+# /etc/conf.d/<service>.
+# To perform this cleanup manually for a stopped service, you can
+# execute cgroup_cleanup with /etc/init.d/<service> cgroup_cleanup or
+# rc-service <service> cgroup_cleanup.
+# The process followed in this cleanup is the following:
+# 1. send stopsig (sigterm if it isn't set) to all processes left in the
+# cgroup immediately followed by sigcont.
+# 2. Send sighup to all processes in the cgroup if rc_send_sighup is
+# yes.
+# 3. delay for rc_timeout_stopsec seconds.
+# 4. send sigkill to all processes in the cgroup unless disabled by
+# setting rc_send_sigkill to no.
+# rc_cgroup_cleanup="NO"
+
+# If this is yes, we will send sighup to the processes in the cgroup
+# immediately after stopsig and sigcont.
+#rc_send_sighup="NO"
+
+# This is the amount of time in seconds that we delay after sending sigcont
+# and optionally sighup, before we optionally send sigkill to all
+# processes in the # cgroup.
+# The default is 90 seconds.
+#rc_timeout_stopsec="90"
+
+# If this is set to no, we do not send sigkill to all processes in the
+# cgroup.
+#rc_send_sigkill="YES"

etc/rc.conf.DragonFly

@@ -1,13 +0,0 @@
-##############################################################################
-# DragonFly BSD SPECIFIC OPTIONS
-
-# This is the subsystem type. Valid options on DragonFly BSD:
-# ""        - nothing special
-# "jail"    - DragonFly BSD 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
-# PRESENTLY in, not the virtualization the environment is capable of.
-#rc_sys=""
-

etc/rc.conf.FreeBSD

@@ -1,13 +0,0 @@
-##############################################################################
-# FreeBSD SPECIFIC OPTIONS
-
-# 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
-# PRESENTLY in, not the virtualization the environment is capable of.
-#rc_sys=""
-

etc/rc.conf.GNU

@@ -1,14 +0,0 @@
-##############################################################################
-# GNU/Hurd SPECIFIC OPTIONS
-
-# This is the subsystem type. Valid options on GNU/Hurd:
-# ""        - nothing special
-# "subhurd" - Hurd subhurds (to be checked)
-# If this is commented out, automatic detection will be used.
-#
-# This should be set to the value representing the environment this file is
-# PRESENTLY in, not the virtualization the environment is capable of.
-#rc_sys=""
-# This is the number of tty's used in most of the rc-scripts (like
-# consolefont, numlock, etc ...)
-#rc_tty_number=6?

etc/rc.conf.GNU-kFreeBSD

@@ -1,11 +0,0 @@
-##############################################################################
-# GNU/kFreeBSD SPECIFIC OPTIONS
-
-# This is the subsystem type. Valid options on GNU/kFreeBSD:
-# ""        - nothing special
-# "jail"    - FreeBSD jails (not yet implemented)
-# If this is commented out, automatic detection will be used.
-#
-# This should be set to the value representing the environment this file is
-# PRESENTLY in, not the virtualization the environment is capable of.
-#rc_sys=""

etc/rc.conf.Linux

@@ -1,90 +0,0 @@
-##############################################################################
-# LINUX SPECIFIC OPTIONS
-
-# This is the subsystem type. Valid options on Linux:
-# ""               - nothing special
-# "docker"         - Docker container manager
-# "lxc"            - Linux Containers
-# "openvz"         - Linux OpenVZ
-# "prefix"         - Prefix
-# "rkt"            - CoreOS container management system
-# "uml"            - Usermode Linux
-# "vserver"        - Linux vserver
-# "systemd-nspawn" - Container created by the systemd-nspawn utility
-# "xen0"           - Xen0 Domain
-# "xenU"           - XenU Domain
-# If this is commented out, automatic detection will be used.
-#
-# This should be set to the value representing the environment this file is
-# PRESENTLY in, not the virtualization the environment is capable of.
-#rc_sys=""
-
-# This is the number of tty's used in most of the rc-scripts (like
-# consolefont, numlock, etc ...)
-rc_tty_number=12
-
-##############################################################################
-# CGROUPS RESOURCE MANAGEMENT
-
-# 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.
-# None of the other options in this section work if this is set to "NO".
-#rc_controller_cgroups="YES"
-
-# The following settings allow you to set up values for the cgroup
-# controllers for your services.
-# They can be set in this file;, however, if you do this, the settings
-# will apply to all of your services.
-# If you want different settings for each service, place the settings in
-# /etc/conf.d/foo for service foo.
-# The format is to specify the names of the settings followed by their
-# values. Each variable can hold multiple settings.
-# For example, you would use this to set the cpu.shares setting in the
-# cpu controller to 512 for your service.
-# rc_cgroup_cpu="
-# cpu.shares 512
-# "
-#
-#For more information about the adjustments that can be made with
-#cgroups, see Documentation/cgroups/* in the linux kernel source tree.
-
-# Set the blkio controller settings for this service.
-#rc_cgroup_blkio=""
-
-# Set the cpu controller settings for this service.
-#rc_cgroup_cpu=""
-
-# Add this service to the cpuacct controller (any value means yes).
-#rc_cgroup_cpuacct=""
-
-# Set the cpuset controller settings for this service.
-#rc_cgroup_cpuset=""
-
-# Set the devices controller settings for this service.
-#rc_cgroup_devices=""
-
-# Set the hugetlb controller settings for this service.
-#rc_cgroup_hugetlb=""
-
-# Set the memory controller settings for this service.
-#rc_cgroup_memory=""
-
-# Set the net_cls controller settings for this service.
-#rc_cgroup_net_cls=""
-
-# Set the net_prio controller settings for this service.
-#rc_cgroup_net_prio=""
-
-# Set the pids controller settings for this service.
-#rc_cgroup_pids=""
-
-# Set this to YES if yu want all of the processes in a service's cgroup
-# killed when the service is stopped or restarted.
-# This should not be set globally because it kills all of the service's
-# child processes, and most of the time this is undesirable. Please set
-# it in /etc/conf.d/<service>.
-# To perform this cleanup manually for a stopped service, you can
-# execute cgroup_cleanup with /etc/init.d/<service> cgroup_cleanup or
-# rc-service <service> cgroup_cleanup.
-# rc_cgroup_cleanup="NO"

etc/rc.conf.NetBSD

@@ -1,14 +0,0 @@
-##############################################################################
-# NetBSD SPECIFIC OPTIONS
-
-# 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.
-#
-# This should be set to the value representing the environment this file is
-# PRESENTLY in, not the virtualization the environment is capable of.
-#rc_sys=""
-

etc/rc.conf.in

@@ -1,151 +0,0 @@
-# Global OpenRC configuration settings
-
-# Set to "YES" if you want the rc system to try and start services
-# in parallel for a slight speed improvement. When running in parallel we
-# prefix the service output with its name as the output will get
-# jumbled up.
-# WARNING: whilst we have improved parallel, it can still potentially lock
-# the boot process. Don't file bugs about this unless you can supply
-# patches that fix it without breaking other things!
-#rc_parallel="NO"
-
-# Set rc_interactive to "YES" and you'll be able to press the I key during
-# boot so you can choose to start specific services. Set to "NO" to disable
-# this feature. This feature is automatically disabled if rc_parallel is
-# set to YES.
-#rc_interactive="YES"
-
-# If we need to drop to a shell, you can specify it here.
-# If not specified we use $SHELL, otherwise the one specified in /etc/passwd,
-# otherwise /bin/sh
-# Linux users could specify /sbin/sulogin
-#rc_shell=/bin/sh
-
-# Do we allow any started service in the runlevel to satisfy the dependency
-# or do we want all of them regardless of state? For example, if net.eth0
-# and net.eth1 are in the default runlevel then with rc_depend_strict="NO"
-# both will be started, but services that depend on 'net' will work if either
-# one comes up. With rc_depend_strict="YES" we would require them both to
-# come up.
-#rc_depend_strict="YES"
-
-# rc_hotplug controls which services we allow to be hotplugged.
-# A hotplugged service is one started by a dynamic dev manager when a matching
-# hardware device is found.
-# Hotplugged services appear in the "hotplugged" runlevel.
-# If rc_hotplug is set to any value, we compare the name of this service
-# to every pattern in the value, from left to right, and we allow the
-# service to be hotplugged if it matches a pattern, or if it matches no
-# patterns. Patterns can include shell wildcards.
-# To disable services from being hotplugged, prefix patterns with "!".
-#If rc_hotplug is not set or is empty, all hotplugging is disabled.
-# Example - rc_hotplug="net.wlan !net.*"
-# This allows net.wlan and any service not matching net.* to be hotplugged.
-# Example - rc_hotplug="!net.*"
-# This allows services that do not match "net.*" to be hotplugged.
-
-# rc_logger launches a logging daemon to log the entire rc process to
-# /var/log/rc.log
-# NOTE: Linux systems require the devfs service to be started before
-# logging can take place and as such cannot log the sysinit runlevel.
-#rc_logger="YES"
-
-# Through rc_log_path you can specify a custom log file.
-# The default value is: /var/log/rc.log
-#rc_log_path="/var/log/rc.log"
-
-# If you want verbose output for OpenRC, set this to yes. If you want
-# verbose output for service foo only, set it to yes in /etc/conf.d/foo.
-#rc_verbose=no
-
-# By default we filter the environment for our running scripts. To allow other
-# variables through, add them here. Use a * to allow all variables through.
-#rc_env_allow="VAR1 VAR2"
-
-# By default we assume that all daemons will start correctly.
-# However, some do not - a classic example is that they fork and return 0 AND
-# then child barfs on a configuration error. Or the daemon has a bug and the
-# child crashes. You can set the number of milliseconds start-stop-daemon
-# waits to check that the daemon is still running after starting here.
-# The default is 0 - no checking.
-#rc_start_wait=100
-
-# rc_nostop is a list of services which will not stop when changing runlevels.
-# This still allows the service itself to be stopped when called directly.
-#rc_nostop=""
-
-# rc will attempt to start crashed services by default.
-# However, it will not stop them by default as that could bring down other
-# critical services.
-#rc_crashed_stop=NO
-#rc_crashed_start=YES
-
-# Set rc_nocolor to yes if you do not want colors displayed in OpenRC
-# output.
-#rc_nocolor=NO
-
-##############################################################################
-# MISC CONFIGURATION VARIABLES
-# There variables are shared between many init scripts
-
-# Set unicode to YES to turn on unicode support for keyboards and screens.
-#unicode="NO"
-
-# This is how long fuser should wait for a remote server to respond. The
-# default is 60 seconds, but  it can be adjusted here.
-#rc_fuser_timeout=60
-
-# Below is the default list of network fstypes.
-#
-# afs ceph cifs coda davfs fuse fuse.sshfs gfs glusterfs lustre ncpfs
-# nfs nfs4 ocfs2 shfs smbfs
-#
-# If you would like to add to this list, you can do so by adding your
-# own fstypes to the following variable.
-#extra_net_fs_list=""
-
-##############################################################################
-# SERVICE CONFIGURATION VARIABLES
-# 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.
-#SSD_NICELEVEL="-19"
-
-# Pass ulimit parameters
-# If you are using bash in POSIX mode for your shell, note that the
-# ulimit command uses a block size of 512 bytes for the -c and -f
-# options
-#rc_ulimit="-u 30"
-
-# It's possible to define extra dependencies for services like so
-#rc_config="/etc/foo"
-#rc_need="openvpn"
-#rc_use="net.eth0"
-#rc_after="clock"
-#rc_before="local"
-#rc_provide="!net"
-
-# You can also enable the above commands here for each service. Below is an
-# example for service foo.
-#rc_foo_config="/etc/foo"
-#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"
-

etc/rc.shutdown.in

@@ -14,7 +14,7 @@ trap : SIGINT SIGQUIT
 
 # Try and use stuff in /lib over anywhere else so we can shutdown
 # local mounts correctly.
-LD_LIBRARY_PATH="/lib${LD_LIBRARY_PATH:+:}${LDLIBRARY_PATH}" ; export LD_LIBRARY_PATH
+LD_LIBRARY_PATH="/lib${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}" ; export LD_LIBRARY_PATH
 
 # If $TERM is not set then assume default of @TERM@
 # This gives us a nice colour boot :)

guide.md

@@ -16,14 +16,14 @@ Current size is about 10k LoC C, and about 4k LoC shell.
 OpenRC is known to work on Linux, many BSDs (FreeBSD, OpenBSD, DragonFlyBSD at 
 least) and HURD.
 
-Services are stateful (i.e. start; start will lead to "it's already started")
+Services are stateful (i.e. `start`; `start` will lead to "it's already started")
 
 # Startup
 
-Usually PID1 (aka. init) calls the OpenRC binary ("/sbin/openrc" by default).
+Usually PID1 (aka. `init`) calls the OpenRC binary (`/sbin/openrc` by default).
 (The default setup assumes sysvinit for this)
 
-openrc scans the runlevels (default: "/etc/runlevels") and builds a dependency 
+openrc scans the runlevels (default: `/etc/runlevels`) and builds a dependency
 graph, then starts the needed service scripts, either serialized (default) or in 
 parallel.
 
@@ -32,29 +32,29 @@ daemon. (Integration with tools like monit, runit or s6 can be done)
 
 # Shutdown
 
-On change to runlevel 0/6 or running "reboot", "halt" etc., openrc stops all 
+On change to runlevel 0/6 or running `reboot`, `halt` etc., openrc stops all
-services that are started and runs the services in the "shutdown" runlevel.
+services that are started and runs the services in the `shutdown` runlevel.
 
 # Modifying Service Scripts
 
 Any service can, at any time, be started/stopped/restarted by executing 
-"rc-service someservice start", "rc-service someservice stop", etc.
+`rc-service someservice start`, `rc-service someservice stop`, etc.
 Another, less preferred method, is to run the service script directly,
-e.g. "/etc/init.d/service start", "/etc/init.d/service stop", etc.
+e.g. `/etc/init.d/service start`, `/etc/init.d/service stop`, etc.
 
 OpenRC will take care of dependencies, e.g starting apache will start network 
 first, and stopping network will stop apache first.
 
-There is a special command "zap" that makes OpenRC 'forget' that a service is 
+There is a special command `zap` that makes OpenRC 'forget' that a service is
 started; this is mostly useful to reset a crashed service to stopped state 
 without invoking the (possibly broken) stop function of the service script.
 
-Calling "openrc" without any arguments will try to reset all services so
+Calling `openrc` without any arguments will try to reset all services so
 that the current runlevel is satisfied; if you manually started apache it will be 
 stopped, and if squid died but is in the current runlevel it'll be restarted.
 
-There is a "service" helper that emulates the syntax seen on e.g. older Redhat 
+There is a `service` helper that emulates the syntax seen on e.g. older Redhat
-and Ubuntu ("service nginx start" etc.)
+and Ubuntu (`service nginx start` etc.)
 
 # Runlevels
 
@@ -65,100 +65,112 @@ own if needed. This allows, for example, to have a default runlevel with
 "everything" enabled, and a "powersaving" runlevel where some services are 
 disabled.
 
-The "rc-status" helper will print all currently active runlevels and the state 
+The `rc-status` helper will print all currently active runlevels and the state
 of init scripts in them:
 
+```
 # rc-status
  * Caching service dependencies ... [ ok ]
 Runlevel: default
  modules                     [  started  ]
  lvm                         [  started  ]
+```
 
-All runlevels are represented as folders in /etc/runlevels/ with symlinks to 
+All runlevels are represented as folders in `/etc/runlevels/` with symlinks to 
 the actual init scripts.
 
-Calling openrc with an argument ("openrc default") will switch to that
+Calling openrc with an argument (`openrc default`) will switch to that
 runlevel; this will start and stop services as needed.
 
-Managing runlevels is usually done through the "rc-update" helper, but could of 
+Managing runlevels is usually done through the `rc-update` helper, but could of 
 course be done by hand if desired.
-e.g. "rc-update add nginx default" - add nginx to the default runlevel
+e.g. `rc-update add nginx default` - add nginx to the default runlevel
-Note: This will not auto-start nginx! You'd still have to trigger "rc" or run 
+Note: This will not auto-start nginx! You'd still have to trigger `rc` or run 
 the initscript by hand.
 
 FIXME: Document stacked runlevels
 
-The default startup uses the runlevels "boot", "sysinit" and "default", in that 
+The default startup uses the runlevels `boot`, `sysinit` and `default`, in that 
-order. Shutdown uses the "shutdown" runlevel.
+order. Shutdown uses the `shutdown` runlevel.
 
 
 # Syntax of Service Scripts
 
 Service scripts are shell scripts. OpenRC aims at using only the standardized 
 POSIX sh subset for portability reasons. The default interpreter (build-time 
-toggle) is /bin/sh, so using for example mksh is not a problem.
+toggle) is `/bin/sh`, so using for example mksh is not a problem.
 
 OpenRC has been tested with busybox sh, ash, dash, bash, mksh, zsh and possibly 
 others. Using busybox sh has been difficult as it replaces commands with 
 builtins that don't offer the expected features.
 
-The interpreter for initscripts is #!/sbin/openrc-run
+The interpreter for initscripts is `#!/sbin/openrc-run`.
 Not using this interpreter will break the use of dependencies and is not 
-supported. (iow: if you insist on using #!/bin/sh you're on your own)
+supported. (iow: if you insist on using `#!/bin/sh` you're on your own)
 
-A "depend" function declares the dependencies of this service script.
+A `depend` function declares the dependencies of this service script.
 All scripts must have start/stop/status functions, but defaults are provided.
 Extra functions can be added easily:
 
+```
 extra_commands="checkconfig"
 checkconfig() {
 	doSomething
 }
+```
 
-This exports the checkconfig function so that "/etc/init.d/someservice 
+This exports the checkconfig function so that `/etc/init.d/someservice 
-checkconfig" will be available, and it "just" runs this function.
+checkconfig` will be available, and it "just" runs this function.
 
-While commands defined in extra_commands are always available, commands
+While commands defined in `extra_commands` are always available, commands
-defined in extra_started_commands will only work when the service is started
+defined in `extra_started_commands` will only work when the service is started
-and those defined in extra_stopped_commands will only work when the service is
+and those defined in `extra_stopped_commands` will only work when the service is
 stopped. This can be used for implementing graceful reload and similar
 behaviour.
 
 Adding a restart function will not work, this is a design decision within 
 OpenRC. Since there may be dependencies involved (e.g. network -> apache) a 
 restart function is in general not going to work. 
-restart is internally mapped to stop() + start() (plus handling dependencies).
+restart is internally mapped to `stop()` + `start()` (plus handling dependencies).
 If a service needs to behave differently when it is being restarted vs
-started or stopped, it should test the $RC_CMD variable, for example:
+started or stopped, it should test the `$RC_CMD` variable, for example:
-
-    [ "$RC_CMD" = restart ] && do_something
 
+```
+[ "$RC_CMD" = restart ] && do_something
+```
 
 # The Depend Function
 
 This function declares the dependencies for a service script. This
 determines the order the service scripts start.
 
+```
 depend() {
 	need net
 	use dns logger netmount
 	want coolservice
 }
+```
 
-"need" declares a hard dependency - net always needs to be started before this 
+`need` declares a hard dependency - net always needs to be started before this 
 	service does
-"use" is a soft dependency - if dns, logger or netmount is in this runlevel 
+
+`use` is a soft dependency - if dns, logger or netmount is in this runlevel 
 	start it before, but we don't care if it's not in this runlevel.
-	"want" is between need and use - try to start coolservice if it is
+	`want` is between need and use - try to start coolservice if it is
 	installed on the system, regardless of whether it is in the
 	runlevel, but we don't care if it starts.
-"before" declares that we need to be started before another service
+
-"after" declares that we need to be started after another service, without 
+`before` declares that we need to be started before another service
+
+`after` declares that we need to be started after another service, without 
 	creating a dependency (so on calling stop the two are independent)
-"provide" allows multiple implementations to provide one service type, e.g.:
+
-	'provide cron' is set in all cron-daemons, so any one of them started 
+`provide` allows multiple implementations to provide one service type, e.g.:
+	`provide cron` is set in all cron-daemons, so any one of them started 
 	satisfies a cron dependency
-"keyword" allows platform-specific overrides, e.g. "keyword -lxc" makes this 
+
+`keyword` allows platform-specific overrides, e.g. `keyword -lxc` makes this 
 	service script a noop in lxc containers. Useful for things like keymaps, 
 	module loading etc. that are either platform-specific or not available 
 	in containers/virtualization/...
@@ -169,31 +181,36 @@ FIXME: Anything missing in this list?
 
 All service scripts are assumed to have the following functions:
 
+```
 start()
 stop()
 status()
+```
 
-There are default implementations in rc/sh/openrc-run.sh - this allows very 
+There are default implementations in `lib/rc/sh/openrc-run.sh` - this allows very 
 compact service scripts. These functions can be overridden per service script as 
 needed.
 
 The default functions assume the following variables to be set in the service 
 script:
 
+```
 command=
 command_args=
 pidfile=
+```
 
 Thus the 'smallest' service scripts can be half a dozen lines long
 
-# The Magic of Conf.d
+# The Magic of `conf.d`
 
 Most service scripts need default values. It would be fragile to
-explicitly source some arbitrary files. By convention openrc-run will source
+explicitly source some arbitrary files. By convention `openrc-run` will source
-the matching file in /etc/conf.d/ for any script in /etc/init.d/
+the matching file in `/etc/conf.d/` for any script in `/etc/init.d/`
 
 This allows you to set random startup-related things easily. Example:
 
+```
 conf.d/foo:
 START_OPTS="--extraparameter sausage"
 
@@ -201,6 +218,7 @@ init.d/foo:
 start() {
 	/usr/sbin/foo-daemon ${STARTOPTS}
 }
+```
 
 The big advantage of this split is that most of the time editing of the init 
 script can be avoided.
@@ -213,34 +231,53 @@ mostly syntax-compatible to Debian's s-s-d, but has been rewritten from scratch.
 It helps with starting daemons, backgrounding, creating PID files and many 
 other convenience functions related to managing daemons.
 
-# /etc/rc.conf
+# `/etc/rc.conf`
 
 This file manages the default configuration for OpenRC, and it has examples of 
 per-service-script variables.
 
-Among these are rc_parallel (for parallelized startup), rc_log (logs all boot 
+Among these are `rc_parallel` (for parallelized startup), `rc_log` (logs all boot 
 messages to a file), and a few others.
 
 # ulimit and CGroups
 
-Setting ulimit and nice values per service can be done through the rc_ulimit 
+Setting `ulimit` and `nice` values per service can be done through the
-variable.
+`rc_ulimit` variable.
 
-Under Linux, OpenRC can optionally use CGroups for process management.
+Under Linux, OpenRC can use cgroups for process management as well. Once
-By default each service script's processes are migrated to their own CGroup.
+the kernel is configured appropriately, the `rc_cgroup_mode` setting in
+/etc/rc.conf should be used to control whether cgroups version one,,
+two, or both are used. The default is to use both if they are available.
+
+By changing certain settings in the service's `conf.d` file limits can be
+enforced per service. These settings are documented in detail in the
+default /etc/rc.conf under `LINUX CGROUPS RESOURCE MANAGEMENT`.
+
+# Dealing with Orphaned Processes
+
+It is possible to get into a state where there are orphaned processes
+running which were part of a service. For example, if you are monitoring
+a service with supervise-daemon and supervise-daemon dies for an unknown
+reason. The way to deal with this will be different for each system.
+
+On Linux systems with cgroups enabled, the cgroup_cleanup command is
+added to all services. You can run it manually, when the service is
+stopped, by using:
+
+```
+# rc-service someservice cgroup_cleanup
+```
+
+The `rc_cgroup_cleanup` setting can be changed to yes to make this
+happen automatically when the service is stopped.
 
-By changing certain values in the conf.d file limits can be enforced per 
-service. It is easy to find orphan processes of a service that persist after 
-stop(), but by default these will NOT be terminated.
-To change this add rc_cgroup_cleanup="yes" in the conf.d files for services 
-where you desire this functionality.
 
 # Caching
 
 For performance reasons OpenRC keeps a cache of pre-parsed initscript metadata
-(e.g. depend). The default location for this is /${RC_SVCDIR}/cache.
+(e.g. `depend`). The default location for this is `/${RC_SVCDIR}/cache`.
 
-The cache uses mtime to check for file staleness. Should any service script
+The cache uses `mtime` to check for file staleness. Should any service script
 change it'll re-source the relevant files and update the cache
 
 # Convenience functions

init.d/.gitignore

@@ -1,4 +1,6 @@
+agetty
 binfmt
+modules-load
 bootmisc
 fsck
 hostname
@@ -11,7 +13,6 @@ network
 root
 savecache
 swap
-swapfiles
 sysctl
 urandom
 devfs
@@ -37,6 +38,7 @@ pf
 rarpd
 rc-enabled
 rpcbind
+runsvdir
 savecore
 swap-blk
 swclock
@@ -44,5 +46,3 @@ syslogd
 termencoding
 ttys
 wscons
-tmpfiles.dev
-tmpfiles.setup

init.d/Makefile

@@ -2,8 +2,8 @@ include ../mk/net.mk
 
 DIR=	${INITDIR}
 SRCS=	bootmisc.in fsck.in hostname.in local.in localmount.in loopback.in \
-	netmount.in osclock.in root.in savecache.in swap.in swapfiles.in \
+	netmount.in osclock.in root.in savecache.in swap.in swclock.in \
-	tmpfiles.setup.in swclock.in sysctl.in urandom.in s6-svscan.in ${SRCS-${OS}}
+	sysctl.in runsvdir.in urandom.in s6-svscan.in ${SRCS-${OS}}
 BIN=	${OBJS}
 
 # Are we installing our network scripts?
@@ -15,15 +15,15 @@ MK=	../mk
 include ${MK}/os.mk
 
 # Generic BSD scripts
-SRCS-FreeBSD=	hostid.in moused.in newsyslog.in pf.in rarpd.in rc-enabled.in \
+SRCS-FreeBSD=	hostid.in modules.in moused.in newsyslog.in pf.in rarpd.in \
-		rpcbind.in savecore.in syslogd.in
+		rc-enabled.in rpcbind.in savecore.in syslogd.in
 # These are FreeBSD specific
 SRCS-FreeBSD+=	adjkerntz.in devd.in dumpon.in encswap.in ipfw.in \
-		mixer.in nscd.in powerd.in syscons.in
+		modules-load.in mixer.in nscd.in powerd.in syscons.in
 
-SRCS-Linux=	binfmt.in devfs.in dmesg.in hwclock.in consolefont.in keymaps.in \
+SRCS-Linux=	agetty.in binfmt.in devfs.in dmesg.in hwclock.in consolefont.in \
-		killprocs.in modules.in mount-ro.in mtab.in numlock.in \
+	keymaps.in killprocs.in modules.in modules-load.in mount-ro.in mtab.in \
-		procfs.in net-online.in sysfs.in termencoding.in tmpfiles.dev.in
+	numlock.in procfs.in net-online.in sysfs.in termencoding.in
 
 # Generic BSD scripts
 SRCS-NetBSD=	hostid.in moused.in newsyslog.in pf.in rarpd.in rc-enabled.in \
@@ -31,9 +31,6 @@ SRCS-NetBSD=	hostid.in moused.in newsyslog.in pf.in rarpd.in rc-enabled.in \
 # These are NetBSD specific
 SRCS-NetBSD+=	devdb.in swap-blk.in ttys.in wscons.in
 
-%.in: %${SFX}
-	sed ${SED_REPLACE} ${SED_EXTRA} $< > $@
-
 include ${MK}/scripts.mk
 
 _installafter_: realinstall

init.d/adjkerntz.in

@@ -23,6 +23,7 @@ fi
 
 depend()
 {
+	after swclock
 	provide clock
 	# BSD adjkerntz needs to be able to write to /etc
 	if [ "$clock" = "UTC" -a -e /etc/wall_cmos_clock ] ||

init.d/agetty.in

@@ -0,0 +1,32 @@
+#!@SBINDIR@/openrc-run
+# Copyright (c) 2017 The OpenRC Authors.
+# See the Authors file at the top-level directory of this distribution and
+# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+#
+# This file is part of OpenRC. It is subject to the license terms in
+# the LICENSE file found in the top-level directory of this
+# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# This file may not be copied, modified, propagated, or distributed
+# except according to the terms contained in the LICENSE file.
+
+description="start agetty on a terminal line"
+supervisor=supervise-daemon
+port="${RC_SVCNAME#*.}"
+term_type="${term_type:-linux}"
+command=/sbin/agetty
+command_args_foreground="${agetty_options} ${port} ${baud} ${term_type}"
+pidfile="/run/${RC_SVCNAME}.pid"
+
+depend() {
+	after local
+	keyword -prefix
+}
+
+start_pre() {
+	if [ -z "$port" ]; then
+		eerror "${RC_SVCNAME} cannot be started directly. You must create"
+		eerror "symbolic links to it for the ports you want to start"
+		eerror "agetty on and add those to the appropriate runlevels."
+		return 1
+	fi
+}

init.d/binfmt.in

@@ -13,9 +13,9 @@ description="Register misc binary format handlers"
 
 depend()
 {
-	after procfs
+	after clock procfs
 	use modules devfs
-	keyword -openvz -prefix -systemd-nspawn -vserver -lxc
+	keyword -docker -lxc -openvz -prefix -systemd-nspawn -vserver
 }
 
 start()

init.d/bootmisc.in

@@ -71,7 +71,8 @@ cleanup_var_run_dir()
 	ebegin "Cleaning /var/run"
 	for x in $(find /var/run ! -type d ! -name utmp \
 		! -name random-seed ! -name dev.db \
-		! -name ld-elf.so.hints ! -name ld.so.hints);
+		! -name ld-elf.so.hints ! -name ld-elf32.so.hints \
+		! -name ld.so.hints);
 	do
 		# Clean stale sockets
 		if [ -S "$x" ]; then
@@ -240,7 +241,7 @@ stop()
 {
 	# Write a halt record if we're shutting down
 	if [ "$RC_RUNLEVEL" = shutdown ]; then
-		[ "$RC_UNAME" = Linux ] && halt -w
+		[ "$RC_UNAME" = Linux ] && openrc-shutdown -w
 		if [ "$RC_SYS" = OPENVZ ]; then
 			yesno $RC_REBOOT && printf "" >/reboot
 		fi

init.d/consolefont.in

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

init.d/devdb.in

@@ -13,6 +13,7 @@ description="Creates the dev database"
 
 depend()
 {
+	after clock
 	need localmount
 }
 

init.d/devfs.in

@@ -15,7 +15,7 @@ depend()
 {
 	provide dev-mount
 	before dev
-	keyword -prefix -systemd-nspawn -vserver -lxc
+	keyword -docker -lxc -prefix -systemd-nspawn -vserver
 }
 
 mount_dev()

init.d/dmesg.in

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

init.d/dumpon.in

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

init.d/fsck.in

@@ -15,8 +15,9 @@ _IFS="
 
 depend()
 {
+	after clock
 	use dev clock modules
-	keyword -jail -openvz -prefix -systemd-nspawn -timeout -vserver -lxc -uml
+	keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn -timeout -vserver -uml
 }
 
 _abort() {

init.d/hostid.in

@@ -15,6 +15,7 @@ extra_commands="reset"
 depend()
 {
 	use root
+	after clock
 	before devd net
 	keyword -jail -prefix
 }

init.d/hostname.in

@@ -11,16 +11,28 @@
 
 description="Sets the hostname of the machine."
 
-depend() {
+depend()
-	keyword -prefix -systemd-nspawn -lxc
+{
+	after clock
+	keyword -docker -lxc -prefix -systemd-nspawn
 }
 
 start()
 {
-	# HOSTNAME variable used to be defined in caps in conf.d/hostname.
+	local h source x
-	# It is also a magic variable in bash.
+	if [ -s @SYSCONFDIR@/hostname ] && [ -r @SYSCONFDIR@/hostname ]; then
-	hostname=${hostname-${HOSTNAME-localhost}} # checkbashisms: false positive
+		read h x <@SYSCONFDIR@/hostname
-	ebegin "Setting hostname to $hostname"
+		source="from @SYSCONFDIR@/hostname"
-	hostname "$hostname"
+	else
+		# HOSTNAME variable used to be defined in caps in conf.d/hostname.
+		# It is also a magic variable in bash.
+		h=${hostname:-${HOSTNAME}} # checkbashisms: false positive (HOSTNAME var)
+	fi
+	if [ -z "$h" ]; then
+		einfo "Using default system hostname"
+		return 0
+	fi
+	ebegin "Setting hostname to $h $source"
+	hostname "$h"
 	eend $? "Failed to set the hostname"
 }

init.d/hwclock.in

@@ -30,12 +30,11 @@ fi
 depend()
 {
 	provide clock
+	want modules
 	if yesno $clock_adjfile; then
 		use root
-	else
-		before *
 	fi
-	keyword -openvz -prefix -systemd-nspawn -uml -vserver -xenu -lxc
+	keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu
 }
 
 setupopts()
@@ -69,9 +68,28 @@ _hwclock()
 	return 1
 }
 
+get_noadjfile()
+{
+	if ! yesno $clock_adjfile; then
+		# Some implementations don't handle adjustments
+		if LC_ALL=C hwclock --help 2>&1 | grep -q "\-\-noadjfile"; then
+			echo --noadjfile
+		fi
+	fi
+}
+
+rtc_exists()
+{
+	local rtc=
+	for rtc in /dev/rtc /dev/rtc[0-9]*; do
+		[ -e "$rtc" ] && break
+	done
+	[ -e "$rtc" ]
+}
+
 start()
 {
-	local retval=0 errstr=""
+	local retval=0 errstr="" modname
 	setupopts
 
 	if [ -z "$utc_cmd" ]; then
@@ -81,26 +99,27 @@ start()
 
 	ebegin "Setting system clock using the hardware clock [$utc]"
 	if [ -e /proc/modules ]; then
-		local rtc=
+		if ! rtc_exists; then
-		for rtc in /dev/rtc /dev/rtc[0-9]*; do
+			for x in rtc-cmos rtc genrtc; do
-			[ -e "$rtc" ] && break
+				modprobe -q $x && rtc_exists && modname="$x" && break
-		done
+			done
-		if [ ! -e "${rtc}" ]; then
+			[ -n "$modname" ] &&
-			modprobe -q rtc-cmos || modprobe -q rtc || modprobe -q genrtc
+				ewarn "The $modname module needs to be configured in" \
+					"@SYSCONFDIR@/conf.d/modules or built in."
 		fi
 	fi
 
 	# Always set the kernel's time zone.
-	_hwclock --systz $utc_cmd $clock_args
+	_hwclock --systz $utc_cmd $(get_noadjfile) $clock_args
 	: $(( retval += $? ))
 
 	if [ -e /etc/adjtime ] && yesno $clock_adjfile; then
-		_hwclock --adjust $utc_cmd
+		_hwclock --adjust $utc_cmd $(get_noadjfile)
 		: $(( retval += $? ))
 	fi
 
 	if yesno ${clock_hctosys:-YES}; then
-		_hwclock --hctosys $utc_cmd $clock_args
+		_hwclock --hctosys $utc_cmd $(get_noadjfile) $clock_args
 		: $(( retval += $? ))
 	fi
 
@@ -122,14 +141,7 @@ stop()
 
 	ebegin "Setting hardware clock using the system clock" "[$utc]"
 
-	if ! yesno $clock_adjfile; then
+	_hwclock --systohc $utc_cmd $(get_noadjfile) $clock_args
-		# Some implementations don't handle adjustments
-		if LC_ALL=C hwclock --help 2>&1 | grep -q "\-\-noadjfile"; then
-			utc_cmd="$utc_cmd --noadjfile"
-		fi
-	fi
-
-	_hwclock --systohc $utc_cmd $clock_args
 	retval=$?
 
 	eend $retval "Failed to sync clocks"
@@ -144,5 +156,5 @@ save()
 show()
 {
 	setupopts
-	hwclock --show "$utc_cmd" $clock_args
+	hwclock --show "$utc_cmd" $(get_noadjfile) $clock_args
 }

init.d/keymaps.in

@@ -14,8 +14,8 @@ description="Applies a keymap for the consoles."
 depend()
 {
 	need localmount termencoding
-	after bootmisc
+	after bootmisc clock
-	keyword -openvz -prefix -systemd-nspawn -uml -vserver -xenu -lxc
+	keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu
 }
 
 start()

init.d/killprocs.in

@@ -19,9 +19,9 @@ depend()
 start()
 {
 	ebegin "Terminating remaining processes"
-	killall5 -15 ${killall5_opts}
+	kill_all 15 ${killall5_opts}
 	eend 0
 	ebegin "Killing remaining processes"
-	killall5 -9 ${killall5_opts}
+	kill_all 9 ${killall5_opts}
 	eend 0
 }

init.d/localmount.in

@@ -14,17 +14,18 @@ description="Mounts disks and swap according to /etc/fstab."
 depend()
 {
 	need fsck
-	use lvm modules mtab
+	use lvm modules mtab root
-	after lvm modules
+	after clock lvm modules root
-	keyword -jail -prefix -systemd-nspawn -vserver -lxc
+	keyword -docker -jail -lxc -prefix -systemd-nspawn -vserver
 }
 
 start()
 {
 	# Mount local filesystems in /etc/fstab.
+	# The types variable must start with no, and must be a type
 	local critical= types="noproc" x= no_netdev= rc=
 	for x in $net_fs_list $extra_net_fs_list; do
-		types="${types},no${x}"
+		types="${types},${x}"
 	done
 
 	if [ "$RC_UNAME" = Linux ]; then
@@ -99,8 +100,8 @@ stop()
 				aufs_branch=$(sed 's/=.*//g' $x)
 				eindent
 				if ! mount -o "remount,del:$aufs_branch" "$aufs_mount_point" > /dev/null 2>&1; then
-					ewarn "Failed to remove branch $aufs_branch from aufs \
+					ewarn "Failed to remove branch $aufs_branch from aufs" \
-					$aufs_mount_point"
+					"$aufs_mount_point"
 				fi
 				eoutdent
 				sync

init.d/loopback.in

@@ -13,6 +13,7 @@ description="Configures the loopback interface."
 
 depend()
 {
+	after clock
 	keyword -jail -prefix -systemd-nspawn -vserver
 }
 
@@ -21,22 +22,14 @@ start()
 	if [ "$RC_UNAME" = Linux ]; then
 		ebegin "Bringing up network interface lo"
 		if command -v ip > /dev/null 2>&1; then
-			ip addr add 127.0.0.1/8 dev lo brd + scope host
+			ip addr add 127.0.0.1/8 dev lo brd +
-			ip route add 127.0.0.0/8 dev lo scope host
 			ip link set lo up
 		else
 			ifconfig lo 127.0.0.1 netmask 255.0.0.0
-			route add -net 127.0.0.0 netmask 255.0.0.0 gw 127.0.0.1
 		fi
 	else
 		ebegin "Bringing up network interface lo0"
 		ifconfig lo0 127.0.0.1 netmask 255.0.0.0
-		route -q add -inet 127.0.0.0 -netmask 255.0.0.0 127.0.0.1
 	fi
 	eend $?
 }
-
-stop()
-{
-	return 0
-}

init.d/modules-load.in

@@ -0,0 +1,72 @@
+#!@SBINDIR@/openrc-run
+# Copyright (c) 2016 The OpenRC Authors.
+# See the Authors file at the top-level directory of this distribution and
+# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+#
+# This file is part of OpenRC. It is subject to the license terms in
+# the LICENSE file found in the top-level directory of this
+# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# This file may not be copied, modified, propagated, or distributed
+# except according to the terms contained in the LICENSE file.
+
+description="Loads a list of modules from systemd-compatible locations."
+
+depend()
+{
+	keyword -docker -lxc -openvz -prefix -systemd-nspawn -vserver
+}
+
+find_modfiles()
+{
+	local dirs="/usr/lib/modules-load.d /run/modules-load.d /etc/modules-load.d"
+	local basenames files fn x y
+	for x in $dirs; do
+		[ ! -d $x ] && continue
+		for y in $x/*.conf; do
+			[ -f $y ] && basenames="${basenames}\n${y##*/}"
+		done
+	done
+	basenames=$(printf "$basenames" | sort -u)
+	for x in $basenames; do
+		for y in $dirs; do
+			[ -r $y/$x ] &&
+				fn=$y/$x
+		done
+		files="$files $fn"
+	done
+	echo $files
+}
+
+load_modules()
+{
+	local file m modules rc x
+	file=$1
+	[ -z "$file" ] && return 0
+	while read m x; do
+		case $m in
+			\;*) continue ;;
+			\#*) continue ;;
+			*) modules="$modules $m"
+			;;
+		esac
+	done < $file
+	for x in $modules; do
+		ebegin "Loading module $x"
+		case "$RC_UNAME" in
+			FreeBSD) kldload "$x"; rc=$? ;;
+			Linux) modprobe --use-blacklist -q "$x"; rc=$? ;;
+			*) ;;
+		esac
+		eend $rc "Failed to load $x"
+	done
+}
+
+start()
+{
+	local x
+	files=$(find_modfiles)
+	for x in $files; do
+		load_modules $x
+	done
+	return 0
+}

init.d/modules.in

@@ -14,12 +14,24 @@ description="Loads a user defined list of kernel modules."
 depend()
 {
 	use isapnp
-	keyword -openvz -prefix -systemd-nspawn -vserver -lxc
+	want modules-load
+	keyword -docker -lxc -openvz -prefix -systemd-nspawn -vserver
 }
 
-start()
+FreeBSD_modules()
 {
-	# Should not fail if kernel do not have module
+	local cnt=0 x
+	for x in $modules; do
+		ebegin "Loading module $x"
+		kldload "$x"
+		eend $? "Failed to load $x" && : $(( cnt += 1 ))
+	done
+	einfo "Autoloaded $cnt module(s)"
+}
+
+Linux_modules()
+{
+	# Should not fail if kernel does not have module
 	# support compiled in ...
 	[ ! -f /proc/modules ] && return 0
 
@@ -36,22 +48,21 @@ start()
 		x=${x%.*}
 	done
 
-	local list= x= xx= y= args= mpargs= cnt=0 a=
+	local list= x= xx= y= args= mpargs= a=
 	for x in $kv_variant_list ; do
 		eval list=\$modules_$(shell_var "$x")
 		[ -n "$list" ] && break
 	done
 	[ -z "$list" ] && list=$modules
 
+	[ -n "$list" ] && ebegin "Loading kernel modules"
 	for x in $list; do
 		a=${x#*:}
 		if [ "$a" = "$x" ]; then
 			unset mpargs
-			ebegin "Loading module $x"
 		else
 			x=${x%%:*}
 			mpargs="-o $a"
-			ebegin "Loading module $x as $a"
 		fi
 		aa=$(shell_var "$a")
 		xx=$(shell_var "$x")
@@ -63,8 +74,16 @@ start()
 		done
 		[ -z "$args" ] && eval args=\$module_${aa}_args
 		[ -z "$args" ] && eval args=\$module_${xx}_args
-		eval modprobe -q "$mpargs" "$x" "$args"
+		eval modprobe --use-blacklist --verbose "$mpargs" "$x" "$args"
-		eend $? "Failed to load $x" && : $(( cnt += 1 ))
 	done
-	einfo "Autoloaded $cnt module(s)"
+	[ -n "$list" ] && eend
+}
+
+start()
+{
+	case "$RC_UNAME" in
+		FreeBSD|Linux) ${RC_UNAME}_modules ;;
+		*) ;;
+	esac
+	return 0
 }

init.d/mount-ro.in

@@ -13,8 +13,8 @@ description="Re-mount filesytems read-only for a clean reboot."
 
 depend()
 {
-	need killprocs savecache
+	after killprocs savecache
-	keyword -openvz -prefix -systemd-nspawn -vserver -lxc
+	keyword -docker -lxc -openvz -prefix -systemd-nspawn -vserver
 }
 
 start()
@@ -34,6 +34,9 @@ start()
 
 	local m="/dev|/dev/.*|/proc|/proc.*|/sys|/sys/.*|/run|${rc_svcdir}" x= fs=
 	m="$m|/bin|/sbin|/lib(32|64)?|/libexec"
+	if [ -e "$rc_svcdir"/usr_premounted ]; then
+		m="$m|/usr"
+	fi
 	# RC_NO_UMOUNTS is an env var that can be set by plugins
 	local IFS="$IFS:"
 	for x in $no_umounts $RC_NO_UMOUNTS; do

init.d/mtab.in

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

init.d/net-online.in

@@ -15,7 +15,8 @@ depend()
 {
 	after modules
 	need sysfs
-	keyword -jail -lxc -openvz -prefix -systemd-nspawn -uml -vserver
+	provide network-online
+	keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn -uml -vserver
 }
 
 get_interfaces()
@@ -27,23 +28,10 @@ get_interfaces()
 	done
 }
 
-get_default_gateway()
-{
-	local cmd gateway
-	if command -v ip > /dev/null 2>&1; then
-		cmd="ip route show"
-	else
-		cmd=route
-	fi
-	set -- $($cmd | grep default)
-	[ "$2" != via ] && gateway="$2" || gateway="$3"
-	printf "%s" $gateway
-}
-
 start ()
 {
-	local carriers configured dev gateway ifcount infinite interfaces
+	local carriers configured dev gateway ifcount infinite
-	local rc state timeout x
+	local rc state x
 
 	ebegin "Checking to see if the network is online"
 	rc=0
@@ -66,10 +54,15 @@ start ()
 	: $((timeout -= 1))
  done
  ! $infinite && [ $timeout -eq 0 ] && rc=1
- if [ $rc -eq 0 ] && yesno ${ping_default_gateway:-no}; then
+ include_ping_test=${include_ping_test:-${ping_default_gateway}}
- 	gateway="$(get_default_gateway)"
+ if [ -n "${ping_default_gateway}" ]; then
- 	if [ -n "$gateway" ] && ! ping -c 1 $gateway > /dev/null 2>&1; then
+ ewarn "ping_default_gateway is deprecated, please use include_ping_test"
-		rc=1
+ fi
+ if [ $rc -eq 0 ] && yesno ${include_ping_test:-no}; then
+ 	ping_test_host="${ping_test_host:-google.com}"
+ 	if [ -n "$ping_test_host" ]; then
+		ping -c 1 $ping_test_host > /dev/null 2>&1
+		rc=$?
 	fi
  fi
  eend $rc "The network is offline"

init.d/netmount.in

@@ -20,11 +20,13 @@ depend()
 			*) mywant="$mywant nfsclient"; break ;;
 		esac
 	done
+	after root
  	config /etc/fstab
 	want $mywant
 	use afc-client amd openvpn
 	use dns
-	keyword -jail -prefix -systemd-nspawn -vserver -lxc
+	use root
+	keyword -docker -jail -lxc -prefix -systemd-nspawn -vserver
 }
 
 start()

init.d/network.in

@@ -18,7 +18,7 @@ __nl="
 depend()
 {
 	need localmount
-	after bootmisc
+	after bootmisc clock
 	if [ -n "$(interfaces)" ]; then
 		provide net
 	fi

init.d/newsyslog.in

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

init.d/numlock.in

@@ -16,7 +16,7 @@ ttyn=${rc_tty_number:-${RC_TTY_NUMBER:-12}}
 depend()
 {
 	need localmount
-	keyword -openvz -prefix -systemd-nspawn -vserver -lxc
+	keyword -docker -lxc -openvz -prefix -systemd-nspawn -vserver
 }
 
 _setleds()

init.d/procfs.in

@@ -13,16 +13,23 @@ description="Mounts misc filesystems in /proc."
 
 depend()
 {
-	use modules devfs
+	after clock
+	use devfs
+	want modules
 	need localmount
-	keyword -openvz -prefix -systemd-nspawn -vserver -lxc
+	keyword -docker -lxc -openvz -prefix -systemd-nspawn -vserver
 }
 
 start()
 {
 	# Setup Kernel Support for miscellaneous Binary Formats
-	if [ -d /proc/sys/fs/binfmt_misc -a ! -e /proc/sys/fs/binfmt_misc/register ]; then
+	if [ -d /proc/sys/fs/binfmt_misc ] &&
-		modprobe -q binfmt-misc
+		[ ! -e /proc/sys/fs/binfmt_misc/register ]; then
+		if ! grep -qs binfmt_misc /proc/filesystems &&
+			modprobe -q binfmt-misc; then
+			ewarn "The binfmt-misc module needs to be configured in" \
+				"@SYSCONFDIR@/conf.d/modules or built in."
+		fi
 		if grep -qs binfmt_misc /proc/filesystems; then
 			ebegin "Mounting misc binary format filesystem"
 			mount -t binfmt_misc -o nodev,noexec,nosuid \

init.d/root.in

@@ -13,8 +13,9 @@ description="Mount the root fs read/write"
 
 depend()
 {
+	after clock
 	need fsck
-	keyword -jail -openvz -prefix -systemd-nspawn -vserver -lxc
+	keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn -vserver
 }
 
 start()

init.d/runsvdir.in

@@ -0,0 +1,20 @@
+#!@SBINDIR@/openrc-run
+# Copyright (c) 2016 The OpenRC Authors.
+# See the Authors file at the top-level directory of this distribution and
+# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+#
+# This file is part of OpenRC. It is subject to the license terms in
+# the LICENSE file found in the top-level directory of this
+# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# This file may not be copied, modified, propagated, or distributed
+# except according to the terms contained in the LICENSE file.
+
+command=/usr/bin/runsvdir
+command_background=yes
+pidfile=/var/run/runsvdir.pid
+command_args="-P $RC_SVCDIR/sv 'log: ...........................................................................................................................................................................................................................................................................................................................................................................................................'"
+
+start_pre()
+{
+	checkpath -m 0755 -o root:root -d ${RC_SVCDIR}/sv
+}

init.d/savecache.in

@@ -49,7 +49,7 @@ start()
 	fi
 	ebegin "Saving dependency cache"
 	local rc=0 save=
-	for x in deptree depconfig shutdowntime softlevel rc.log; do
+	for x in shutdowntime softlevel rc.log; do
 		[ -e "$RC_SVCDIR/$x" ] && save="$save $RC_SVCDIR/$x"
 	done
 	if [ -n "$save" ]; then

init.d/savecore.in

@@ -14,6 +14,7 @@ description="Saves a kernel dump."
 depend()
 {
 	need dumpon localmount
+	after clock
 	before encswap
 	keyword -jail -prefix
 }

init.d/staticroute.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+S#!@BINDIR@/openrc-run
 # Copyright (c) 2009-2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
 # https://github.com/OpenRC/openrc/blob/master/AUTHORS
@@ -14,9 +14,9 @@
 description="Configures static routes."
 __nl="
 "
-
 depend()
 {
+	after clock
 	provide net
 	use network
 	keyword -jail -prefix -vserver

init.d/swap-blk.in

@@ -11,6 +11,7 @@
 
 depend()
 {
+	after clock
 	before fsck
 	keyword -jail -prefix
 }

init.d/swap.in

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

init.d/swapfiles.in

@@ -1,46 +0,0 @@
-#!@SBINDIR@/openrc-run
-# Copyright (c) 2007-2015 The OpenRC Authors.
-# See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
-#
-# This file is part of OpenRC. It is subject to the license terms in
-# the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
-# This file may not be copied, modified, propagated, or distributed
-# except according to the terms contained in the LICENSE file.
-
-depend()
-{
-	need localmount
-	keyword -jail -openvz -prefix -systemd-nspawn -vserver -lxc
-}
-
-start()
-{
-	ebegin "Activating additional swap space"
-	case "$RC_UNAME" in
-		NetBSD|OpenBSD) swapctl -A -t noblk >/dev/null;;
-		*)		swapon -a >/dev/null;;
-	esac
-	eend 0 # If swapon has nothing todo it errors, so always return 0
-}
-
-stop()
-{
-	ebegin "Deactivating additional swap space"
-	case "$RC_UNAME" in
-		Linux)
-			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

@@ -13,9 +13,8 @@ description="Sets the local clock to the mtime of a given file."
 
 depend()
 {
-	before *
 	provide clock
-	keyword -openvz -prefix -systemd-nspawn -uml -vserver -xenu -lxc
+	keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu
 }
 
 # swclock is an OpenRC built in

init.d/syscons.in

@@ -10,6 +10,7 @@
 # except according to the terms contained in the LICENSE file.
 
 depend() {
+	after clock
 	need localmount
 	keyword -jail -prefix
 }

init.d/sysctl.BSD.in

@@ -1,38 +0,0 @@
-#!@SBINDIR@/openrc-run
-# Copyright (c) 2007-2015 The OpenRC Authors.
-# See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
-#
-# This file is part of OpenRC. It is subject to the license terms in
-# the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
-# This file may not be copied, modified, propagated, or distributed
-# except according to the terms contained in the LICENSE file.
-
-depend()
-{
-	before bootmisc logger
-	keyword -prefix
-}
-
-start()
-{
-	[ -e /etc/sysctl.conf ] || return 0
-	local retval=0 var= comments= conf=
-	ebegin "Configuring kernel parameters"
-	eindent
-	for conf in @SYSCONFDIR@/sysctl.conf @SYSCONFDIR@/sysctl.d/*.conf; do
-		if [ -r "$conf" ]; then
-			vebegin "applying $conf"
-			while read var comments; do
-				case "$var" in
-				""|"#"*) continue;;
-				esac
-				sysctl -w "$var" >/dev/null || retval=1
-			done < "$conf"
-			veend $retval
-		fi
-	done
-	eoutdent
-	eend $retval "Some errors were encountered"
-}

init.d/sysctl.GNU.in

@@ -1,39 +0,0 @@
-#!@PREFIX@/sbin/openrc-run
-# Copyright (c) 2007-2015 The OpenRC Authors.
-# See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
-#
-# This file is part of OpenRC. It is subject to the license terms in
-# the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
-# This file may not be copied, modified, propagated, or distributed
-# except according to the terms contained in the LICENSE file.
-#FIXME: Modify for GNU/Hurd
-
-depend()
-{
-	before bootmisc logger
-	keyword -prefix
-}
-
-start()
-{
-	[ -e /etc/sysctl.conf ] || return 0
-	local retval=0 var= comments= conf=
-	ebegin "Configuring kernel parameters"
-	eindent
-	for conf in @SYSCONFDIR@/sysctl.conf @SYSCONFDIR@/sysctl.d/*.conf; do
-		if [ -r "$conf" ]; then
-			vebegin "applying $conf"
-			while read var comments; do
-				case "$var" in
-				""|"#"*) continue;;
-				esac
-				sysctl -w "$var" >/dev/null || retval=1
-			done < "$conf"
-			veend $retval
-		fi
-	done
-	eoutdent
-	eend $retval "Some errors were encountered"
-}

init.d/sysctl.in

@@ -11,15 +11,15 @@
 
 depend()
 {
+	after clock
 	before bootmisc logger
-	keyword -prefix
+	keyword -prefix -systemd-nspawn -vserver
 }
 
-start()
+BSD_sysctl()
 {
 	[ -e /etc/sysctl.conf ] || return 0
 	local retval=0 var= comments= conf=
-	ebegin "Configuring kernel parameters"
 	eindent
 	for conf in @SYSCONFDIR@/sysctl.conf @SYSCONFDIR@/sysctl.d/*.conf; do
 		if [ -r "$conf" ]; then
@@ -34,5 +34,25 @@ start()
 		fi
 	done
 	eoutdent
-	eend $retval "Some errors were encountered"
+	return $retval
+}
+
+Linux_sysctl()
+{
+	local quiet
+	yesno $rc_verbose || quiet=-q
+
+	sysctl ${quiet} --system
+}
+
+start()
+{
+	local rc=0
+
+	ebegin "Configuring kernel parameters"
+	case "$RC_UNAME" in
+	*BSD|GNU) BSD_sysctl; rc=$? ;;
+	Linux) Linux_sysctl; rc=$? ;;
+	esac
+	eend $rc "Unable to configure some kernel parameters"
 }

init.d/sysfs.in

@@ -15,7 +15,7 @@ sysfs_opts=nodev,noexec,nosuid
 
 depend()
 {
-	keyword -lxc -prefix -systemd-nspawn -vserver
+	keyword -docker -lxc -prefix -systemd-nspawn -vserver
 }
 
 mount_sys()
@@ -97,35 +97,26 @@ mount_misc()
 		fi
 	fi
 
-	# setup up kernel support for efivarfs
+	# set up kernel support for efivarfs
-	# slightly complicated, as if it's build as a module but NOT yet loaded,
+	if [ -d /sys/firmware/efi/efivars ] &&
-	# it will NOT appear in /proc/filesystems yet
+		! mountinfo -q /sys/firmware/efi/efivars; then
-	if [ -d /sys/firmware/efi/efivars ] \
+		ebegin "Mounting efivarfs filesystem"
-		&& ! mountinfo -q /sys/firmware/efi/efivars; then
+		mount -n -t efivarfs -o ro \
-		modprobe -q efivarfs
+			efivarfs /sys/firmware/efi/efivars 2> /dev/null
-		if grep -qs efivarfs /proc/filesystems; then
+		eend 0
-			ebegin "Mounting efivarfs filesystem"
-			mount -n -t efivarfs -o ${sysfs_opts} \
-				efivarfs /sys/firmware/efi/efivars
-			eend $?
-		fi
 	fi
 }
 
-mount_cgroups()
+cgroup1_base()
 {
-	# set up kernel support for cgroups
+	grep -qw cgroup /proc/filesystems || return 0
-	if [ -d /sys/fs/cgroup ] && ! mountinfo -q /sys/fs/cgroup; then
+	if ! mountinfo -q /sys/fs/cgroup; then
-		if grep -qs cgroup /proc/filesystems; then
+		ebegin "Mounting cgroup filesystem"
-			ebegin "Mounting cgroup filesystem"
+		local opts="${sysfs_opts},mode=755,size=${rc_cgroupsize:-10m}"
-			local opts="${sysfs_opts},mode=755,size=${rc_cgroupsize:-10m}"
+		mount -n -t tmpfs -o "${opts}" cgroup_root /sys/fs/cgroup
-			mount -n -t tmpfs -o ${opts} cgroup_root /sys/fs/cgroup
+		eend $?
-			eend $?
-		fi
 	fi
 
-	mountinfo -q /sys/fs/cgroup || return 0
-
 	if ! mountinfo -q /sys/fs/cgroup/openrc; then
 		local agent="@LIBEXECDIR@/sh/cgroup-release-agent.sh"
 		mkdir /sys/fs/cgroup/openrc
@@ -134,17 +125,96 @@ mount_cgroups()
 			openrc /sys/fs/cgroup/openrc
 		printf 1 > /sys/fs/cgroup/openrc/notify_on_release
 	fi
+	return 0
+}
 
-	yesno ${rc_controller_cgroups:-YES} && [ -e /proc/cgroups ] || return 0
+cgroup1_controllers()
-	while read name hier groups enabled rest; do
+{
+	yesno "${rc_controller_cgroups:-YES}" && [ -e /proc/cgroups ] || return 0
+	while read -r name _ _ enabled rest; do
 		case "${enabled}" in
-			1)	mountinfo -q /sys/fs/cgroup/${name} && continue
+			1)	mountinfo -q "/sys/fs/cgroup/${name}" && continue
-				mkdir /sys/fs/cgroup/${name}
+				local x
-				mount -n -t cgroup -o ${sysfs_opts},${name} \
+				for x in $rc_cgroup_controllers; do
-					${name} /sys/fs/cgroup/${name}
+				[ "${name}" = "blkio" ] && [ "${x}" = "io" ] &&
+					continue 2
+				[ "${name}" = "${x}" ] &&
+				continue 2
+				done
+				mkdir "/sys/fs/cgroup/${name}"
+				mount -n -t cgroup -o "${sysfs_opts},${name}" \
+					"${name}" "/sys/fs/cgroup/${name}"
 				;;
 		esac
 	done < /proc/cgroups
+	return 0
+}
+
+cgroup2_base()
+{
+	local base
+	base="$(cgroup2_find_path)"
+	mkdir -p "${base}"
+	mount -t cgroup2 none -o "${sysfs_opts},nsdelegate" "${base}" 2> /dev/null ||
+		mount -t cgroup2 none -o "${sysfs_opts}" "${base}"
+	return 0
+}
+
+cgroup2_controllers()
+{
+	local active cgroup_path x y
+	cgroup_path="$(cgroup2_find_path)"
+	[ -z "${cgroup_path}" ] && return 0
+	[ -e "${cgroup_path}/cgroup.controllers" ] &&
+	read -r active < "${cgroup_path}/cgroup.controllers"
+	for x in ${rc_cgroup_controllers}; do
+		for y in ${active}; do
+		[ "$x" = "$y" ] &&
+			[ -e "${cgroup_path}/cgroup.subtree_control" ]&&
+			echo "+${x}"  > "${cgroup_path}/cgroup.subtree_control"
+		done
+	done
+	return 0
+}
+
+cgroups_hybrid()
+{
+	grep -qw cgroup /proc/filesystems || return 0
+	cgroup1_base
+	if grep -qw cgroup2 /proc/filesystems; then
+		cgroup2_base
+		cgroup2_controllers
+	fi
+	cgroup1_controllers
+	return 0
+}
+
+cgroups_legacy()
+{
+	grep -qw cgroup /proc/filesystems || return 0
+	cgroup1_base
+	cgroup1_controllers
+	return 0
+}
+
+cgroups_unified()
+{
+	cgroup2_base
+	cgroup2_controllers
+	return 0
+}
+
+mount_cgroups()
+{
+	# set up kernel support for cgroups
+	if [ -d /sys/fs/cgroup ]; then
+		case "${rc_cgroup_mode:-hybrid}" in
+		hybrid) cgroups_hybrid ;;
+		legacy) cgroups_legacy ;;
+		unified) cgroups_unified ;;
+		esac
+	fi
+	return 0
 }
 
 restorecon_sys()

init.d/syslogd.in

@@ -22,6 +22,6 @@ depend()
 	provide logger
 	use net newsyslog
 	need localmount
-	after bootmisc
+	after bootmisc clock
 	keyword -prefix
 }

init.d/termencoding.in

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

init.d/tmpfiles.dev.in

@@ -1,20 +0,0 @@
-#!@SBINDIR@/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Released under the 2-clause BSD license.
-
-description="Set up tmpfiles.d entries"
-
-depend()
-{
-	use dev-mount
-	before dev
-	keyword -prefix -vserver
-}
-
-start()
-{
-	ebegin "Setting up tmpfiles.d entries for /dev"
-	@LIBEXECDIR@/sh/tmpfiles.sh --prefix=/dev --create --boot ${tmpfiles_opts}
-	eend $?
-	return 0
-}

init.d/tmpfiles.setup.in

@@ -1,19 +0,0 @@
-#!@SBINDIR@/openrc-run
-# 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 --exclude-prefix=/dev --create --remove --boot \
-		${tmpfiles_opts}
-	eend $?
-	return 0
-}

init.d/ttys.in

@@ -11,7 +11,7 @@
 
 depend()
 {
-	after fsck
+	after clock fsck
 	keyword -prefix
 }
 

init.d/urandom.in

@@ -14,8 +14,9 @@ description="Initializes the random number generator."
 
 depend()
 {
+	after clock
 	need localmount
-	keyword -jail -lxc -openvz -prefix -systemd-nspawn
+	keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn
 }
 
 save_seed()

init.d/wscons.in

@@ -11,6 +11,7 @@
 
 depend()
 {
+	after clock
 	need localmount
 	keyword -prefix
 }

local.d/README

@@ -8,7 +8,7 @@ service is stopped.
 
 All files are processed in lexical order.
 
-Keep in mind that files in this directory are processed sequencially,
+Keep in mind that files in this directory are processed sequentially,
 and the local service is not considered started or stopped until
 everything is processed, so if you have a process which takes a long
 time to run, it can delay your boot or shutdown processing.

man/Makefile

@@ -9,7 +9,7 @@ MAN8=		rc-service.8 rc-status.8 rc-update.8 openrc.8 openrc-run.8 \
 		service.8 start-stop-daemon.8 supervise-daemon.8
 
 ifeq (${OS},Linux)
-MAN8 += rc-sstat.8
+MAN8 += rc-sstat.8 openrc-init.8 openrc-shutdown.8
 endif
 
 # Handy macro to create symlinks

man/openrc-init.8

@@ -0,0 +1,46 @@
+.\" Copyright (c) 2017 The OpenRC Authors.
+.\" See the Authors file at the top-level directory of this distribution and
+.\" https://github.com/OpenRC/openrc/blob/master/AUTHORS
+.\"
+.\" This file is part of OpenRC. It is subject to the license terms in
+.\" the LICENSE file found in the top-level directory of this
+.\" distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+.\" This file may not be copied, modified, propagated, or distributed
+.\"    except according to the terms contained in the LICENSE file.
+.\"
+.Dd April 6, 2017
+.Dt openrc-init 8 SMM
+.Os OpenRC
+.Sh NAME
+.Nm openrc-init
+.Nd the parent of all processes
+.Sh SYNOPSIS
+.Nm
+.Sh DESCRIPTION
+.Nm
+is an init process which can be an alternative to sysvinit or any other
+init process.
+.Pp
+To use
+.Nm
+configure your boot loader to invoke it or symlink it to /sbin/init.
+Also, you will need to use
+.Xr openrc-shutdown 8 ,
+to halt, reboot or poweroff the system.
+.Pp
+The default runlevel is read from the init command line, the
+rc_default_runlevel setting in rc.conf, the kernel command line, or it is
+assumed to be "default" if it is not set in any of these places.
+.Pp
+.Nm
+doesn't manage getty's directly, so you will need to manage them another
+way. For example, you can use the agetty service script as described in
+agetty-guide.md in this distribution.
+.Sh BUGS
+This was first released as part of OpenRC 0.25.
+I do not know of any specific issues. However, since this is the first
+release of openrc-init, please test and report any issues you find.
+.Sh SEE ALSO
+.Xr openrc-shutdown 8 ,
+.Sh AUTHORS
+.An William Hubbs <w.d.hubbs@gmail.com>

man/openrc-run.8

@@ -97,7 +97,7 @@ String describing the extra command.
 .It Ar supervisor
 Supervisor to use to monitor this daemon. If this is unset or invalid,
 start-stop-daemon will be used.
-Currently, we support s6 from scarnet software, and supervise-daemon
+Currently, we support s6 from skarnet software, and supervise-daemon
 which is a light-weight supervisor internal to OpenRC.
 To use s6, set
 supervisor=s6.
@@ -125,15 +125,35 @@ if no start or stop function is defined by the service.
 .It Ar command_args
 List of arguments to pass to the daemon when starting via
 .Nm start-stop-daemon .
+.It Ar command_args_background
+This variable should be used if the daemon you are starting with
+.Xr start-stop-daemon 8
+runs in the foreground by default but has its own command line options
+to request that it background and write a pid file. It should be set to
+those options. It should not be used at the same time as
+command_background, because command_background requests that
+.Xr start-stop-daemon 8
+go into the background before executing the daemon.
 .It Ar command_args_foreground
 List of arguments to pass to the daemon when starting via
 .Nm supervise-daemon .
 to force the daemon to stay in the foreground
 .It Ar command_background
-Set this to "true", "yes" or "1" (case-insensitive) to force the daemon into
+Set this to "true", "yes" or "1" (case-insensitive) if you want 
-the background. This implies the "--make-pidfile" and "--pidfile" option of
 .Xr start-stop-daemon 8
-so the pidfile variable must be set.
+to force the daemon into the background. This forces the
+"--make-pidfile" and "--pidfile" options, so the pidfile variable must be set.
+.It Ar command_progress
+Set this to "true", "yes" or "1" (case-insensitive) if you want 
+.Xr start-stop-daemon 8
+to display a progress meter when waiting for a daemon to stop.
+.It Ar command_user
+If the daemon does not support changing to a different user id, you can
+use this to change the user id before
+.Xr start-stop-daemon 8
+or
+.Xr supervise-daemon 8
+launches the daemon
 .It Ar chroot
 .Xr start-stop-daemon 8
 and
@@ -143,8 +163,28 @@ will chroot into this path before writing the pid file or starting the daemon.
 Pidfile to use for the above defined command.
 .It Ar name
 Display name used for the above defined command.
+.It Ar procname
+Process name to match when signaling the daemon.
 .It Ar stopsig
 Signal to send when stopping the daemon.
+.It Ar respawn_delay
+Respawn delay
+.Xr supervise-daemon 8
+will use for this daemon.  See
+.Xr supervise-daemon 8
+for more information about this setting.
+.It Ar respawn_max
+Respawn max
+.Xr supervise-daemon 8
+will use for this daemon.  See
+.Xr supervise-daemon 8
+for more information about this setting.
+.It Ar respawn_period
+Respawn period
+.Xr supervise-daemon 8
+will use for this daemon.  See
+.Xr supervise-daemon 8
+for more information about this setting.
 .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).
@@ -158,6 +198,10 @@ used along with in_background_fake to support re-entrant services.
 .It Ar in_background_fake
 Space separated list of commands which should always succeed when
 in_background is yes.
+.Pp
+Keep in mind that eval is used to process chroot, command, command_args_*,
+command_user, pidfile and procname. This may affect how they are
+evaluated depending on how they are quoted.
 .El
 .Sh DEPENDENCIES
 You should define a
@@ -173,8 +217,10 @@ that dependency type to the function, or prefix the names with ! to
 remove them from the dependencies.
 .Bl -tag -width "RC_DEFAULTLEVEL"
 .It Ic need
-The service will refuse to start until needed services have started and it
+The service will attempt to start any services it needs regardless of
-will refuse to stop until any services that need it have stopped.
+whether they have been added to the runlevel. It will refuse to start
+until all services it needs have started, and it will refuse to stop until all
+services that need it have stopped.
 .It Ic use
 The service will attempt to start any services it uses that have been added
 to the runlevel.
@@ -240,6 +286,18 @@ system.
 To see how to influence dependencies in configuration files, see the
 .Sx FILES
 section below.
+.Sh _pre AND _post FUNCTIONS
+Any command defined in extra_commands, extra_started_commands or
+extra_stopped_commands can have _pre and _post functions in the service
+script. If the command function is called foo, the_pre and _post
+functions for it should be called foo_pre and foo_post.
+.Pp
+These functions should be used to perform preparation before the
+command is run and cleanup after the command completes. In order for
+.Nm
+to record the command as being run successfully, the _pre
+function, command function itself and the _post function should all exit
+with a zero return code.
 .Sh BUILTINS
 .Nm
 defines some builtin functions that you can use inside your service scripts:
@@ -368,27 +426,63 @@ If -d, -f or -p is specified, checkpath checks to see if the path
 exists, is the right type and has the correct owner and access modes. If
 any of these tests fail, the path is created and set up as specified. If
 more than one of -d, -f or -p are specified, the last one will be used.
-
+.Pp
 The argument to -m is a three or four digit octal number. If this option
 is not provided, the value defaults to 0644 for files and 0775 for
 directories.
-
+.Pp
 The argument to -o is a representation of the user and/or group which
 should own the path. The user and group can be represented numerically
 or with names, and are separated by a colon.
-
+.Pp
 The truncate options (-D and -F) cause the directory or file to be
 cleared of all contents.
-
+.Pp
 If -W is specified, checkpath checks to see if the first path given on
 the command line is writable.  This is different from how the test
 command in the shell works, because it also checks to make sure the file
 system is not read only.
-
+.Pp
 Also, the -d, -f or -p options should not be specified along with this option.
-
+.Pp
 The -q option suppresses all informational output. If it is specified
 twice, all error messages are suppressed as well.
+.Ic fstabinfo
+.Op Fl M , -mount
+.Op Fl R , -remount
+.Op Fl b , -blockdevice
+.Op Fl m , -mountargs
+.Op Fl o , -options
+.Op Fl p , -passno Ar passno
+.Op Fl t , -type Ar fstype
+.Ar path
+.Xc
+If -b, -m, -o, -p or -t is specified,the appropriate information is
+extracted from fstab. If -M or -R are given, file systems are mounted or
+remounted.
+.Pp
+The -q option suppresses all informational output. If it is specified
+twice, all error messages are suppressed as well.
+.Ic mountinfo
+.Op Fl f, -fstype-regex Ar regex
+.Op Fl F, -skip-fstype-regex Ar regex
+.Op Fl n, -node-regex Ar regex
+.Op Fl N, -skip-node-regex Ar regex
+.Op Fl o, -options-regex Ar regex
+.Op Fl O, -skip-options-regex Ar regex
+.Op Fl p, -point-regex Ar regex
+.Op Fl P, -skip-point-regex Ar regex
+.Op Fl e, -netdev
+.Op Fl E, -nonetdev
+.Op Fl i, -options
+.Op Fl s, -fstype
+.Op Fl t, -node
+  .Ar mount1 mount2 ...
+.Xc
+The f, F, n, N, o, O, p, P, e and E options specify what you want to
+search for or skip in the mounted file systems. The i, s and t options
+specify what you want to display. If no mount points are given, all
+mount points will be considered.
 .It Ic yesno Ar value
 If
 .Ar value

man/openrc-shutdown.8

@@ -0,0 +1,62 @@
+.\" Copyright (c) 2017 The OpenRC Authors.
+.\" See the Authors file at the top-level directory of this distribution and
+.\" https://github.com/OpenRC/openrc/blob/master/AUTHORS
+.\"
+.\" This file is part of OpenRC. It is subject to the license terms in
+.\" the LICENSE file found in the top-level directory of this
+.\" distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+.\" This file may not be copied, modified, propagated, or distributed
+.\"    except according to the terms contained in the LICENSE file.
+.\"
+.Dd May 22, 2017
+.Dt openrc-shutdown 8 SMM
+.Os OpenRC
+.Sh NAME
+.Nm openrc-shutdown
+.Nd bring the system down
+.Sh SYNOPSIS
+.Nm
+.Op Fl d , -no-write
+.Op Fl D , -dry-run
+.Op Fl H , -halt
+.Op Fl k , -kexec
+.Op Fl p , -poweroff
+.Op Fl R , -reexec
+.Op Fl r , -reboot
+.Op Fl s , -single
+.Op Fl w , -write-only
+.Sh DESCRIPTION
+.Nm
+is the utility that communicates with
+.Xr openrc-init 8
+to bring down the system or instruct openrc-init to re-execute itself.
+It supports the following options:
+.Bl -tag -width "poweroff"
+.It Fl d , -no-write
+Do not write the wtmp boot record.
+.It Fl D , -dry-run
+Print the action that would be taken without executing it. This is to
+allow testing.
+.It Fl H , -halt
+Stop all services, kill all remaining processes and halt the system.
+.It Fl k , -kexec
+Stop all services, kill all processes and boot directly into a new
+kernel loaded via
+.Xr kexec 8 .
+.It Fl p , -poweroff
+Stop all services, kill all processes and power off the system.
+.It Fl R , -reexec
+instruct openrc-init to re-exec itself. This should be used after an
+upgrade of OpenRC if you are using openrc-init as your init process.
+.It Fl r , -reboot
+Stop all services, kill all processes and reboot the system.
+.It Fl s , -single
+Stop all services, kill all processes and move to single user mode.
+.It Fl w , -write-only
+Stop all services, kill all processes and move to single user mode.
+.El
+.Sh SEE ALSO
+.Xr openrc-init 8 ,
+.Xr kexec 8 ,
+.Sh AUTHORS
+.An William Hubbs <w.d.hubbs@gmail.com>

man/rc-status.8

@@ -25,6 +25,12 @@ in different runlevels.  The default behavior is to show information
 about the current runlevel and any unassigned services that are not stopped,
 but any runlevel can be quickly examined.
 .Pp
+If an active service is being supervised by
+.Xr supervise-daemon 8, 
+the amount of time the daemon has been active along with the number of
+times it has been respawned in the current respawn period will be
+displayed.
+.Pp
 The options are as follows:
 .Bl -tag -width ".Fl test , test string"
 .It Fl a , -all
@@ -33,6 +39,8 @@ Show all runlevels and their services.
 List all services that have crashed.
 .It Fl l , -list
 List all defined runlevels.
+.It Fl m , -manual
+Show all manually started services.
 .It Fl r , -runlevel
 Print the current runlevel name.
 .It Fl s , -servicelist
@@ -55,5 +63,6 @@ dependency order if the dependency tree is available.
 .Sh SEE ALSO
 .Xr openrc 8 ,
 .Xr rc-update 8
+.Xr supervise-daemon 8
 .Sh AUTHORS
 .An Roy Marples <roy@marples.name>

man/start-stop-daemon.8

@@ -55,7 +55,7 @@ is used.
 .It Fl p , -pidfile Ar pidfile
 When starting, we expect the daemon to create a valid
 .Ar pidfile
-within a reasonable amount of time. When stopping we only stop the pid(s)
+within a reasonable amount of time. When stopping we only stop the first pid
 listed in the
 .Ar pidfile .
 .It Fl n , -name Ar name
@@ -153,6 +153,10 @@ The retry specification can be either a timeout in seconds or multiple
 signal/timeout pairs (like SIGTERM/5).
 .El
 .Sh ENVIRONMENT
+.Va SSD_IONICELEVEL
+can also set the IO scheduling priority of the daemon, but the command line
+option takes precedence.
+.Pp
 .Va SSD_NICELEVEL
 can also set the scheduling priority of the daemon, but the command line
 option takes precedence.

man/supervise-daemon.8

@@ -16,6 +16,8 @@
 .Nd starts a daemon and restarts it if it crashes
 .Sh SYNOPSIS
 .Nm
+.Fl D , -respawn-delay
+.Ar seconds
 .Fl d , -chdir
 .Ar path
 .Fl e , -env
@@ -26,14 +28,20 @@
 .Ar arg
 .Fl k , -umask
 .Ar value
+.Fl m , -respawn-max
+.Ar count
 .Fl N , -nicelevel
 .Ar level
 .Fl p , -pidfile
 .Ar pidfile
-.Fl u , -user
+.Fl P , -respawn-period
-.Ar user
+.Ar seconds
+.Fl R , -retry
+.Ar arg
 .Fl r , -chroot
 .Ar chrootpath
+.Fl u , -user
+.Ar user
 .Fl 1 , -stdout
 .Ar logfile
 .Fl 2 , -stderr
@@ -82,6 +90,9 @@ Print the action(s) that are taken just before doing them.
 .Pp
 The options are as follows:
 .Bl -tag -width indent
+.It Fl D , -respawn-delay Ar seconds
+wait this number of seconds before restarting a daemon after it crashes.
+The default is 0.
 .It Fl d , -chdir Ar path
 chdir to this directory before starting the daemon.
 .It Fl e , -env Ar VAR=VALUE
@@ -94,8 +105,21 @@ Class can be 0 for none, 1 for real time, 2 for best effort and 3 for idle.
 Data can be from 0 to 7 inclusive.
 .It Fl k , -umask Ar mode
 Set the umask of the daemon.
+.It Fl m , -respawn-max Ar count
+Sets the maximum number of times a daemon will be respawned during a
+respawn period. If a daemon dies more than this number of times during a
+respawn period,
+.Nm
+will give up trying to respawn it and exit. The default is 10, and 0
+means unlimited.
 .It Fl N , -nicelevel Ar level
 Modifies the scheduling priority of the daemon.
+.It Fl P , -respawn-period Ar seconds
+Sets the length of a respawn period. The default is 10 seconds. See the
+description of --respawn-max for more information.
+.It Fl R , -retry Ar timeout | Ar signal Ns / Ns Ar timeout
+The retry specification can be either a timeout in seconds or multiple
+signal/timeout pairs (like SIGTERM/5).
 .It Fl r , -chroot Ar path
 chroot to this directory before starting the daemon. All other paths, such
 as the path to the daemon, chdir and pidfile, should be relative to the chroot.
@@ -111,6 +135,7 @@ The same thing as
 .Fl 1 , -stdout
 but with the standard error output.
 .El
+.El
 .Sh ENVIRONMENT
 .Va SSD_NICELEVEL
 can also set the scheduling priority of the daemon, but the command line
@@ -123,6 +148,15 @@ to parse its options, which allows it to accept the `--' option which will
 cause it to stop processing options at that point. Any subsequent arguments
 are passed as arguments to the daemon to start and used when finding a daemon
 to stop or signal.
+.Sh NOTE
+If respawn-delay, respawn-max and respawn-period are not set correctly,
+it is possible to trigger a situation in which the supervisor will
+infinitely try to respawn a daemon. To avoid this, if you change the
+values of --respawn-delay, --respawn-max or --respawn-period, always
+make sure the settings mmake sense. For example, a respawn period of 5
+seconds with a respawn max of 10 and a respawn delay of 1 second leads
+to infinite respawning since there can never be 10 respawns within 5
+seconds.
 .Sh SEE ALSO
 .Xr chdir 2 ,
 .Xr chroot 2 ,

mk/cc.mk

@@ -26,7 +26,8 @@ _CCFLAGS=	-Wall -Wextra -Wimplicit -Wshadow -Wformat=2 \
 		-Wnested-externs \
 		-Winline -Wwrite-strings -Wcast-align -Wcast-qual \
 		-Wpointer-arith \
-		-Wdeclaration-after-statement -Wsequence-point
+		-Wdeclaration-after-statement -Wsequence-point \
+		-Werror=implicit-function-declaration
 
 # We should be using -Wredundant-decls, but our library hidden proto stuff
 # gives loads of warnings. I don't fully understand it (the hidden proto,

mk/dist.mk

@@ -11,9 +11,9 @@
 
 GITREF?=	${VERSION}
 DISTPREFIX?=	${NAME}-${VERSION}
-DISTFILE?=	${DISTPREFIX}.tar.bz2
+DISTFILE?=	${DISTPREFIX}.tar.gz
 
-CLEANFILES+=	${NAME}-*.tar.bz2
+CLEANFILES+=	${NAME}-*.tar.gz
 
 CHANGELOG_LIMIT?= --after="1 year ago"
 
@@ -21,13 +21,13 @@ _SNAP_SH=	date -u +%Y%m%d%H%M
 _SNAP:=		$(shell ${_SNAP_SH})
 SNAP=		${_SNAP}
 SNAPDIR=	${DISTPREFIX}-${SNAP}
-SNAPFILE=	${SNAPDIR}.tar.bz2
+SNAPFILE=	${SNAPDIR}.tar.gz
 
 changelog:
 	git log ${CHANGELOG_LIMIT} --format=full > ChangeLog
 
 dist:
-	git archive --prefix=${DISTPREFIX}/ ${GITREF} | bzip2 > ${DISTFILE}
+	git archive --prefix=${DISTPREFIX}/ ${GITREF} --output=${DISTFILE}
 
 distcheck: dist
 	rm -rf ${DISTPREFIX}
@@ -42,7 +42,7 @@ snapshot:
 	cp -RPp * /tmp/${SNAPDIR}
 	(cd /tmp/${SNAPDIR}; make clean)
 	rm -rf /tmp/${SNAPDIR}/.git 2>/dev/null || true
-	tar -cvjpf ${SNAPFILE} -C /tmp ${SNAPDIR}
+	tar -cvzpf ${SNAPFILE} -C /tmp ${SNAPDIR}
 	rm -rf /tmp/${SNAPDIR}
 	ls -l ${SNAPFILE}