Update ChangeLog

This fixes #140.

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.22
+VERSION=	0.27.2
 PKG=		${NAME}-${VERSION}

NEWS.md

@@ -3,6 +3,43 @@
 This file will contain a list of notable changes for each release. Note
 the information in this file is in reverse order.
 
+## 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

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
@@ -73,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/Makefile

@@ -1,8 +1,7 @@
 include ../mk/net.mk
 
 DIR=	${CONFDIR}
-CONF=	bootmisc fsck hostname localmount netmount swap urandom tmpfiles \
-		${CONF-${OS}}
+CONF=	bootmisc fsck hostname localmount netmount swap urandom ${CONF-${OS}}
 
 ifeq (${MKNET},yes)
 CONF+= network staticroute
@@ -13,8 +12,8 @@ include ${MK}/os.mk
 
 CONF-FreeBSD=	ipfw modules moused powerd rarpd savecore syscons
 
-CONF-Linux=	consolefont devfs dmesg hwclock keymaps killprocs modules mtab \
-	net-online
+CONF-Linux=	agetty consolefont devfs dmesg hwclock keymaps killprocs modules \
+	mtab net-online
 
 CONF-NetBSD=	moused rarpd savecore
 

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/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
-# default, it is all ethernet or wireless LAN interfaces.
+# service considers in deciding whether the network is active. The
+# default is all interfaces that support ethernet.
 #interfaces=""
 
-# This setting controls whether a ping to the default gateway is
-# included in the test for network connectivity after all interfaces
-# are active.
-#ping_default_gateway=no
+# This setting controls whether a ping test is included in the test for
+# network connectivity after all interfaces are active.
+#include_ping_test=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/tmpfiles

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

etc/rc.conf

@@ -48,7 +48,7 @@
 # /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"
+#rc_logger="NO"
 
 # Through rc_log_path you can specify a custom log file.
 # The default value is: /var/log/rc.log
@@ -178,6 +178,11 @@
 # "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.
@@ -239,7 +244,7 @@ rc_tty_number=12
 # 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
+# Set this to YES if you 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

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

@@ -198,7 +198,7 @@ script:
 command=
 command_args=
 pidfile=
-``
+```
 
 Thus the 'smallest' service scripts can be half a dozen lines long
 

init.d/.gitignore

@@ -1,3 +1,4 @@
+agetty
 binfmt
 modules-load
 bootmisc
@@ -45,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 tmpfiles.setup.in  \
-	swclock.in sysctl.in runsvdir.in urandom.in s6-svscan.in ${SRCS-${OS}}
+	netmount.in osclock.in root.in savecache.in swap.in swclock.in \
+	sysctl.in runsvdir.in urandom.in s6-svscan.in ${SRCS-${OS}}
 BIN=	${OBJS}
 
 # Are we installing our network scripts?
@@ -19,11 +19,11 @@ SRCS-FreeBSD=	hostid.in modules.in moused.in newsyslog.in pf.in rarpd.in \
 		rc-enabled.in rpcbind.in savecore.in syslogd.in
 # These are FreeBSD specific
 SRCS-FreeBSD+=	adjkerntz.in devd.in dumpon.in encswap.in ipfw.in \
-		modules.in modules-load.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 \
-		killprocs.in modules.in modules-load.in mount-ro.in mtab.in numlock.in \
-		procfs.in net-online.in sysfs.in termencoding.in tmpfiles.dev.in
+SRCS-Linux=	agetty.in binfmt.in devfs.in dmesg.in hwclock.in consolefont.in \
+	keymaps.in killprocs.in modules.in modules-load.in mount-ro.in mtab.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 \

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,7 +13,7 @@ description="Register misc binary format handlers"
 
 depend()
 {
-	after procfs
+	after clock procfs
 	use modules devfs
 	keyword -docker -lxc -openvz -prefix -systemd-nspawn -vserver
 }

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

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

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,6 +15,7 @@ _IFS="
 
 depend()
 {
+	after clock
 	use dev clock modules
 	keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn -timeout -vserver -uml
 }

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

@@ -12,6 +12,7 @@
 description="Sets the hostname of the machine."
 
 depend() {
+	after clock
 	keyword -docker -lxc -prefix -systemd-nspawn
 }
 

init.d/hwclock.in

@@ -33,8 +33,6 @@ depend()
 	want modules
 	if yesno $clock_adjfile; then
 		use root
-	else
-		before *
 	fi
 	keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu
 }
@@ -106,8 +104,8 @@ start()
 				modprobe -q $x && rtc_exists && modname="$x" && break
 			done
 			[ -n "$modname" ] &&
-				ewarn "The $modname module needs to be configured in \
-					@SYSCONFDIR@/conf.d/modules or built in."
+				ewarn "The $modname module needs to be configured in" \
+					"@SYSCONFDIR@/conf.d/modules or built in."
 		fi
 	fi
 

init.d/keymaps.in

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

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
-	after lvm modules
+	use lvm modules mtab root
+	after clock lvm modules root
 	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 \
-					$aufs_mount_point"
+					ewarn "Failed to remove branch $aufs_branch from aufs" \
+					"$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,17 +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 route add 127.0.0.0/8 dev lo scope host
+			ip addr add 127.0.0.1/8 dev lo brd +
 			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 $?
 }

init.d/modules.in

@@ -31,7 +31,7 @@ FreeBSD_modules()
 
 Linux_modules()
 {
-	# Should not fail if kernel do not have module
+	# Should not fail if kernel does not have module
 	# support compiled in ...
 	[ ! -f /proc/modules ] && return 0
 
@@ -48,22 +48,21 @@ Linux_modules()
 		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")
@@ -75,10 +74,9 @@ Linux_modules()
 		done
 		[ -z "$args" ] && eval args=\$module_${aa}_args
 		[ -z "$args" ] && eval args=\$module_${xx}_args
-		eval modprobe --use-blacklist -q "$mpargs" "$x" "$args"
-		eend $? "Failed to load $x" && : $(( cnt += 1 ))
+		eval modprobe --use-blacklist --verbose "$mpargs" "$x" "$args"
 	done
-	einfo "Autoloaded $cnt module(s)"
+	[ -n "$list" ] && eend
 }
 
 start()

init.d/mount-ro.in

@@ -13,7 +13,7 @@ description="Re-mount filesytems read-only for a clean reboot."
 
 depend()
 {
-	need killprocs savecache
+	after killprocs savecache
 	keyword -docker -lxc -openvz -prefix -systemd-nspawn -vserver
 }
 
@@ -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,6 +15,7 @@ depend()
 {
 	after modules
 	need sysfs
+	provide network-online
 	keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn -uml -vserver
 }
 
@@ -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 rc state timeout x
+	local carriers configured dev gateway ifcount infinite
+	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
- 	gateway="$(get_default_gateway)"
- 	if [ -n "$gateway" ] && ! ping -c 1 $gateway > /dev/null 2>&1; then
-		rc=1
+ include_ping_test=${include_ping_test:-${ping_default_gateway}}
+ if [ -n "${ping_default_gateway}" ]; then
+ ewarn "ping_default_gateway is deprecated, please use include_ping_test"
+ 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,10 +20,12 @@ depend()
 			*) mywant="$mywant nfsclient"; break ;;
 		esac
 	done
+	after root
  	config /etc/fstab
 	want $mywant
 	use afc-client amd openvpn
 	use dns
+	use root
 	keyword -docker -jail -lxc -prefix -systemd-nspawn -vserver
 }
 

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

@@ -13,6 +13,7 @@ description="Mounts misc filesystems in /proc."
 
 depend()
 {
+	after clock
 	use devfs
 	want modules
 	need localmount
@@ -26,8 +27,8 @@ start()
 		[ ! -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."
+			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"

init.d/root.in

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

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,6 +11,7 @@
 
 depend()
 {
+	after clock
 	before localmount
 	keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn -vserver
 }

init.d/swclock.in

@@ -13,7 +13,6 @@ description="Sets the local clock to the mtime of a given file."
 
 depend()
 {
-	before *
 	provide clock
 	keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu
 }

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

@@ -11,6 +11,7 @@
 
 depend()
 {
+	after clock
 	before bootmisc logger
 	keyword -prefix -systemd-nspawn -vserver
 }

init.d/sysfs.in

@@ -15,7 +15,6 @@ sysfs_opts=nodev,noexec,nosuid
 
 depend()
 {
-	want modules
 	keyword -docker -lxc -prefix -systemd-nspawn -vserver
 }
 
@@ -98,21 +97,13 @@ mount_misc()
 		fi
 	fi
 
-	# setup up kernel support for efivarfs
-	# slightly complicated, as if it's build as a module but NOT yet loaded,
-	# it will NOT appear in /proc/filesystems yet
-	if [ -d /sys/firmware/efi/efivars ] \
-		&& ! mountinfo -q /sys/firmware/efi/efivars; then
-		if modprobe -q efivarfs; then
-			ewarn "The efivarfs module needs to be configured in \
-				@SYSCONFDIR@/conf.d/modules or built in"
-		fi
-		if grep -qs efivarfs /proc/filesystems; then
-			ebegin "Mounting efivarfs filesystem"
-			mount -n -t efivarfs -o ${sysfs_opts} \
-				efivarfs /sys/firmware/efi/efivars
-			eend $?
-		fi
+	# set up kernel support for efivarfs
+	if [ -d /sys/firmware/efi/efivars ] &&
+		! mountinfo -q /sys/firmware/efi/efivars; then
+		ebegin "Mounting efivarfs filesystem"
+		mount -n -t efivarfs -o ${sysfs_opts} \
+			efivarfs /sys/firmware/efi/efivars 2> /dev/null
+		eend 0
 	fi
 }
 

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

@@ -18,7 +18,7 @@ depend()
 {
 	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,6 +14,7 @@ description="Initializes the random number generator."
 
 depend()
 {
+	after clock
 	need localmount
 	keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn
 }

init.d/wscons.in

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

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.
@@ -167,6 +167,24 @@ Display name used for the above defined command.
 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).

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
@@ -57,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

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,18 @@
 .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
-.Ar user
+.Fl P , -respawn-period
+.Ar seconds
 .Fl r , -chroot
 .Ar chrootpath
+.Fl u , -user
+.Ar user
 .Fl 1 , -stdout
 .Ar logfile
 .Fl 2 , -stderr
@@ -82,6 +88,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 +103,18 @@ 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 , -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.
@@ -123,6 +142,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/os-GNU.mk

@@ -11,5 +11,5 @@
 SFX=		.GNU.in
 PKG_PREFIX?=	/usr
 
-CPPFLAGS+=	-D_BSD_SOURCE -D_XOPEN_SOURCE=700 -DMAXPATHLEN=4096 -DPATH_MAX=4096
+CPPFLAGS+=	-D_DEFAULT_SOURCE -D_XOPEN_SOURCE=700 -DMAXPATHLEN=4096 -DPATH_MAX=4096
 LIBDL=		-Wl,-Bdynamic -ldl

mk/os-Linux.mk

@@ -11,7 +11,7 @@
 SFX=		.Linux.in
 PKG_PREFIX?=	/usr
 
-CPPFLAGS+=	-D_BSD_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=700
+CPPFLAGS+=	-D_DEFAULT_SOURCE -D_XOPEN_SOURCE=700
 LIBDL=		-Wl,-Bdynamic -ldl
 
 ifeq (${MKSELINUX},yes)

mk/sys.mk

@@ -59,6 +59,9 @@ MANPREFIX?=		${UPREFIX}/share
 MANDIR?=		${MANPREFIX}/man
 MANMODE?=		0444
 
+DATADIR?=		${UPREFIX}/share/openrc
+DATAMODE?=		0644
+
 DOCDIR?=		${UPREFIX}/share/doc
 DOCMODE?=		0644
 

runlevels/Makefile

@@ -36,10 +36,9 @@ BOOT-FreeBSD+=	hostid modules newsyslog savecore syslogd
 # FreeBSD specific stuff
 BOOT-FreeBSD+=	adjkerntz dumpon syscons
 
-BOOT-Linux+=	binfmt hwclock keymaps modules mtab procfs termencoding \
-	tmpfiles.setup
+BOOT-Linux+=	binfmt hwclock keymaps modules mtab procfs termencoding
 SHUTDOWN-Linux=	killprocs mount-ro
-SYSINIT-Linux=	devfs dmesg sysfs tmpfiles.dev
+SYSINIT-Linux=	devfs dmesg sysfs
 
 # Generic BSD stuff
 BOOT-NetBSD+=	hostid newsyslog savecore syslogd

scripts/.gitignore

@@ -1 +1,5 @@
+halt
+poweroff
 rc-sstat
+reboot
+shutdown

scripts/Makefile

@@ -8,12 +8,23 @@ INSTALLAFTER = _installafter
 ifeq (${OS},Linux)
 SRCS+= rc-sstat.in
 BIN+=	rc-sstat
+ifeq (${MKSYSVINIT},yes)
+SRCS+= halt.in poweroff.in reboot.in shutdown.in
+BIN+=	halt poweroff reboot shutdown
+	endif
 endif
 
 _installafter:
 ifeq (${OS},Linux)
 	${INSTALL} -d ${DESTDIR}${SBINDIR}
-	ln -s ${DIR}/rc-sstat ${DESTDIR}/${SBINDIR}/rc-sstat
+	ln -sf ${DIR}/rc-sstat ${DESTDIR}/${SBINDIR}/rc-sstat
+ifeq (${MKSYSVINIT},yes)
+	ln -sf	${DIR}/halt ${DESTDIR}/${SBINDIR}/halt
+	ln -sf	${DIR}/poweroff ${DESTDIR}/${SBINDIR}/poweroff
+	ln -sf	${DIR}/reboot ${DESTDIR}/${SBINDIR}/reboot
+	ln -sf	${DIR}/shutdown ${DESTDIR}/${SBINDIR}/shutdown
+	ln -sf	openrc-init ${DESTDIR}/${SBINDIR}/init
+endif
 endif
 
 include ${MK}/scripts.mk

scripts/halt.in

@@ -0,0 +1,3 @@
+#!@SHELL@
+
+exec @SBINDIR@/openrc-shutdown --halt "$@"

scripts/poweroff.in

@@ -0,0 +1,3 @@
+#!@SHELL@
+
+exec @SBINDIR@/openrc-shutdown --poweroff "$@"

scripts/reboot.in

@@ -0,0 +1,3 @@
+#!@SHELL@
+
+exec @SBINDIR@/openrc-shutdown --reboot "$@"

scripts/shutdown.in

@@ -0,0 +1,21 @@
+#!@SHELL@
+
+poweroff_arg=
+while getopts :HhPr opt; do
+	case "$opt" in
+		h|P) poweroff_arg=--poweroff ;;
+		H) poweroff_arg=--halt ;;
+		r) poweroff_arg=--reboot ;;
+		\?) printf "${0##*/}: invalid option ${optarg}\n" >&2
+		exit 1
+		;;
+	esac
+done
+shift $((OPTIND-1))
+
+if [ -z "${poweroff_arg}" ]; then
+	poweroff_arg=--single
+fi
+
+echo @SBINDIR@/openrc-shutdown ${poweroff_arg} ${@}
+exec @SBINDIR@/openrc-shutdown ${poweroff_arg} ${@}

sh/.gitignore

@@ -6,6 +6,5 @@ cgroup-release-agent.sh
 init.sh
 init-early.sh
 rc-cgroup.sh
-tmpfiles.sh
 migrate-to-run.sh
 binfmt.sh

sh/Makefile

@@ -1,9 +1,9 @@
 DIR=	${LIBEXECDIR}/sh
 SRCS=	init.sh.in functions.sh.in gendepends.sh.in \
-	openrc-run.sh.in rc-functions.sh.in tmpfiles.sh.in ${SRCS-${OS}}
+	openrc-run.sh.in rc-functions.sh.in ${SRCS-${OS}}
 INC=	rc-mount.sh functions.sh rc-functions.sh runit.sh s6.sh \
 		start-stop-daemon.sh supervise-daemon.sh
-BIN=	gendepends.sh init.sh openrc-run.sh tmpfiles.sh ${BIN-${OS}}
+BIN=	gendepends.sh init.sh openrc-run.sh ${BIN-${OS}}
 
 INSTALLAFTER=	_installafter
 

sh/gendepends.sh.in

@@ -74,11 +74,22 @@ do
 
 		# Only generate dependencies for OpenRC scripts
 		read one two three <"$RC_SERVICE"
-		[ "$one" = "#!@SBINDIR@/runscript" ] || \
-		[ "$one" = "#!@SBINDIR@/openrc-run" ] || \
-		[ "$one" = "#!" -a "$two" = "@SBINDIR@/runscript" ] || \
-		[ "$one" = "#!" -a "$two" = "@SBINDIR@/openrc-run" ] || \
-			continue
+		case "$one" in
+			\#*/openrc-run) ;;
+			\#*/runscript) ;;
+			\#!)
+				case "$two" in
+					*/openrc-run) ;;
+					*/runscript) ;;
+					*)
+						continue
+						;;
+				esac
+				;;
+			*)
+				continue
+				;;
+		esac
 		unset one two three
 
 		RC_SVCNAME=${RC_SERVICE##*/} ; export RC_SVCNAME

sh/init.sh.Linux.in

@@ -11,6 +11,16 @@ if [ -d "@SYSCONFDIR@/rc.conf.d" ]; then
 	done
 fi
 
+# check for md5sum, and probably /usr too
+if command -v md5sum >/dev/null; then
+	got_md5sum=true
+else
+	eerror "md5sum is missing, which suggests /usr is not mounted"
+	eerror "If you have separate /usr, it must be mounted by initramfs"
+	eerror "If not, you should check coreutils is installed correctly"
+	got_md5sum=false
+fi
+
 # By default VServer already has /proc mounted, but OpenVZ does not!
 # However, some of our users have an old proc image in /proc
 # NFC how they managed that, but the end result means we have to test if
@@ -21,9 +31,12 @@ fi
 mountproc=true
 f=/proc/self/environ
 if [ -e $f ]; then
-	if [ "$(VAR=a md5sum $f)" = "$(VAR=b md5sum $f)" ]; then
+	if $got_md5sum && [ "$(VAR=a md5sum $f)" = "$(VAR=b md5sum $f)" ]; then
 		eerror "You have cruft in /proc that should be deleted"
 	else
+		# If they don't have md5sum, this will fail in pretty ways if
+		# /proc isn't really mounted.  Oh well, their system is busted
+		# anyway, and they get to keep the pieces.
 		einfo "/proc is already mounted"
 		mountproc=false
 	fi
@@ -31,11 +44,9 @@ fi
 unset f
 
 if $mountproc; then
-	procfs="proc"
-	[ "$RC_UNAME" = "GNU/kFreeBSD" ] && proc="linprocfs"
 	ebegin "Mounting /proc"
 	if ! fstabinfo --mount /proc; then
-		mount -n -t "$procfs" -o noexec,nosuid,nodev proc /proc
+		mount -n -t proc -o noexec,nosuid,nodev proc /proc
 	fi
 	eend $?
 fi

sh/openrc-run.sh.in

@@ -146,10 +146,9 @@ _status()
 	fi
 }
 
-# Template start / stop / status functions
 # These functions select the appropriate function to call from the
 # supervisor modules
-start()
+default_start()
 {
 	local func=ssd_start
 	case "$supervisor" in
@@ -163,7 +162,7 @@ start()
 	$func
 }
 
-stop()
+default_stop()
 {
 	local func=ssd_stop
 	case "$supervisor" in
@@ -177,7 +176,7 @@ stop()
 	$func
 }
 
-status()
+default_status()
 {
 	local func=ssd_status
 	case "$supervisor" in
@@ -191,6 +190,26 @@ status()
 	$func
 }
 
+# Template start / stop / status functions
+# package init scripts may override these, but the bodies are as minimal as
+# possible, so that the init scripts can creatively wrap default_*
+# functions.
+start()
+{
+	default_start
+}
+
+stop()
+{
+	default_stop
+}
+
+status()
+{
+	default_status
+}
+
+# Start debug output
 yesno $RC_DEBUG && set -x
 
 # Load configuration settings. First the global ones, then any

sh/rc-functions.sh.in

@@ -85,6 +85,40 @@ get_bootparam()
 	return 1
 }
 
+get_bootparam_value()
+{
+	local match="$1" which_value="$2" sep="$3" result value
+	if [ -n "$match" -a -r /proc/cmdline ]; then
+		set -- $(cat /proc/cmdline)
+		while [ -n "$1" ]; do
+			case "$1" in
+				$match=*)
+					value="${1##*=}"
+					case "$which_value" in
+						all)
+							[ -z "$sep" ] && sep=' '
+							if [ -z "$result" ]; then
+								result="$value"
+							else
+								result="${result}${sep}${value}"
+							fi
+							;;
+						last)
+							result="$value"
+							;;
+						*)
+							result="$value"
+							break
+							;;
+					esac
+					;;
+			esac
+			shift
+		done
+	fi
+	echo $result
+}
+
 # Called from openrc-run.sh or gendepends.sh
 _get_containers() {
 	local c

sh/supervise-daemon.sh

@@ -25,6 +25,9 @@ supervise_start()
 	eval supervise-daemon --start \
 		${chroot:+--chroot} $chroot \
 		${pidfile:+--pidfile} $pidfile \
+		${respawn_delay:+--respawn-delay} $respawn_delay \
+		${respawn_max:+--respawn-max} $respawn_max \
+		${respawn_period:+--respawn-period} $respawn_period \
 		${command_user+--user} $command_user \
 		$supervise_daemon_args \
 		$command \

sh/tmpfiles.sh.in

@@ -1,457 +0,0 @@
-#!/bin/sh
-# This is a reimplementation of the systemd tmpfiles.d code
-# Control creation, deletion, and cleaning of volatile and temporary files
-#
-# Copyright (c) 2012 Gentoo Foundation
-# Released under the 2-clause BSD license.
-#
-# This instance is a pure-POSIX sh version, written by Robin H Johnson
-# <robbat2@gentoo.org>, based on the Arch Linux version as of 2012/01/01:
-# http://projects.archlinux.org/initscripts.git/tree/arch-tmpfiles
-#
-# See the tmpfiles.d manpage as well:
-# https://www.freedesktop.org/software/systemd/man/tmpfiles.d.html
-# This script should match the old manpage
-# http://0pointer.de/public/systemd-man/tmpfiles.d.html
-# as of 2012/03/12 and also implements some more recent features
-#
-
-DRYRUN=0
-CHECKPATH="@LIBEXECDIR@/bin/checkpath"
-
-checkprefix() {
-	n=$1
-	shift
-	for x in $@; do
-		case $n in
-			${x}*) return 0 ;;
-	esac
-	done
-	return 1
-}
-
-warninvalid() {
-	printf "tmpfiles: ignoring invalid entry on line %d of \`%s'\n" "$LINENUM" "$FILE"
-	error=$(( error+1 ))
-} >&2
-
-invalid_option() {
-	printf "tmpfiles: invalid option '%s'\n" "$1" >&2
-	exit 1
-}
-
-dryrun_or_real() {
-	local dryrun=
-	[ $DRYRUN -eq 1 ] && dryrun=echo
-	$dryrun "$@"
-}
-
-_chattr() {
-	local attr="$2"
-	case $attr in
-		[+-=]*) : ;;
-		'') return ;;
-		*) attr="+$attr" ;;
-	esac
-	local IFS=
-	dryrun_or_real chattr $1 "$attr" -- $3
-}
-
-relabel() {
-	local path
-	local paths=$1 mode=$2 uid=$3 gid=$4
-
-	for path in ${paths}; do
-		if [ -e "$path" ]; then
-			[ -x /sbin/restorecon ] && dryrun_or_real restorecon $CHOPTS "$path"
-			[ $uid != '-' ] && dryrun_or_real chown $CHOPTS "$uid" "$path"
-			[ $gid != '-' ] && dryrun_or_real chgrp $CHOPTS "$gid" "$path"
-			[ $mode != '-' ] && dryrun_or_real chmod $CHOPTS "$mode" "$path"
-		fi
-	done
-}
-
-splitpath() {
-    local path=$1
-    while [ -n "$path" ]; do
-        echo $path
-        path=${path%/*}
-    done
-}
-
-_restorecon() {
-    local path=$1
-    if [ -x /sbin/restorecon ]; then
-        dryrun_or_real restorecon -F $(splitpath "$path")
-    fi
-}
-
-_b() {
-	# Create a block device node if it doesn't exist yet
-	local path=$1 mode=$2 uid=$3 gid=$4 age=$5 arg=$6
-	if [ ! -e "$path" ]; then
-		dryrun_or_real mknod -m $mode $path b ${arg%:*} ${arg#*:}
-		_restorecon "$path"
-		dryrun_or_real chown $uid:$gid $path
-	fi
-}
-
-_c() {
-	# Create a character device node if it doesn't exist yet
-	local path=$1 mode=$2 uid=$3 gid=$4 age=$5 arg=$6
-	if [ ! -e "$path" ]; then
-		dryrun_or_real mknod -m $mode $path c ${arg%:*} ${arg#*:}
-		_restorecon "$path"
-		dryrun_or_real chown $uid:$gid $path
-	fi
-}
-
-_C() {
-	# recursively copy a file or directory
-	local path=$1 mode=$2 uid=$3 gid=$4 age=$5 arg=$6
-	if [ ! -e "$path" ]; then
-		dryrun_or_real cp -r "$arg" "$path"
-		_restorecon "$path"
-		[ $uid != '-' ] && dryrun_or_real chown "$uid" "$path"
-		[ $gid != '-' ] && dryrun_or_real chgrp "$gid" "$path"
-		[ $mode != '-' ] && dryrun_or_real chmod "$mode" "$path"
-	fi
-}
-
-_f() {
-	# Create a file if it doesn't exist yet
-	local path=$1 mode=$2 uid=$3 gid=$4 age=$5 arg=$6
-
-	[ $CREATE -gt 0 ] || return 0
-
-	if [ ! -e "$path" ]; then
-		dryrun_or_real $CHECKPATH -fq -m "$mode" -o "$uid:$gid" "$path"
-		[ -z "$arg" ] || _w "$@"
-	fi
-}
-
-_F() {
-	# Create or truncate a file
-	local path=$1 mode=$2 uid=$3 gid=$4 age=$5 arg=$6
-
-	[ $CREATE -gt 0 ] || return 0
-
-	dryrun_or_real $CHECKPATH -Fq -m "$mode" -o "$uid:$gid" "$path"
-	[ -z "$arg" ] || _w "$@"
-}
-
-_d() {
-	# Create a directory if it doesn't exist yet
-	local path=$1 mode=$2 uid=$3 gid=$4
-
-	[ $CREATE -gt 0 ] || return 0
-
-	if [ ! -d "$path" ]; then
-		dryrun_or_real mkdir -p "$path" 2>/dev/null
-		_restorecon "$path"
-		dryrun_or_real $CHECKPATH -dq -m "$mode" -o "$uid:$gid" "$path"
-	fi
-}
-
-_D() {
-	# Create or empty a directory
-	local path=$1 mode=$2 uid=$3 gid=$4
-
-	if [ -d "$path" ] && [ $REMOVE -gt 0 ]; then
-		dryrun_or_real find "$path" -mindepth 1 -maxdepth 1 -xdev -exec rm -rf {} +
-		_restorecon "$path"
-	fi
-
-	if [ $CREATE -gt 0 ]; then
-		dryrun_or_real mkdir -p "$path" 2>/dev/null
-		_restorecon "$path"
-		dryrun_or_real $CHECKPATH -Dq -m "$mode" -o "$uid:$gid" "$path"
-	fi
-}
-
-_v() {
-	# Create a subvolume if the path does not exist yet and the file system
-	# supports this (btrfs). Otherwise create a normal directory.
-	# TODO: Implement btrfs subvol creation.
-	_d "$@"
-}
-
-_q() {
-	# Similar to _v. However, make sure that the subvolume will be assigned
-	# to the same higher-level quota groups as the subvolume it has
-	# been created in.
-	# TODO: Implement btrfs subvol creation.
-	_d "$@"
-}
-
-_Q() {
-	# Similar to q. However, instead of copying the higher-level quota
-	# group assignments from the parent as-is, the lowest quota group
-	# of the parent subvolume is determined that is not the
-	# leaf quota group.
-	# TODO: Implement btrfs subvol creation.
-	_d "$@"
-}
-
-_h() {
-	# Set file/directory attributes. Lines of this type accept
-	# shell-style globs in place of normal path names.
-	# The format of the argument field matches chattr
-	_chattr '' "$6" "$1"
-}
-
-_H() {
-	# Recursively set file/directory attributes. Lines of this type accept
-	# shell-syle globs in place of normal path names.
-	# Does not follow symlinks
-	_chattr -R "$6" "$1"
-}
-
-_L() {
-	# Create a symlink if it doesn't exist yet
-	local path=$1 mode=$2 uid=$3 gid=$4 age=$5 arg=$6
-	[ ! -e "$path" ] && dryrun_or_real ln -s "$arg" "$path"
-	_restorecon "$path"
-}
-
-_p() {
-	# Create a named pipe (FIFO) if it doesn't exist yet
-	local path=$1 mode=$2 uid=$3 gid=$4
-
-	[ $CREATE -gt 0 ] || return 0
-
-	if [ ! -p "$path" ]; then
-		dryrun_or_real $CHECKPATH -pq -m $mode -o "$uid:$gid" "$path"
-	fi
-}
-
-_x() {
-	# Ignore a path during cleaning. Use this type to exclude paths from clean-up as
-	# controlled with the Age parameter. Note that lines of this type do not
-	# influence the effect of r or R lines. Lines of this type accept shell-style
-	# globs in place of of normal path names.
-	:
-	# XXX: we don't implement this
-}
-
-_X() {
-	# Ignore a path during cleanup. Use this type to prevent path
-	# removal as controled with the age parameter. Note that if path is
-	# a directory, the content of the directory is not excluded from
-	# clean-up, only the directory itself.
-	# Lines of this type accept shell-style globs in place of normal path names.
-	:
-	# XXX: we don't implement this
-}
-
-_r() {
-	# Remove a file or directory if it exists. This may not be used to remove
-	# non-empty directories, use R for that. Lines of this type accept shell-style
-	# globs in place of normal path names.
-	local path
-	local paths=$1
-
-	[ $REMOVE -gt 0 ] || return 0
-
-	for path in ${paths}; do
-		if [ -f "$path" ]; then
-			dryrun_or_real rm -f "$path"
-		elif [ -d "$path" ]; then
-			dryrun_or_real rmdir "$path"
-		fi
-	done
-}
-
-_R() {
-	# Recursively remove a path and all its subdirectories (if it is a directory).
-	# Lines of this type accept shell-style globs in place of normal path names.
-	local path
-	local paths=$1
-
-	[ $REMOVE -gt 0 ] || return 0
-
-	for path in ${paths}; do
-		[ -d "$path" ] && dryrun_or_real rm -rf --one-file-system "$path"
-	done
-}
-
-_w() {
-	# Write the argument parameter to a file, if it exists.
-	local path=$1 mode=$2 uid=$3 gid=$4 age=$5 arg=$6
-	if [ -f "$path" ]; then
-		if [ $DRYRUN -eq 1 ]; then
-			echo "echo \"$arg\" >>\"$path\""
-		else
-			echo "$arg" >>"$path"
-		fi
-	fi
-}
-
-_z() {
-	# Set ownership, access mode and relabel security context of a file or
-	# directory if it exists. Lines of this type accept shell-style globs in
-	# place of normal path names.
-	[ $CREATE -gt 0 ] || return 0
-
-	relabel "$@"
-}
-
-_Z() {
-	# Recursively set ownership, access mode and relabel security context of a
-	# path and all its subdirectories (if it is a directory). Lines of this type
-	# accept shell-style globs in place of normal path names.
-	[ $CREATE -gt 0 ] || return 0
-
-	CHOPTS=-R relabel "$@"
-}
-
-BOOT=0 CREATE=0 REMOVE=0 CLEAN=0 VERBOSE=0 DRYRUN=0 error=0 LINENO=0
-EXCLUDE=
-PREFIX=
-FILES=
-
-while [ $# -gt 0 ]; do
-	case $1 in
-		--boot) BOOT=1 ;;
-		--create) CREATE=1 ;;
-		--remove) REMOVE=1 ;;
-		--clean) CLEAN=1 ;; # TODO: Not implemented
-		--verbose) VERBOSE=1 ;;
-		--dryrun|--dry-run) DRYRUN=1 ;;
-		--exclude-prefix=*) EXCLUDE="${EXCLUDE}${1##--exclude-prefix=} " ;;
-		--prefix=*) PREFIX="${PREFIX}${1##--prefix=} " ;;
-		-*) invalid_option "$1" ;;
-		*) FILES="${FILES} $1"
-	esac
-	shift
-done
-
-if [ $(( CLEAN )) -eq 1 ] ; then
-	printf '%s clean mode is not implemented\n' "${0##*/}"
-	exit 1
-fi
-
-if [ "$CREATE$REMOVE" = '00' ]; then
-	printf 'usage: %s [--exclude-prefix=path] [--prefix=path] [--boot] [--create] [--remove] [--clean] [--verbose] [--dry-run]\n' "${0##*/}"
-	exit 1
-fi
-
-# XXX: The harcoding of /usr/lib/ is an explicit choice by upstream
-tmpfiles_dirs='/usr/lib/tmpfiles.d /run/tmpfiles.d /etc/tmpfiles.d'
-tmpfiles_basenames=''
-
-if [ -z "${FILES}" ]; then
-	# Build a list of sorted unique basenames
-	# directories declared later in the tmpfiles_d array will override earlier
-	# directories, on a per file basename basis.
-	# `/etc/tmpfiles.d/foo.conf' supersedes `/usr/lib/tmpfiles.d/foo.conf'.
-	# `/run/tmpfiles/foo.conf' will always be read after `/etc/tmpfiles.d/bar.conf'
-	for d in ${tmpfiles_dirs} ; do
-		[ -d $d ] && for f in ${d}/*.conf ; do
-			case "${f##*/}" in
-				systemd.conf|systemd-*.conf) continue;;
-			esac
-			[ -f $f ] && tmpfiles_basenames="${tmpfiles_basenames}\n${f##*/}"
-		done # for f in ${d}
-	done # for d in ${tmpfiles_dirs}
-	FILES="$(printf "${tmpfiles_basenames}\n" | sort -u )"
-fi
-
-tmpfiles_d=''
-
-for b in ${FILES} ; do
-	if [ "${b##*/}" != "${b}" ]; then
-		# The user specified a path on the command line
-		# Just pass it through unaltered
-		tmpfiles_d="${tmpfiles_d} ${b}"
-	else
-		real_f=''
-		for d in $tmpfiles_dirs ; do
-			f=${d}/${b}
-			[ -f "${f}" ] && real_f=$f
-		done
-		[ -f "${real_f}" ] && tmpfiles_d="${tmpfiles_d} ${real_f}"
-	fi
-done
-
-error=0
-
-# loop through the gathered fragments, sorted globally by filename.
-# `/run/tmpfiles/foo.conf' will always be read after `/etc/tmpfiles.d/bar.conf'
-FILE=
-for FILE in $tmpfiles_d ; do
-	LINENUM=0
-
-	### FILE FORMAT ###
-	# XXX: We ignore the 'Age' parameter
-	# 1    2              3    4    5    6   7
-	# Cmd  Path           Mode UID  GID  Age Argument
-	# d    /run/user      0755 root root 10d -
-	# Mode, UID, GID, Age, Argument may be omitted!
-	# If Cmd ends with !, the line is only processed if --boot is passed
-
-	# XXX: Upstream says whitespace is NOT permitted in the Path argument.
-	# But IS allowed when globs are expanded for the x/r/R/z/Z types.
-	while read cmd path mode uid gid age arg; do
-		LINENUM=$(( LINENUM+1 ))
-		FORCE=0
-
-		# Unless we have both command and path, skip this line.
-		if [ -z "$cmd" -o -z "$path" ]; then
-			continue
-		fi
-
-		case $cmd in
-			\#*) continue ;;
-		esac
-
-		while [ ${#cmd} -gt 1 ]; do
-			case $cmd in
-				*!) cmd=${cmd%!}; [ "$BOOT" -eq "1" ] || continue 2 ;;
-				*+) cmd=${cmd%+}; FORCE=1; ;;
-				*) warninvalid ; continue 2 ;;
-			esac
-		done
-
-		# whine about invalid entries
-		case $cmd in
-			f|F|w|d|D|v|p|L|c|C|b|x|X|r|R|z|Z|q|Q|h|H) ;;
-			*) warninvalid ; continue ;;
-		esac
-
-		# fall back on defaults when parameters are passed as '-'
-		if [ "$mode" = '-' -o "$mode" = '' ]; then
-			case "$cmd" in
-				p|f|F) mode=0644 ;;
-				d|D|v) mode=0755 ;;
-				C|z|Z|x|r|R|L) ;;
-			esac
-		fi
-
-		[ "$uid" = '-' -o "$uid" = '' ] && uid=0
-		[ "$gid" = '-' -o "$gid" = '' ] && gid=0
-		[ "$age" = '-' -o "$age" = '' ] && age=0
-		[ "$arg" = '-' -o "$arg" = '' ] && arg=''
-		set -- "$path" "$mode" "$uid" "$gid" "$age" "$arg"
-
-		[ -n "$EXCLUDE" ] && checkprefix $path $EXCLUDE && continue
-		[ -n "$PREFIX" ] && ! checkprefix $path $PREFIX && continue
-
-		if [ $FORCE -gt 0 ]; then
-			case $cmd in
-				p|L|c|b) [ -f "$path" ] && dryrun_or_real rm -f "$path"
-			esac
-		fi
-
-		[ "$VERBOSE" -eq "1" ] && echo _$cmd "$@"
-		_$cmd "$@"
-		rc=$?
-		if [ "${DRYRUN}" -eq "0" ]; then
-			[ $rc -ne 0 ] && error=$((error + 1))
-		fi
-	done <$FILE
-done
-
-exit $error
-
-# vim: set ts=2 sw=2 sts=2 noet ft=sh:

src/Makefile

@@ -3,9 +3,5 @@
 
 SUBDIR=		test libeinfo librc rc
 
-ifeq (${MKTOOLS},yes)
-SUBDIR+= tools
-endif
-
 MK=		../mk
 include		${MK}/subdir.mk

src/includes/rc-misc.h

@@ -23,6 +23,7 @@
 #include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 #include <unistd.h>
 
 #include "helpers.h"
@@ -68,5 +69,7 @@ RC_DEPTREE *_rc_deptree_load (int, int *);
 bool _rc_can_find_pids(void);
 
 RC_SERVICE lookup_service_state(const char *service);
+void from_time_t(char *time_string, time_t tv);
+time_t to_time_t(char *timestring);
 
 #endif

src/includes/rc-wtmp.h

@@ -0,0 +1,26 @@
+/*
+ * rc-wtmp.h
+ * This is private to us and not for user consumption
+*/
+
+/*
+ * 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.
+ */
+
+#ifndef __RC_WTMP_H__
+#define __RC_WTMP_H__
+
+#include <utmp.h>
+
+void log_wtmp(const char *user, const char *id, pid_t pid, int type,
+		const char *line);
+
+#endif

src/librc/librc-misc.c

@@ -19,6 +19,7 @@
 
 #include "queue.h"
 #include "librc.h"
+#include "helpers.h"
 
 bool
 rc_yesno(const char *value)
@@ -118,7 +119,7 @@ rc_getline(char **line, size_t *len, FILE *fp)
 librc_hidden_def(rc_getline)
 
 char *
-rc_proc_getent(const char *ent)
+rc_proc_getent(const char *ent _unused)
 {
 #ifdef __linux__
 	FILE *fp;

src/librc/librc.c

@@ -19,6 +19,7 @@ const char librc_copyright[] = "Copyright (c) 2007-2008 Roy Marples";
 
 #include "queue.h"
 #include "librc.h"
+#include <helpers.h>
 #ifdef __FreeBSD__
 #  include <sys/sysctl.h>
 #endif
@@ -232,7 +233,7 @@ detect_prefix(const char *systype)
 }
 
 static const char *
-detect_container(const char *systype)
+detect_container(const char *systype _unused)
 {
 #ifdef __FreeBSD__
 	if (systype) {
@@ -296,7 +297,7 @@ detect_container(const char *systype)
 }
 
 static const char *
-detect_vm(const char *systype)
+detect_vm(const char *systype _unused)
 {
 #ifdef __NetBSD__
 	if (systype) {
@@ -367,11 +368,12 @@ rc_parse_service_state(RC_SERVICE state)
  * specified runlevel in dependency order, including the
  * specified runlevel. */
 static void
-get_runlevel_chain(const char *runlevel, RC_STRINGLIST *level_list)
+get_runlevel_chain(const char *runlevel, RC_STRINGLIST *level_list, RC_STRINGLIST *ancestor_list)
 {
 	char path[PATH_MAX];
 	RC_STRINGLIST *dirs;
-	RC_STRING *d, *dn;
+	RC_STRING *d, *parent;
+	const char *nextlevel;
 
 	/*
 	 * If we haven't been passed a runlevel or a level list, or
@@ -395,8 +397,27 @@ get_runlevel_chain(const char *runlevel, RC_STRINGLIST *level_list)
 	 */
 	snprintf(path, sizeof(path), "%s/%s", RC_RUNLEVELDIR, runlevel);
 	dirs = ls_dir(path, LS_DIR);
-	TAILQ_FOREACH_SAFE(d, dirs, entries, dn)
-		get_runlevel_chain(d->value, level_list);
+	TAILQ_FOREACH(d, dirs, entries) {
+		nextlevel = d->value;
+
+		/* Check for loop */
+		if (rc_stringlist_find(ancestor_list, nextlevel)) {
+			fprintf(stderr, "Loop detected in stacked runlevels attempting to enter runlevel %s!\n",
+			    nextlevel);
+			fprintf(stderr, "Ancestors:\n");
+			TAILQ_FOREACH(parent, ancestor_list, entries)
+				fprintf(stderr, "\t%s\n", parent->value);
+			exit(1);
+		}
+
+		/* Add new ancestor */
+		rc_stringlist_add(ancestor_list, nextlevel);
+
+		get_runlevel_chain(nextlevel, level_list, ancestor_list);
+
+		rc_stringlist_delete(ancestor_list, nextlevel);
+	}
+	rc_stringlist_free(dirs);
 }
 
 bool
@@ -500,9 +521,12 @@ librc_hidden_def(rc_runlevel_unstack)
 RC_STRINGLIST *
 rc_runlevel_stacks(const char *runlevel)
 {
-	RC_STRINGLIST *stack;
+	RC_STRINGLIST *stack, *ancestor_list;
 	stack = rc_stringlist_new();
-	get_runlevel_chain(runlevel, stack);
+	ancestor_list = rc_stringlist_new();
+	rc_stringlist_add(ancestor_list, runlevel);
+	get_runlevel_chain(runlevel, stack, ancestor_list);
+	rc_stringlist_free(ancestor_list);
 	return stack;
 }
 librc_hidden_def(rc_runlevel_stacks)

src/librc/rc.h.in

@@ -39,6 +39,7 @@ extern "C" {
 #define RC_CONFDIR              RC_SYSCONFDIR "/conf.d"
 #define RC_PLUGINDIR            RC_LIBDIR "/plugins"
 
+#define RC_INIT_FIFO RC_SVCDIR"/init.ctl"
 #define RC_PROFILE_ENV     RC_SYSCONFDIR "/profile.env"
 #define RC_SYS_WHITELIST   RC_LIBEXECDIR "/conf.d/env_whitelist"
 #define RC_USR_WHITELIST   RC_SYSCONFDIR "/conf.d/env_whitelist"

src/rc/.gitignore

@@ -59,4 +59,7 @@ mark_service_failed
 rc-abort
 rc
 openrc
+openrc-init
 openrc-run
+openrc-shutdown
+kill_all

src/rc/Makefile

@@ -1,3 +1,7 @@
+include ../../Makefile.inc
+MK=		../../mk
+include ${MK}/os.mk
+
 SRCS=	checkpath.c do_e.c do_mark_service.c do_service.c \
 		do_value.c fstabinfo.c is_newer_than.c is_older_than.c \
 		mountinfo.c openrc-run.c rc-abort.c rc.c \
@@ -9,6 +13,10 @@ ifeq (${MKSELINUX},yes)
 SRCS+=		rc-selinux.c
 endif
 
+ifeq (${OS},Linux)
+SRCS+=		kill_all.c openrc-init.c openrc-shutdown.c rc-wtmp.c
+endif
+
 CLEANFILES=	version.h rc-selinux.o
 
 BINDIR=		${PREFIX}/bin
@@ -34,6 +42,12 @@ RC_SBINPROGS=	mark_service_starting mark_service_started \
 		mark_service_inactive mark_service_wasinactive \
 		mark_service_hotplugged mark_service_failed \
 		rc-abort swclock
+
+ifeq (${OS},Linux)
+RC_BINPROGS+= kill_all
+SBINPROGS+= openrc-init openrc-shutdown
+endif
+
 ALL_PROGS=	${BINPROGS} ${SBINPROGS} ${RC_BINPROGS} ${RC_SBINPROGS}
 CLEANFILES+=	${ALL_PROGS}
 
@@ -41,8 +55,6 @@ LOCAL_CPPFLAGS=-I../includes -I../librc -I../libeinfo
 LOCAL_LDFLAGS=-L../librc -L../libeinfo
 LDADD+=		-lutil -lrc -leinfo
 
-include ../../Makefile.inc
-MK=		../../mk
 include ${MK}/prog.mk
 include ${MK}/gitver.mk
 include ${MK}/cc.mk
@@ -88,6 +100,9 @@ checkpath: rc-selinux.o
 endif
 	${CC} ${LOCAL_CFLAGS} ${LOCAL_LDFLAGS} ${CFLAGS} ${LDFLAGS} -o $@ $^ ${LDADD}
 
+kill_all: kill_all.o _usage.o
+	${CC} ${LOCAL_CFLAGS} ${LOCAL_LDFLAGS} ${CFLAGS} ${LDFLAGS} -o $@ $^ ${LDADD}
+
 einfon einfo ewarnn ewarn eerrorn eerror ebegin eend ewend \
 eindent eoutdent esyslog eval_ecolors ewaitfile \
 veinfo vewarn vebegin veend vewend veindent veoutdent: do_e.o rc-misc.o
@@ -96,6 +111,9 @@ veinfo vewarn vebegin veend vewend veindent veoutdent: do_e.o rc-misc.o
 fstabinfo: fstabinfo.o _usage.o rc-misc.o
 	${CC} ${LOCAL_CFLAGS} ${LOCAL_LDFLAGS} ${CFLAGS} ${LDFLAGS} -o $@ $^ ${LDADD}
 
+openrc-init: openrc-init.o rc-wtmp.o
+	${CC} ${LOCAL_CFLAGS} ${LOCAL_LDFLAGS} ${CFLAGS} ${LDFLAGS} -o $@ $^ ${LDADD}
+
 is_newer_than: is_newer_than.o rc-misc.o
 	${CC} ${LOCAL_CFLAGS} ${LOCAL_LDFLAGS} ${CFLAGS} ${LDFLAGS} -o $@ $^ ${LDADD}
 
@@ -114,6 +132,9 @@ mountinfo: mountinfo.o _usage.o rc-misc.o
 openrc rc: rc.o rc-logger.o rc-misc.o rc-plugin.o _usage.o
 	${CC} ${LOCAL_CFLAGS} ${LOCAL_LDFLAGS} ${CFLAGS} ${LDFLAGS} -o $@ $^ ${LDADD}
 
+openrc-shutdown: openrc-shutdown.o _usage.o rc-wtmp.o
+	${CC} ${LOCAL_CFLAGS} ${LOCAL_LDFLAGS} ${CFLAGS} ${LDFLAGS} -o $@ $^ ${LDADD}
+
 openrc-run runscript: openrc-run.o _usage.o rc-misc.o rc-plugin.o
 ifeq (${MKSELINUX},yes)
 openrc-run runscript: rc-selinux.o

src/rc/do_service.c

@@ -36,7 +36,7 @@ int main(int argc, char **argv)
 	bool ok = false;
 	char *service;
 	char *exec;
-	int idx;
+	int idx = 0;
 	RC_SERVICE state, bit;
 
 	applet = basename_c(argv[0]);

src/rc/kill_all.c

@@ -0,0 +1,251 @@
+/*
+ * kill_all.c
+ * Sends a signal to all processes on the system.
+ */
+
+/*
+ * 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.
+ */
+
+
+#include <dirent.h>
+#include <errno.h>
+#include <getopt.h>
+#include <limits.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <syslog.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+
+#include "einfo.h"
+#include "rc.h"
+#include "rc-misc.h"
+#include "_usage.h"
+
+const char *applet = NULL;
+const char *extraopts = "[signal number]";
+const char *getoptstring = "do:" getoptstring_COMMON;
+const struct option longopts[] = {
+	{ "dry-run",        0, NULL, 'd' },
+	{ "omit",        1, NULL, 'o' },
+	longopts_COMMON
+};
+const char * const longopts_help[] = {
+	"print what would be done",
+	"omit this pid (can be repeated)",
+	longopts_help_COMMON
+};
+const char *usagestring = NULL;
+
+static int mount_proc(void)
+{
+	pid_t pid;
+	pid_t rc;
+	int status;
+
+	if (exists("/proc/version"))
+		return 0;
+	pid = fork();
+	switch(pid) {
+		case -1:
+			syslog(LOG_ERR, "Unable to fork");
+			return -1;
+			break;
+		case 0:
+			/* attempt to mount /proc */
+			execl("mount", "mount", "-t", "proc", "proc", "/proc", NULL);
+			syslog(LOG_ERR, "Unable to execute mount");
+			exit(1);
+			break;
+		default:
+			/* wait for child process */
+			while ((rc = wait(&status)) != pid)
+				if (rc < 0 && errno == ECHILD)
+					break;
+			if (rc != pid || WEXITSTATUS(status) != 0)
+				syslog(LOG_ERR, "mount returned non-zero exit status");
+			break;
+	}
+	if (! exists("/proc/version")) {
+		syslog(LOG_ERR, "Could not mount /proc");
+		return -1;
+	}
+	return 0;
+}
+
+static bool is_user_process(pid_t pid)
+{
+	char buf[PATH_MAX+1];
+	FILE *fp;
+	char path[PATH_MAX+1];
+	pid_t temp_pid;
+	bool user_process = true;
+
+	while (pid >0 && user_process) {
+		if (pid == 2) {
+			user_process = false;
+			continue;
+		}
+		snprintf(path, sizeof(path), "/proc/%d/status", pid);
+		fp = fopen(path, "r");
+		/*
+		 * if we could not open the file, the process disappeared, which
+		 * leaves us no way to determine for sure whether it was a user
+		 * process or kernel thread, so we say it is a kernel thread to
+		 * avoid accidentally killing it.
+		 */
+		if (!fp) {
+			user_process = false;
+			continue;
+		}
+		temp_pid = -1;
+		while (! feof(fp)) {
+			buf[0] = 0;
+			if (fgets(buf, sizeof(buf), fp))
+				sscanf(buf, "PPid: %d", &temp_pid);
+			else
+				break;
+		}
+		fclose(fp);
+		if (temp_pid == -1) {
+			syslog(LOG_ERR, "Unable to read pid from /proc/%d/status", pid);
+			user_process = false;
+			continue;
+		}
+		pid = temp_pid;
+	}
+	return user_process;
+}
+
+static int signal_processes(int sig, RC_STRINGLIST *omits, bool dryrun)
+{
+	sigset_t signals;
+	sigset_t oldsigs;
+	DIR *dir;
+	struct dirent	*d;
+	char buf[PATH_MAX+1];
+	pid_t pid;
+	int sendcount = 0;
+
+	kill(-1, SIGSTOP);
+	sigfillset(&signals);
+	sigemptyset(&oldsigs);
+	sigprocmask(SIG_SETMASK, &signals, &oldsigs);
+	/*
+	 * Open the /proc directory.
+	 * CWD must be /proc to avoid problems if / is affected by the killing
+	 * (i.e. depends on fuse).
+	 */
+	if (chdir("/proc") == -1) {
+		syslog(LOG_ERR, "chdir /proc failed");
+		sigprocmask(SIG_SETMASK, &oldsigs, NULL);
+		kill(-1, SIGCONT);
+		return -1;
+	}
+	dir = opendir(".");
+	if (!dir) {
+		syslog(LOG_ERR, "cannot opendir(/proc)");
+		sigprocmask(SIG_SETMASK, &oldsigs, NULL);
+		kill(-1, SIGCONT);
+		return -1;
+	}
+
+	/* Walk through the directory. */
+	while ((d = readdir(dir)) != NULL) {
+		/* Is this a process? */
+		pid = (pid_t) atoi(d->d_name);
+		if (pid == 0)
+			continue;
+
+		/* Is this a process we have been requested to omit? */
+		sprintf(buf, "%d", pid);
+		if (rc_stringlist_find(omits, buf))
+			continue;
+
+		/* Is this process in our session? */
+		if (getsid(getpid()) == getsid(pid))
+			continue;
+
+		/* Is this a kernel thread? */
+		if (!is_user_process(pid))
+			continue;
+
+		if (dryrun)
+			einfo("Would send signal %d to process %d", sig, pid);
+		else if (kill(pid, sig) == 0)
+			sendcount++;
+	}
+	closedir(dir);
+	sigprocmask(SIG_SETMASK, &oldsigs, NULL);
+	kill(-1, SIGCONT);
+	return sendcount;
+}
+
+int main(int argc, char **argv)
+{
+	char *arg = NULL;
+	int opt;
+	bool dryrun = false;
+	RC_STRINGLIST *omits = rc_stringlist_new();
+	int sig = SIGKILL;
+	char *here;
+	char *token;
+
+	/* Ensure that we are only quiet when explicitly told to be */
+	unsetenv("EINFO_QUIET");
+
+	applet = basename_c(argv[0]);
+	rc_stringlist_addu(omits, "1");
+	while ((opt = getopt_long(argc, argv, getoptstring,
+		    longopts, (int *) 0)) != -1)
+	{
+		switch (opt) {
+			case 'd':
+				dryrun = true;
+				break;
+			case 'o':
+				here = optarg;
+				while ((token = strsep(&here, ",;:"))) {
+					if ((pid_t) atoi(token) > 0)
+						rc_stringlist_addu(omits, token);
+					else {
+						eerror("Invalid omit pid value %s", token);
+						usage(EXIT_FAILURE);
+					}
+				}
+				break;
+			case_RC_COMMON_GETOPT
+		}
+	}
+
+	if (argc > optind) {
+	arg = argv[optind];
+	sig = atoi(arg);
+	if (sig <= 0 || sig > 31) {
+		rc_stringlist_free(omits);
+		eerror("Invalid signal %s", arg);
+		usage(EXIT_FAILURE);
+	}
+	}
+	
+	openlog(applet, LOG_CONS|LOG_PID, LOG_DAEMON);
+	if (mount_proc() != 0) {
+		rc_stringlist_free(omits);
+		eerrorx("Unable to mount /proc file system");
+	}
+	signal_processes(sig, omits, dryrun);
+	rc_stringlist_free(omits);
+	return 0;
+}

src/rc/mountinfo.c

@@ -46,6 +46,7 @@
 #include "_usage.h"
 
 const char *applet = NULL;
+const char *procmounts = "/proc/mounts";
 const char *extraopts = "[mount1] [mount2] ...";
 const char *getoptstring = "f:F:n:N:o:O:p:P:iste:E:" getoptstring_COMMON;
 const struct option longopts[] = {
@@ -323,7 +324,7 @@ find_mounts(struct args *args)
 	int netdev;
 	RC_STRINGLIST *list;
 
-	if ((fp = fopen("/proc/self/mounts", "r")) == NULL)
+	if ((fp = fopen(procmounts, "r")) == NULL)
 		eerrorx("getmntinfo: %s", strerror(errno));
 
 	list = rc_stringlist_new();

src/rc/openrc-init.c

@@ -0,0 +1,218 @@
+/*
+ * openrc-init.c
+ * This is the init process (pid 1) for OpenRC.
+ *
+ * This is based on code written by James Hammons <jlhamm@acm.org>, so
+ * I would like to publically thank him for his work.
+ */
+
+/*
+ * 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.
+ */
+
+#include <errno.h>
+#include <signal.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/reboot.h>
+#include <sys/wait.h>
+
+#include "helpers.h"
+#include "rc.h"
+#include "rc-wtmp.h"
+#include "version.h"
+
+static const char *rc_default_runlevel = "default";
+
+static pid_t do_openrc(const char *runlevel)
+{
+	pid_t pid;
+	sigset_t signals;
+
+	pid = fork();
+	switch(pid) {
+		case -1:
+			perror("fork");
+			break;
+		case 0:
+			setsid();
+			/* unblock all signals */
+			sigemptyset(&signals);
+			sigprocmask(SIG_SETMASK, &signals, NULL);
+			printf("Starting %s runlevel\n", runlevel);
+			execl("/sbin/openrc", "/sbin/openrc", runlevel, NULL);
+			perror("exec");
+			break;
+		default:
+			break;
+	}
+	return pid;
+}
+
+static void init(const char *default_runlevel)
+{
+	const char *runlevel = NULL;
+	pid_t pid;
+
+	pid = do_openrc("sysinit");
+	waitpid(pid, NULL, 0);
+	pid = do_openrc("boot");
+	waitpid(pid, NULL, 0);
+	if (default_runlevel)
+		runlevel = default_runlevel;
+	else
+		runlevel = rc_conf_value("rc_default_runlevel");
+	if (!runlevel)
+		runlevel = rc_default_runlevel;
+	if (!rc_runlevel_exists(runlevel)) {
+		printf("%s is an invalid runlevel\n", runlevel);
+		runlevel = rc_default_runlevel;
+	}
+	pid = do_openrc(runlevel);
+	waitpid(pid, NULL, 0);
+	log_wtmp("reboot", "~~", 0, RUN_LVL, "~~");
+}
+
+static void handle_reexec(char *my_name)
+{
+	execl(my_name, my_name, "reexec", NULL);
+	return;
+}
+
+static void handle_shutdown(const char *runlevel, int cmd)
+{
+	pid_t pid;
+
+	pid = do_openrc(runlevel);
+	while (waitpid(pid, NULL, 0) != pid);
+	printf("Sending the final term signal\n");
+	kill(-1, SIGTERM);
+	sleep(3);
+	printf("Sending the final kill signal\n");
+	kill(-1, SIGKILL);
+	sync();
+	reboot(cmd);
+}
+
+static void handle_single(void)
+{
+	pid_t pid;
+
+	pid = do_openrc("single");
+	while (waitpid(pid, NULL, 0) != pid);
+}
+
+static void reap_zombies(void)
+{
+	pid_t pid;
+
+	for (;;) {
+		pid = waitpid(-1, NULL, WNOHANG);
+		if (pid == 0)
+			break;
+		else if (pid == -1) {
+			if (errno == ECHILD)
+				break;
+			perror("waitpid");
+			continue;
+		}
+	}
+}
+
+static void signal_handler(int sig)
+{
+	switch(sig) {
+		case SIGINT:
+			handle_shutdown("reboot", RB_AUTOBOOT);
+			break;
+		case SIGCHLD:
+			reap_zombies();
+			break;
+		default:
+			printf("Unknown signal received, %d\n", sig);
+			break;
+	}
+}
+
+int main(int argc, char **argv)
+{
+	char *default_runlevel;
+	char buf[2048];
+	int count;
+	FILE *fifo;
+	bool reexec = false;
+	sigset_t signals;
+	struct sigaction sa;
+
+	if (getpid() != 1)
+		return 1;
+
+	printf("OpenRC init version %s starting\n", VERSION);
+
+	if (argc > 1)
+		default_runlevel = argv[1];
+	else
+		default_runlevel = NULL;
+
+	if (default_runlevel && strcmp(default_runlevel, "reexec") == 0)
+		reexec = true;
+
+	/* block all signals we do not handle */
+	sigfillset(&signals);
+	sigdelset(&signals, SIGCHLD);
+	sigdelset(&signals, SIGINT);
+	sigprocmask(SIG_SETMASK, &signals, NULL);
+
+	/* install signal  handler */
+	memset(&sa, 0, sizeof(sa));
+	sa.sa_handler = signal_handler;
+	sigaction(SIGCHLD, &sa, NULL);
+	sigaction(SIGINT, &sa, NULL);
+	reboot(RB_DISABLE_CAD);
+
+	if (! reexec)
+		init(default_runlevel);
+
+	if (mkfifo(RC_INIT_FIFO, 0600) == -1 && errno != EEXIST)
+		perror("mkfifo");
+
+	for (;;) {
+		/* This will block until a command is sent down the pipe... */
+		fifo = fopen(RC_INIT_FIFO, "r");
+		if (!fifo) {
+			if (errno != EINTR)
+				perror("fopen");
+			continue;
+		}
+		count = fread(buf, 1, sizeof(buf) - 1, fifo);
+		buf[count] = 0;
+		fclose(fifo);
+		printf("PID1: Received \"%s\" from FIFO...\n", buf);
+		if (strcmp(buf, "halt") == 0)
+			handle_shutdown("shutdown", RB_HALT_SYSTEM);
+		else if (strcmp(buf, "kexec") == 0)
+			handle_shutdown("reboot", RB_KEXEC);
+		else if (strcmp(buf, "poweroff") == 0)
+			handle_shutdown("shutdown", RB_POWER_OFF);
+		else if (strcmp(buf, "reboot") == 0)
+			handle_shutdown("reboot", RB_AUTOBOOT);
+		else if (strcmp(buf, "reexec") == 0)
+			handle_reexec(argv[0]);
+		else if (strcmp(buf, "single") == 0)
+			handle_single();
+	}
+	return 0;
+}

src/rc/openrc-run.c

@@ -1344,6 +1344,7 @@ int main(int argc, char **argv)
 			    applet_list,
 			    runlevel, depoptions);
 			rc_stringlist_free(tmplist);
+			tmplist = NULL;
 			TAILQ_FOREACH(svc, services, entries)
 			    printf("%s ", svc->value);
 			printf ("\n");

src/rc/openrc-shutdown.c

@@ -0,0 +1,170 @@
+/*
+ * openrc-shutdown.c
+ * If you are using OpenRC's provided init, this will shut down or
+ * reboot your system.
+ *
+ * This is based on code written by James Hammons <jlhamm@acm.org>, so
+ * I would like to publically thank him for his work.
+ */
+
+/*
+ * Copyright 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.
+ */
+
+#include <getopt.h>
+#include <signal.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/utsname.h>
+
+#include "einfo.h"
+#include "rc.h"
+#include "helpers.h"
+#include "_usage.h"
+#include "rc-wtmp.h"
+
+const char *applet = NULL;
+const char *extraopts = NULL;
+const char *getoptstring = "dDHKpRrsw" getoptstring_COMMON;
+const struct option longopts[] = {
+	{ "no-write",        no_argument, NULL, 'd'},
+	{ "dry-run",        no_argument, NULL, 'D'},
+	{ "halt",        no_argument, NULL, 'H'},
+	{ "kexec",        no_argument, NULL, 'K'},
+	{ "poweroff",        no_argument, NULL, 'p'},
+	{ "reexec",        no_argument, NULL, 'R'},
+	{ "reboot",        no_argument, NULL, 'r'},
+	{ "single",        no_argument, NULL, 's'},
+	{ "write-only",        no_argument, NULL, 'w'},
+	longopts_COMMON
+};
+const char * const longopts_help[] = {
+	"do not write wtmp record",
+	"print actions instead of executing them",
+	"halt the system",
+	"reboot the system using kexec",
+	"power off the system",
+	"re-execute init (use after upgrading)",
+	"reboot the system",
+	"single user mode",
+	"write wtmp boot record and exit",
+	longopts_help_COMMON
+};
+const char *usagestring = NULL;
+const char *exclusive = "Select one of "
+"--halt, --kexec, --poweroff, --reexec, --reboot, --single or --write-only";
+
+static bool do_dryrun = false;
+static bool do_halt = false;
+static bool do_kexec = false;
+static bool do_poweroff = false;
+static bool do_reboot = false;
+static bool do_reexec = false;
+static bool do_single = false;
+static bool do_wtmp = true;
+static bool do_wtmp_only = false;
+
+static void send_cmd(const char *cmd)
+{
+	FILE *fifo;
+ 	size_t ignored;
+
+	if (do_dryrun) {
+		einfo("Would send %s to init", cmd);
+		return;
+	}
+	if (do_wtmp && (do_halt || do_kexec || do_reboot || do_poweroff))
+		log_wtmp("shutdown", "~~", 0, RUN_LVL, "~~");
+	fifo = fopen(RC_INIT_FIFO, "w");
+	if (!fifo) {
+		perror("fopen");
+		return;
+	}
+
+	ignored = fwrite(cmd, 1, strlen(cmd), fifo);
+	if (ignored != strlen(cmd))
+		printf("Error writing to init fifo\n");
+	fclose(fifo);
+}
+
+int main(int argc, char **argv)
+{
+	int opt;
+	int cmd_count = 0;
+
+	applet = basename_c(argv[0]);
+	while ((opt = getopt_long(argc, argv, getoptstring,
+		    longopts, (int *) 0)) != -1)
+	{
+		switch (opt) {
+			case 'd':
+				do_wtmp = false;
+				break;
+		case 'D':
+			do_dryrun = true;
+			break;
+		case 'H':
+			do_halt = true;
+			cmd_count++;
+			break;
+		case 'K':
+			do_kexec = true;
+			cmd_count++;
+			break;
+		case 'p':
+			do_poweroff = true;
+			cmd_count++;
+			break;
+		case 'R':
+			do_reexec = true;
+			cmd_count++;
+			break;
+		case 'r':
+			do_reboot = true;
+			cmd_count++;
+			break;
+		case 's':
+			do_single = true;
+			cmd_count++;
+			break;
+		case 'w':
+			do_wtmp_only = true;
+			cmd_count++;
+			break;
+		case_RC_COMMON_GETOPT
+		}
+	}
+	if (geteuid() != 0 && ! do_dryrun)
+		eerrorx("%s: you must be root\n", applet);
+	if (cmd_count != 1) {
+		eerror("%s: %s\n", applet, exclusive);
+		usage(EXIT_FAILURE);
+	}
+	if (do_halt)
+		send_cmd("halt");
+	else if (do_kexec)
+		send_cmd("kexec");
+	else if (do_poweroff)
+		send_cmd("poweroff");
+	else if (do_reboot)
+		send_cmd("reboot");
+	else if (do_reexec)
+		send_cmd("reexec");
+	else if (do_wtmp_only)
+		log_wtmp("shutdown", "~~", 0, RUN_LVL, "~~");
+	else if (do_single)
+		send_cmd("single");
+	return 0;
+}

src/rc/rc-logger.c

@@ -261,12 +261,12 @@ rc_logger_open(const char *level)
 						break;
 					}
 				}
+				fclose(log);
 			} else {
 				log_error = 1;
 				eerror("Error: fopen(%s) failed: %s", TMPLOG, strerror(errno));
 			}
 
-			fclose(log);
 			fclose(plog);
 		} else {
 			/*

src/rc/rc-misc.c

@@ -228,6 +228,7 @@ svc_lock(const char *applet)
 	if (fd == -1)
 		return -1;
 	if (flock(fd, LOCK_EX | LOCK_NB) == -1) {
+		eerror("Call to flock failed: %s", strerror(errno));
 		close(fd);
 		return -1;
 	}
@@ -441,3 +442,35 @@ RC_SERVICE lookup_service_state(const char *service)
 			return service_bits[i].bit;
 	return 0;
 }
+
+void from_time_t(char *time_string, time_t tv)
+{
+	strftime(time_string, 20, "%Y-%m-%d %H:%M:%S", localtime(&tv));
+}
+
+time_t to_time_t(char *timestring)
+{
+	int check = 0;
+	int year = 0;
+	int month = 0;
+	int day = 0;
+	int hour = 0;
+	int min = 0;
+	int sec = 0;
+	struct tm breakdown = {0};
+	time_t result = -1;
+
+	check = sscanf(timestring, "%4d-%2d-%2d %2d:%2d:%2d",
+			&year, &month, &day, &hour, &min, &sec);
+	if (check == 6) {
+		breakdown.tm_year = year - 1900; /* years since 1900 */
+		breakdown.tm_mon = month - 1;
+		breakdown.tm_mday = day;
+		breakdown.tm_hour = hour;
+		breakdown.tm_min = min;
+		breakdown.tm_sec = sec;
+		breakdown.tm_isdst = -1;
+		result = mktime(&breakdown);
+	}
+	return result;
+}

src/rc/rc-selinux.c

@@ -334,7 +334,19 @@ void selinux_setup(char **argv)
 
 	/* extract the type from the context */
 	curr_con = context_new(curr_context);
-	curr_t = xstrdup(context_type_get(curr_con));
+	if (!curr_con) {
+		free(curr_context);
+		goto out;
+	}
+
+	curr_t = context_type_get(curr_con);
+	if (!curr_t) {
+		context_free(curr_con);
+		free(curr_context);
+		goto out;
+	}
+
+	curr_t = xstrdup(curr_t);
 	/* dont need them anymore so free() now */
 	context_free(curr_con);
 	free(curr_context);

src/rc/rc-status.c

@@ -76,10 +76,58 @@ print_level(const char *prefix, const char *level)
 		printf("%s\n", level);
 }
 
+static void get_uptime(const char *service, char *uptime, int uptime_size)
+{
+	RC_SERVICE state = rc_service_state(service);
+	char *start_count;
+	time_t now;
+	char *start_time_string;
+	time_t start_time;
+	time_t time_diff;
+	time_t diff_days = (time_t) 0;
+	time_t diff_hours = (time_t) 0;
+	time_t diff_mins = (time_t) 0;
+	time_t diff_secs = (time_t) 0;
+
+	uptime[0] = '\0';
+	if (state & RC_SERVICE_STARTED) {
+		start_count = rc_service_value_get(service, "start_count");
+		start_time_string = rc_service_value_get(service, "start_time");
+		if (start_count && start_time_string) {
+			start_time = to_time_t(start_time_string);
+			now = time(NULL);
+			time_diff = (time_t) difftime(now, start_time);
+			diff_secs = time_diff;
+			if (diff_secs > (time_t) 86400) {
+				diff_days = diff_secs / (time_t) 86400;
+				diff_secs %= diff_days * (time_t) 86400;
+			}
+			if (diff_secs > (time_t) 3600) {
+				diff_hours = diff_secs / (time_t) 3600;
+				diff_secs %= diff_hours * (time_t) 3600;
+			}
+			if (diff_secs > (time_t) 60) {
+				diff_mins = diff_secs / (time_t) 60;
+				diff_secs %= diff_mins * (time_t) 60;
+			}
+			if (diff_days > 0)
+				snprintf(uptime, uptime_size,
+						"%ld day(s) %02ld:%02ld:%02ld (%s)",
+						diff_days, diff_hours, diff_mins, diff_secs,
+						start_count);
+			else
+				snprintf(uptime, uptime_size,
+						"%02ld:%02ld:%02ld (%s)",
+						diff_hours, diff_mins, diff_secs, start_count);
+		}
+	}
+}
+
 static void
 print_service(const char *service)
 {
-	char status[10];
+	char status[60];
+	char uptime [40];
 	int cols =  printf(" %s", service);
 	const char *c = ecolor(ECOLOR_GOOD);
 	RC_SERVICE state = rc_service_state(service);
@@ -101,7 +149,8 @@ print_service(const char *service)
 		{
 			snprintf(status, sizeof(status), " crashed ");
 		} else {
-			snprintf(status, sizeof(status), " started ");
+			get_uptime(service, uptime, 40);
+			snprintf(status, sizeof(status), " started %s", uptime);
 			color = ECOLOR_GOOD;
 		}
 	} else if (state & RC_SERVICE_SCHEDULED) {

src/rc/rc-wtmp.c

@@ -0,0 +1,51 @@
+/*
+ * rc-wtmp.c
+ * This file contains routines to deal with the wtmp file.
+ */
+
+/*
+ * Copyright 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.
+ */
+
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <sys/utsname.h>
+
+#include "rc-wtmp.h"
+
+void log_wtmp(const char *user, const char *id, pid_t pid, int type,
+		const char *line)
+{
+	struct timeval tv;
+	struct utmp utmp;
+	struct utsname uname_buf;
+
+	memset(&utmp, 0, sizeof(utmp));
+	gettimeofday(&tv, NULL);
+	utmp.ut_tv.tv_sec = tv.tv_sec;
+	utmp.ut_tv.tv_usec = tv.tv_usec;
+	utmp.ut_pid  = pid;
+	utmp.ut_type = type;
+	strncpy(utmp.ut_name, user, sizeof(utmp.ut_name));
+	strncpy(utmp.ut_id  , id  , sizeof(utmp.ut_id  ));
+	strncpy(utmp.ut_line, line, sizeof(utmp.ut_line));
+        
+        /* Put the OS version in place of the hostname */
+        if (uname(&uname_buf) == 0)
+		strncpy(utmp.ut_host, uname_buf.release, sizeof(utmp.ut_host));
+
+	updwtmp(WTMP_FILE, &utmp);
+}