Update ChangeLog

Remove the IFS manipulation and simplify the loop that processes the
settings.

.cirrus.yml

@@ -1,15 +0,0 @@
-# Cirrus CI integration
-# https://cirrus-ci.org
-
-test_task:
-  freebsd_instance:
-    matrix:
-      image: freebsd-12-1-release-amd64
-      image: freebsd-11-4-release-amd64
-  env:
-    OS: FreeBSD
-  procfs_script: >
-    [ -f /proc/curproc ] || mount -t procfs proc /proc
-  pkg_install_script: pkg install -y bash gawk gmake gsed
-  gsed_hack_script: rm /usr/bin/sed && ln -s /usr/local/bin/gsed /usr/bin/sed
-  test_script: bash ci/cirrus.sh

.travis.yml

@@ -1,32 +0,0 @@
-# Travis build integration.
-# https://docs.travis-ci.com/
-
-language: c
-
-os:
-  - linux
-
-compiler:
-  - gcc
-  - clang
-  - musl-gcc
-
-addons:
-  apt:
-    packages:
-    - musl-tools
-
-notifications:
-  irc:
-    channels:
-      - "irc.freenode.org#openrc"
-    on_success: change  # options: [always|never|change] default: always
-    on_failure: always  # options: [always|never|change] default: always
-    on_start: false     # default: false
-
-before_install:
-  - sudo apt-get update
-  - sudo apt-get install -y shellcheck
-
-script:
-  - ./ci/travis.sh

AUTHORS

@@ -82,7 +82,6 @@ Semen Maryasin <marsoft@ya.ru>
 Sergei Trofimovich <slyfox@gentoo.org>
 Seth Robertson <in-gentoo@baka.org>
 S. Gilles <sgilles@umd.edu>
-Sony Interactive Entertainment, llc.
 Stefan Knoblich <s.knoblich@axsentis.de>
 Stef Simoens <stef.simoens@scarlet.be>
 Steve L <slong@rathaus.eclipse.co.uk>

Makefile

@@ -33,9 +33,8 @@ ifeq (${MKZSHCOMP},yes)
 SUBDIR+=	zsh-completion
 endif
 
-# We need to ensure that runlevels is done last other than test
+# We need to ensure that runlevels is done last
 SUBDIR+=	runlevels
-SUBDIR+=	test
 
 INSTALLAFTER=	_installafter
 

Makefile.inc

@@ -1,3 +1,3 @@
 NAME=		openrc
-VERSION=	0.43.3
+VERSION=	0.35.5
 PKG=		${NAME}-${VERSION}

NEWS.md

@@ -4,104 +4,6 @@ OpenRC NEWS
 This file will contain a list of notable changes for each release. Note
 the information in this file is in reverse order.
 
-## OpenRC 0.43
-
-This version changes the behavior of the checkpath helper to address
-CVE-2018-21269. on Linux systems, We require  non-terminal symbolic links
-to be owned by root. Since we can't do this on non-linux xystems, we do
-not dereference non-terminal symbolic links by default. If you need them
-dereferenced, you should add the "-s" switch to the appropriate
-checkpath calls.
-For more information, see http://github.com/openrc/openrc/issues/201.
-
-The SHLIBDIR variable has been removed from the makefiles to make them
-more consistent with most common makefiles. All libraries are now in
-LIBDIR, so if you need to put them in /, override the LIBDIR variable
-when you run make.
-
-## OpenRC 0.42
-
-openrc-shutdown now has the ability to shut down sysvinit-based systems.
-
-A guide has been added for migrating systems using another init system
-to openrc-init.
-
-## OpenRC 0.41.
-
-This version adds the ability to format the output of rc-status when
-showing the status of services in a runlevel so that it may be parsed.
-Currently, the -f switch only accepts ini as an argument which
-causes the output to be in the .ini format.
-
-This version adds an experimental build time switch to allow setting the
-default shell to use for service scripts.
-By default, this is set to /bin/sh if it is changed, the new shell must
-be able to understand posix-compatible syntax.
-
-## OpenRC 0.40
-
-In this version, the keymaps and termencoding services on Linux needed
-to be modified so they do not write to the root file system. This was
-done so they can run earlier in the boot sequence. AS a result, you will
-need to add save-termencoding and save-keymaps to your boot runlevel.
-This can be done as follows:
-
-```
-# rc-update add save-keymaps boot
-# rc-update add save-termencoding boot
-```
-
-## OpenRC 0.39
-
-This version removes the support for addons.
-The only place I know that this was used was Gentoo Baselayout 1.x, so
-it shouldn't affect anyone since baselayout-1 has been dead for a few
-years.
-
-Since all supported Linux kernel versions now make efivarfs immutable
-and all of the tools that access efivarfs are aware of this, we no
-longer mount efivarfs read-only. See the following github issue for more
-information:
-
-https://github.com/openrc/openrc/issues/238
-
-This version adds timed shutdown and cancelation of shutdown to
-openrc-shutdown. Shutdowns can now be delayed for a certain amount of
-time or scheduled for an exact time.
-
-supervise-daemon supports health checks, which are a periodic way to make sure a
-service is healthy. For more information on setting this up, please see
-supervise-daemon-guide.md.
-
-The --first-time switch has been added to all modprobe commands in the
-modules service. This means that, on Linux, you will see failures if a
-module was loaded by an initramfs or device manager before this service
-runs. These messages are harmless, but to clean them up, you should adjust your
-modules autoload configuration.
-
-## OpenRC 0.37
-
-start-stop-daemon now supports logging stdout and stderr of daemons to
-processes instead of files. These processes are defined by the
-output_logger and error_logger variables in standard service scripts, or
-by the  -3/--output-logger or -4/--error-logger switches if you use
-start-stop-daemon directly. For more information on this, see the
-start-stop-daemon man page.
-
-## OpenRC 0.36
-
-In this release, the modules-load service has been combined into the
-modules service since there is no reason I know of to keep them
-separate. However, modules also provides modules-load in case you were
-using modules-load in  your dependencies.
-
-The consolefont, keymaps, numlock and procfs service scripts no longer
-have a dependency on localmount.
-If you are a linux user and are still separaating / from /usr,
-you will need to add the following line to the appropriate conf.d files:
-
-rc_need="localmount"
-
 ## OpenRC 0.35
 
 In this version, the cgroups mounting logic has been moved from the

README.md

@@ -2,7 +2,8 @@ OpenRC README
 =============
 
 OpenRC is a dependency-based init system that works with the
-system-provided init program, normally `/sbin/init`.
+system-provided init program, normally `/sbin/init`. Currently, it does
+not have an init program of its own.
 
 ## Installation
 
@@ -11,7 +12,7 @@ OpenRC requires GNU make.
 Once you have GNU Make installed, the default OpenRC installation can be
 executed using this command:
 
-`make install`
+make install
 
 ## Configuration
 
@@ -37,7 +38,6 @@ PKG_PREFIX=/usr/pkg
 LOCAL_PREFIX=/usr/local
 PREFIX=/usr/local
 BRANDING=\"Gentoo/$(uname -s)\"
-SH=/bin/sh
 ```
 
 ## Notes
@@ -50,7 +50,7 @@ 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.
 
-`LOCAL_PREFIX` should be set to where user maintained packages are.
+`LOCAL_PREFIX` should be set when to where user maintained packages are.
 Only set `LOCAL_PREFIX` if different from `PKG_PREFIX`.
 
 `PREFIX` should be set when OpenRC is not installed to /.
@@ -78,16 +78,18 @@ remove them and then install so that the OS hooks into OpenRC.
 
 ## Reporting Bugs
 
-Please report issues on our github bug tracker [1].
+If you are using Gentoo Linux, bugs can be filed on their bugzilla under
+the `gentoo hosted projects` product and the `openrc` component [1].
+Otherwise, you can report issues on our github [2].
 
 Better yet, if you can contribute code, please feel free to submit pull
-requests [2].
+requests [3].
 
 ## IRC Channel
 
 We have an official irc channel, #openrc on freenode, feel free to join
 us there.
 
-[1]	https://github.com/openrc/openrc/issues
-
-[2]	https://github.com/openrc/openrc/pulls
+[1]	https://bugs.gentoo.org/
+[2]	https://github.com/openrc/openrc/issues
+[3]	https://github.com/openrc/openrc/pulls

bash-completion/rc-service

@@ -91,14 +91,11 @@ _rc_service()
 			done))
 			return 0
 		elif [[ ${COMP_CWORD} -eq 2 ]] && [[ ${prev} != -* ]]; then # if second word typed and we didn't type in a function
-			rc-service --exists "$prev" || return
-			shopt -s extglob
-			while read -r _ line; do
-				if [[ $line == +([[:alnum:]_]):* ]]; then
-					opts+="${line%%:*} "
-				fi
-			done < <(rc-service "$prev" describe 2>&1)
-			shopt -u extglob
+			filename=$(rc-service --resolve ${prev})
+			opts=$(cat ${filename} | grep "^\w*()" | sed "s/().*$//")	# Greps the functions included in the init script
+			if [[ "x${opts}" == "x" ]] ; then			   # if no options found loosen the grep algorhythm
+				opts=$(cat ${filename} | grep "\w*()" | sed "s/().*$//")
+			fi
 			COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
 			return 0
 		fi

ci/cirrus.sh

@@ -1,21 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2007-2018 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.
-
-set -e
-set -u
-set -x
-
-# These are steps to run on Cirrus CI under a jailed FreeBSD system.
-# See $TOP/.cirrus.yml for more info about the Cirrus CI setup.
-
-cpus=$(getconf NPROCESSORS_CONF || echo 1)
-gmake -j"${cpus}" -O
-gmake test

ci/travis.sh

@@ -1,40 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2007-2018 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.
-
-set -e
-set -u
-set -x
-
-# These are steps to run on TravisCI under a containerized Ubuntu system.
-# See $TOP/.travis.yml for more info about the TravisCI setup.
-
-# Run shellcheck, but don't fail (yet):
-shellcheck --version
-for shellscript in $(git ls-files); do
-	case $shellscript in
-		init.d/*.in) ;;
-		sh/*.in) ;;
-		sh/*.sh) ;;
-		support/init.d.examples/*.in) ;;
-		support/openvpn/*.sh) ;;
-		support/sysvinit/halt.sh) ;;
-		test/*.sh) ;;
-		*) continue ;;
-	esac
-	echo "Checking ${shellscript} with shellcheck:"
-	shellcheck -s sh "${shellscript}" || true
-done
-
-cpus=$(getconf _NPROCESSORS_CONF || echo 1)
-# make on TravisCI doesn't support -O yet
-make -j"${cpus}"
-
-make test

conf.d/modules

@@ -8,6 +8,11 @@
 #modules_2="ipv6"
 #modules="ohci1394"
 
+# 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"
+
 # Linux users can give the modules some arguments if needed, per version
 # if necessary.
 # Again, the most specific versioned variable will take precedence.

etc/rc.conf

@@ -198,9 +198,10 @@ rc_tty_number=12
 # "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
-# when hybrid mode is being used.
-# Controllers listed here will not be available for cgroups version 1.
+# 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.
@@ -229,7 +230,7 @@ rc_tty_number=12
 # The following setting turns on the memory.use_hierarchy setting in the
 # root memory cgroup for cgroups v1.
 # It must be set to yes in this file if you want this functionality.
-#rc_cgroup_memory_use_hierarchy="NO"
+#rc_cggroup_memory_use_hierarchy="NO"
 
 # The following settings allow you to set up values for the cgroups version 1
 # controllers for your services.

etc/rc.in

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!@SHELL@
 # 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

etc/rc.shutdown.in

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!@SHELL@
 # 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

init-guide.md

@@ -1,47 +0,0 @@
-# OpenRC init process guide
-
-OpenRC now includes an init process which can be used on Linux systems
-in place of sysvinit.
-
-## migrating a live system to openrc-init
-
-Configuring a live system to use this init process is very
-straight-forward, but the steps must be completed in this order.
-
-* have your boot loader add "init=/sbin/openrc-init" to the kernel command line
-
-The details of how to do this will vary from distro to distro, so they are
-out of scope for this document.
-
-* Install gettys into the runlevels where you need them.
-
-If you are using the provided /etc/init.d/agetty script,, you should
-first create symlinks in /etc/init.d to it for the ports where you
-want gettys to run, e.g. the following will work if you want gettys on
-tty1-tty6.
-
-```
-# cd /etc/init.d
-# for x in tty1 tty2 tty3 tty4 tty5 tty6; do
-  ln -snf agetty agetty.$x
-  done
-```
-
-Once this is done, use ```rc-update``` as normal to install the agetty
-services in the appropriate runlevels.
-
-* Reboot your system.
-
-At this point you are running under openrc-init, and you should use
-openrc-shutdown to handle shutting down, powering off, rebooting etc.
-
-## optional sysvinit compatibility
-
-If you build and install OpenRC with MKSYSVINIT=yes, you will build and install
-wrappers that make openrc-init compatible with sysvinit -- you will have
-commands like "halt" "shutdown" "reboot" and "poweroff".
-
-If you want this functionality on a live system, you should first
-migrate the system to openrc-init, remove sysvinit, then rebuild and
-install this package with MKSYSVINIT=yes.
-

init.d/.gitignore

@@ -41,8 +41,6 @@ rc-enabled
 rpcbind
 runsvdir
 savecore
-save-keymaps
-save-termencoding
 swap-blk
 swclock
 syslogd

init.d/Makefile

@@ -19,12 +19,12 @@ 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 \
-		mixer.in nscd.in powerd.in syscons.in
+		modules-load.in mixer.in nscd.in powerd.in syscons.in
 
 SRCS-Linux=	agetty.in binfmt.in devfs.in cgroups.in dmesg.in hwclock.in \
-	consolefont.in keymaps.in killprocs.in modules.in \
-	mount-ro.in mtab.in numlock.in procfs.in net-online.in save-keymaps.in \
-	save-termencoding.in sysfs.in termencoding.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/agetty.in

@@ -12,7 +12,6 @@
 description="start agetty on a terminal line"
 supervisor=supervise-daemon
 port="${RC_SVCNAME#*.}"
-respawn_period="${respawn_period:-60}"
 term_type="${term_type:-linux}"
 command=/sbin/agetty
 command_args_foreground="${agetty_options} ${port} ${baud} ${term_type}"
@@ -21,7 +20,6 @@ pidfile="/run/${RC_SVCNAME}.pid"
 depend() {
 	after local
 	keyword -prefix
-	provide getty
 }
 
 start_pre() {

init.d/bootmisc.in

@@ -241,13 +241,7 @@ stop()
 {
 	# Write a halt record if we're shutting down
 	if [ "$RC_RUNLEVEL" = shutdown ]; then
-		if [ "$RC_UNAME" = Linux ]; then
-			if [ -x /sbin/halt ]; then
-				halt -w
-			else
-				openrc-shutdown -w
-			fi
-		fi
+		[ "$RC_UNAME" = Linux ] && openrc-shutdown -w
 		if [ "$RC_SYS" = OPENVZ ]; then
 			yesno $RC_REBOOT && printf "" >/reboot
 		fi

init.d/cgroups.in

@@ -83,22 +83,14 @@ cgroup2_controllers()
 	local active cgroup_path x y
 	cgroup_path="$(cgroup2_find_path)"
 	[ -z "${cgroup_path}" ] && return 0
-	[ ! -e "${cgroup_path}/cgroup.controllers" ] && return 0
-	[ ! -e "${cgroup_path}/cgroup.subtree_control" ]&& return 0
+	[ -e "${cgroup_path}/cgroup.controllers" ] &&
 	read -r active < "${cgroup_path}/cgroup.controllers"
-	for x in ${active}; do
-	case "$rc_cgroup_mode" in
-		unified)
+	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"
-			;;
-		hybrid)
-			for y in ${rc_cgroup_controllers}; do
-				if [ "$x" = "$y" ]; then
-					echo "+${x}"  > "${cgroup_path}/cgroup.subtree_control"
-				fi
-			done
-			;;
-		esac
+		done
 	done
 	return 0
 }

init.d/consolefont.in

@@ -13,7 +13,7 @@ description="Sets a font for the consoles."
 
 depend()
 {
-	need termencoding
+	need localmount termencoding
 	after hotplug bootmisc modules
 	keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu
 }

init.d/devfs.in

@@ -15,7 +15,7 @@ depend()
 {
 	provide dev-mount
 	before dev
-	keyword -docker -prefix -systemd-nspawn -vserver
+	keyword -docker -lxc -prefix -systemd-nspawn -vserver
 }
 
 mount_dev()
@@ -66,20 +66,18 @@ seed_dev()
 {
 	# Seed /dev with some things that we know we need
 
-	if [ "${RC_SYS}" != LXC ]; then
-		# creating /dev/console, /dev/tty and /dev/tty1 to be able to write
-		# to $CONSOLE with/without bootsplash before udevd creates it
-		[ -c /dev/console ] || mknod -m 600 /dev/console c 5 1
-		[ -c /dev/tty1 ] || mknod -m 620 /dev/tty1 c 4 1
-		[ -c /dev/tty ] || mknod -m 666 /dev/tty c 5 0
+	# creating /dev/console, /dev/tty and /dev/tty1 to be able to write
+	# to $CONSOLE with/without bootsplash before udevd creates it
+	[ -c /dev/console ] || mknod -m 600 /dev/console c 5 1
+	[ -c /dev/tty1 ] || mknod -m 620 /dev/tty1 c 4 1
+	[ -c /dev/tty ] || mknod -m 666 /dev/tty c 5 0
 
-		# udevd will dup its stdin/stdout/stderr to /dev/null
-		# and we do not want a file which gets buffered in ram
-		[ -c /dev/null ] || mknod -m 666 /dev/null c 1 3
+	# udevd will dup its stdin/stdout/stderr to /dev/null
+	# and we do not want a file which gets buffered in ram
+	[ -c /dev/null ] || mknod -m 666 /dev/null c 1 3
 
-		# so udev can add its start-message to dmesg
-		[ -c /dev/kmsg ] || mknod -m 660 /dev/kmsg c 1 11
-	fi
+	# so udev can add its start-message to dmesg
+	[ -c /dev/kmsg ] || mknod -m 660 /dev/kmsg c 1 11
 
 	# extra symbolic links not provided by default
 	[ -e /dev/fd ] || ln -snf /proc/self/fd /dev/fd

init.d/keymaps.in

@@ -13,8 +13,8 @@ description="Applies a keymap for the consoles."
 
 depend()
 {
-	need termencoding
-	after devfs
+	need localmount termencoding
+	after bootmisc clock
 	keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu
 }
 
@@ -68,5 +68,10 @@ start()
 		echo "altgr keycode 18 = U+20AC" | loadkeys -q -
 		eend $?
 	fi
-	return 0
+
+	# Save the keymapping for use immediately at boot
+	if checkpath -W "$RC_LIBEXECDIR"; then
+		mkdir -p "$RC_LIBEXECDIR"/console
+		dumpkeys >"$RC_LIBEXECDIR"/console/keymap
+	fi
 }

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,66 +14,10 @@ description="Loads a user defined list of kernel modules."
 depend()
 {
 	use isapnp
-	provide modules-load
+	want modules-load
 	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 --first-time -q --use-blacklist "$x"; rc=$? ;;
-			*) ;;
-		esac
-		eend $rc "Failed to load $x"
-	done
-	return 0
-}
-
-modules_load_d()
-{
-	local x
-	files=$(find_modfiles)
-	for x in $files; do
-		load_modules $x
-	done
-	return 0
-}
-
 FreeBSD_modules()
 {
 	local cnt=0 x
@@ -104,7 +48,7 @@ Linux_modules()
 		x=${x%.*}
 	done
 
-	local list= x= xx= y= args=
+	local list= x= xx= y= args= mpargs= a=
 	for x in $kv_variant_list ; do
 		eval list=\$modules_$(shell_var "$x")
 		[ -n "$list" ] && break
@@ -113,13 +57,24 @@ Linux_modules()
 
 	[ -n "$list" ] && ebegin "Loading kernel modules"
 	for x in $list; do
+		a=${x#*:}
+		if [ "$a" = "$x" ]; then
+			unset mpargs
+		else
+			x=${x%%:*}
+			mpargs="-o $a"
+		fi
+		aa=$(shell_var "$a")
 		xx=$(shell_var "$x")
 		for y in $kv_variant_list ; do
+			eval args=\$module_${aa}_args_$(shell_var "$y")
+			[ -n "${args}" ] && break
 			eval args=\$module_${xx}_args_$(shell_var "$y")
 			[ -n "${args}" ] && break
 		done
+		[ -z "$args" ] && eval args=\$module_${aa}_args
 		[ -z "$args" ] && eval args=\$module_${xx}_args
-		eval modprobe --first-time --use-blacklist --verbose "$x" "$args"
+		eval modprobe --use-blacklist --verbose "$mpargs" "$x" "$args"
 	done
 	[ -n "$list" ] && eend
 }
@@ -127,10 +82,7 @@ Linux_modules()
 start()
 {
 	case "$RC_UNAME" in
-		FreeBSD|Linux)
-			modules_load_d
-			${RC_UNAME}_modules
-			;;
+		FreeBSD|Linux) ${RC_UNAME}_modules ;;
 		*) ;;
 	esac
 	return 0

init.d/net-online.in

@@ -13,7 +13,7 @@ description="Delays until the network is online or a specific timeout"
 
 depend()
 {
-	after modules net
+	after modules
 	need sysfs
 	provide network-online
 	keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn -uml -vserver
@@ -23,7 +23,7 @@ get_interfaces()
 {
 	local ifname iftype
 	for ifname in /sys/class/net/*; do
-		[ -h "${ifname}" ] || continue
+		[ -h "${ifname}" ] && continue
 		read iftype < ${ifname}/type
 		[ "$iftype" = "1" ] && printf "%s " ${ifname##*/}
 	done

init.d/numlock.in

@@ -15,6 +15,7 @@ ttyn=${rc_tty_number:-${RC_TTY_NUMBER:-12}}
 
 depend()
 {
+	need localmount
 	keyword -docker -lxc -openvz -prefix -systemd-nspawn -vserver
 }
 
@@ -42,8 +43,6 @@ start()
 
 stop()
 {
-	yesno $RC_GOINGDOWN && return 0
-
 	ebegin "Disabling numlock on ttys"
 	_setleds -
 	eend $? "Failed to disable numlock"

init.d/osclock.in

@@ -17,15 +17,3 @@ depend()
 {
 	provide clock
 }
-
-start()
-{
-	# This stub function is required to avoid OpenRC warning at boot:
-	#
-	#  * The command variable is undefined.
-	#  * There is nothing for osclock to start.
-	#  * If this is what you intend, please write a start function.
-	#  * This will become a failure in a future release.
-	#
-	return 0
-}

init.d/procfs.in

@@ -16,6 +16,7 @@ depend()
 	after clock
 	use devfs
 	want modules
+	need localmount
 	keyword -docker -lxc -openvz -prefix -systemd-nspawn -vserver
 }
 

init.d/save-keymaps.in

@@ -1,28 +0,0 @@
-#!@SBINDIR@/openrc-run
-# Copyright (c) 2018 Sony Interactive Entertainment, Inc.
-#
-# 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="Save the keymap for use as early as possible"
-
-depend()
-{
-	need termencoding
-	after bootmisc clock keymaps
-	keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu
-}
-
-start()
-{
-	# Save the keymapping for use immediately at boot
-	ebegin "Saving key mapping"
-	if checkpath -W "$RC_LIBEXECDIR"; then
-		mkdir -p "$RC_LIBEXECDIR"/console
-		dumpkeys >"$RC_LIBEXECDIR"/console/keymap
-	fi
-	eend $? "Unable to save keymapping"
-}

init.d/save-termencoding.in

@@ -1,35 +0,0 @@
-#!@SBINDIR@/openrc-run
-# Copyright (c) 2018 Sony Interactive Entertainment, Inc.
-#
-# 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="Configures terminal encoding."
-
-ttyn=${rc_tty_number:-${RC_TTY_NUMBER:-12}}
-: ${unicode:=${UNICODE}}
-
-depend()
-{
-	keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu
-	use root
-	after bootmisc clock termencoding
-}
-
-start()
-{
-	ebegin "Saving terminal encoding"
-	# Save the encoding for use immediately at boot
-	if checkpath -W "$RC_LIBEXECDIR"; then
-		mkdir -p "$RC_LIBEXECDIR"/console
-		if yesno ${unicode:-${UNICODE}}; then
-			echo "" > "$RC_LIBEXECDIR"/console/unicode
-		else
-			rm -f "$RC_LIBEXECDIR"/console/unicode
-		fi
-	fi
-	eend 0
-}

init.d/savecache.in

@@ -49,7 +49,7 @@ start()
 	fi
 	ebegin "Saving dependency cache"
 	local rc=0 save=
-	for x in depconfig deptree rc.log shutdowntime softlevel; 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/sysfs.in

@@ -101,7 +101,7 @@ mount_misc()
 	if [ -d /sys/firmware/efi/efivars ] &&
 		! mountinfo -q /sys/firmware/efi/efivars; then
 		ebegin "Mounting efivarfs filesystem"
-		mount -n -t efivarfs -o ${sysfs_opts} \
+		mount -n -t efivarfs -o ro \
 			efivarfs /sys/firmware/efi/efivars 2> /dev/null
 		eend 0
 	fi

init.d/termencoding.in

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

man/openrc-run.8

@@ -119,9 +119,6 @@ The amount of time, in milliseconds, s6-svc should wait for the service
 to go down when stopping the service. The default is 60000.
 .It Ar start_stop_daemon_args
 List of arguments passed to start-stop-daemon when starting the daemon.
-.It Ar supervise_daemon_args
-List of arguments passed to supervise-daemon when starting the daemon.
-If undefined, start_stop_daemon_args is used as a fallback.
 .It Ar command
 Daemon to start or stop via
 .Nm start-stop-daemon
@@ -173,23 +170,6 @@ variable is set.
 The same thing as
 .Pa output_log
 but for the standard error output.
-.It Ar output_logger
-This is a process which will be used to log the standard output from the
-service.  If you are starting this service with
-.Xr start-stop-daemon 8 ,
-,  you must set
-.Pa command_background
-to true. Keep in mind that this command must be executable as a shell
-command inside the chroot if the
-.Pa chroot
-variable is set. Keep in mind also that this command works by accepting
-the stdout of the service on stdin.
-An example of a command that can be run this way is logger if you want
-your service output to go to syslog.
-.It Ar error_logger
-The same thing as
-.Pa output_logger
-but for the standard error output.
 .It Ar directory
 .Xr start-stop-daemon 8
 and
@@ -332,7 +312,7 @@ 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
+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
@@ -461,7 +441,6 @@ Mark the service as inactive.
 .Op Fl p , -pipe
 .Op Fl m , -mode Ar mode
 .Op Fl o , -owner Ar owner
-.Op Fl s , -symlinks
 .Op Fl W , -writable
 .Op Fl q , -quiet
 .Ar path ...
@@ -482,11 +461,6 @@ or with names, and are separated by a colon.
 The truncate options (-D and -F) cause the directory or file to be
 cleared of all contents.
 .Pp
-If -s is not specified on a non-linux platform, checkpath will refuse to
-allow non-terminal symbolic links to exist in the path. This is for
-security reasons so that a non-root user can't create a symbolic link to
-a root-owned file and take ownership of that file.
-.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
@@ -620,7 +594,7 @@ rc_net_tap1_provide="!net"
 # It's also possible to negate keywords. This is mainly useful for prefix
 # users testing OpenRC.
 rc_keyword="!-prefix"
-# This can also be used to block a script from running in all
+# This can also be used to block a script from runining in all
 # containers except one or two
 rc_keyword="!-containers !-docker"
 .Ed

man/openrc-shutdown.8

@@ -16,36 +16,15 @@
 .Nd bring the system down
 .Sh SYNOPSIS
 .Nm
-.Op Fl c , -cancel
-.Nm
-.Op Fl R , -reexec
-.Nm
-.Op Fl w , -write-only
-.Nm
 .Op Fl d , -no-write
 .Op Fl D , -dry-run
 .Op Fl H , -halt
-time
-.Nm
-.Op Fl d , -no-write
-.Op Fl D , -dry-run
 .Op Fl k , -kexec
-time
-.Nm
-.Op Fl d , -no-write
-.Op Fl D , -dry-run
 .Op Fl p , -poweroff
-time
-.Nm
-.Op Fl d , -no-write
-.Op Fl D , -dry-run
+.Op Fl R , -reexec
 .Op Fl r , -reboot
-time
-.Nm
-.Op Fl d , -no-write
-.Op Fl D , -dry-run
 .Op Fl s , -single
-time
+.Op Fl w , -write-only
 .Sh DESCRIPTION
 .Nm
 is the utility that communicates with
@@ -53,8 +32,6 @@ is the utility that communicates with
 to bring down the system or instruct openrc-init to re-execute itself.
 It supports the following options:
 .Bl -tag -width "poweroff"
-.It Fl c , -cancel
-Cancel a pending shutdown.
 .It Fl d , -no-write
 Do not write the wtmp boot record.
 .It Fl D , -dry-run
@@ -76,7 +53,7 @@ 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
-Wrrite a wtmp shutdown record and do nothing else.
+Stop all services, kill all processes and move to single user mode.
 .El
 .Sh SEE ALSO
 .Xr openrc-init 8 ,

man/openrc.8

@@ -65,31 +65,7 @@ Instead you should use
 and
 .Xr shutdown 8
 and let them call these special runlevels.
-.Sh OPTIONS
-.Pp
-.Bl -tag -width "-o , --override"
-.It Fl n , -no-stop
-Do not stop any services.
-.It Fl o , -override
-Override the next runlevel to change into when leaving single user or boot
-runlevels
-.It Fl s , -service
-Run the service specified with the rest of the arguments.
-.It Fl S , -sys
-Output the RC system type, if any.
-.It Fl h , -help
-Display usage information and exit.
-.It Fl C , -nocolor
-Disable color output.
-.It Fl V , -version
-Display software version.
-.It Fl v , -verbose
-Run verbosely.
-.It Fl q , -quiet
-Run quietly (repeat to suppress errors).
-.El
 .Sh SEE ALSO
-.Xr openrc-run 8 ,
 .Xr rc-status 8 ,
 .Xr rc-update 8 ,
 .Xr init 8 ,

man/rc-service.8

@@ -20,14 +20,6 @@
 .Ar service cmd
 .Op Ar ...
 .Nm
-.Fl d , -debug
-.Ar service cmd
-.Op Ar ...
-.Nm
-.Fl D , -nodeps
-.Ar service cmd
-.Op Ar ...
-.Nm
 .Op Fl i , -ifexists
 .Ar service cmd
 .Op Ar ...
@@ -40,21 +32,9 @@
 .Ar service cmd
 .Op Ar ...
 .Nm
-.Op Fl s , -ifstarted
-.Ar service cmd
-.Op Ar ...
-.Nm
-.Op Fl S , -ifstopped
-.Ar service cmd
-.Op Ar ...
-.Nm
 .Fl e , -exists
 .Ar service
 .Nm
-.Fl Z , -dry-run
-.Ar service cmd
-.Op Ar ...
-.Nm
 .Fl l , -list
 .Nm
 .Fl r , -resolve
@@ -88,15 +68,6 @@ return 0 if it can find
 otherwise -1.
 .Fl r , -resolve
 does the same and also prints the full path of the service to stdout.
-.Pp
-.Fl d , -debug
-sets -x when running the service script(s).
-.Pp
-.Fl D , -nodeps
-ignores dependencies when running the service.
-.Pp
-.Fl Z , -dry-run
-displays commands rather than executing them.
 .Sh SEE ALSO
 .Xr openrc 8 ,
 .Xr stdout 3

man/rc-status.8

@@ -17,7 +17,6 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl aclsuC
-.Op Fl f Ar ini
 .Op Ar runlevel
 .Sh DESCRIPTION
 .Nm
@@ -38,17 +37,12 @@ The options are as follows:
 Show all runlevels and their services.
 .It Fl c , -crashed
 List all services that have crashed.
-.It Fl f , -format
-Select a format for the output. Currently, the only one that can be
-specified is ini, which outputs in *.ini format.
 .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 , -supervised
-Show all supervised services.
 .It Fl s , -servicelist
 Show all services.
 .It Fl u , -unused

man/start-stop-daemon.8

@@ -120,7 +120,7 @@ Saves the pid of the daemon in the file specified by the
 .Fl p , -pidfile
 option. Only useful when used with daemons that run in the foreground and
 forced into the background with the
-.Fl b , -background
+.Fl -b , -background
 option.
 .It Fl I , -ionice Ar class Ns Op : Ns Ar data
 Modifies the IO scheduling priority of the daemon.
@@ -131,34 +131,9 @@ Modifies the scheduling priority of the daemon.
 .It Fl 1 , -stdout Ar logfile
 Redirect the standard output of the process to logfile when started with
 .Fl background .
-The logfile Must be an absolute pathname, but relative to the path
-optionally given with
+Must be an absolute pathname, but relative to the path optionally given with
 .Fl r , -chroot .
 The logfile can also be a named pipe.
-.It Fl 2 , -stderr Ar logfile
-Redirect the standard error of the process to logfile when started with
-.Fl background .
-The logfile must be an absolute pathname, but relative to the path
-optionally given with
-.Fl r , -chroot .
-The logfile can also be a named pipe.
-.It Fl 3 , -stdout-logger Ar cmd
-Run cmd as a child process redirecting the standard output to the
-standard input of cmd when started with
-.Fl background .
-Cmd must be an absolute pathname, but relative to the path optionally given with
-.Fl r , -chroot .
-This process must be prepared to accept input on stdin and be able to
-log it or send it to another location.
-.It Fl 4 , -stderr-logger Ar cmd
-Run cmd as a child process and 
-Redirect the standard error of the process to the standard input of cmd
-when started with
-.Fl background .
-Cmd must be an absolute pathname, but relative to the path optionally given with
-.Fl r , -chroot .
-This process must be prepared to accept input on stdin and be able to
-log it or send it to another location.
 .It Fl w , -wait Ar milliseconds
 Wait
 .Ar milliseconds

man/supervise-daemon.8

@@ -9,18 +9,13 @@
 .\"    except according to the terms contained in the LICENSE file.
 .\"
 .Dd April 27, 2016
-.Dt SUPERVISE-DAEMON 8 SMM
+.Dt supervise-DAEMON 8 SMM
 .Os OpenRC
 .Sh NAME
 .Nm supervise-daemon
 .Nd starts a daemon and restarts it if it crashes
 .Sh SYNOPSIS
 .Nm
-servicename
-.Fl a , -healthcheck-timer
-.Ar seconds
-.Fl A , -healthcheck-delay
-.Ar seconds
 .Fl D , -respawn-delay
 .Ar seconds
 .Fl d , -chdir
@@ -37,6 +32,8 @@ servicename
 .Ar count
 .Fl N , -nicelevel
 .Ar level
+.Fl p , -pidfile
+.Ar pidfile
 .Fl P , -respawn-period
 .Ar seconds
 .Fl R , -retry
@@ -54,15 +51,10 @@ servicename
 .Op Fl -
 .Op Ar arguments
 .Nm
-servicename
 .Fl K , -stop
 .Ar daemon
-.Fl r , -chroot
-.Ar chrootpath
-.Nm
-servicename
-.Fl s , -signal
-.Ar signal
+.Fl p , -pidfile
+.Ar pidfile
 .Fl r , -chroot
 .Ar chrootpath
 .Sh DESCRIPTION
@@ -70,15 +62,22 @@ servicename
 provides a consistent method of starting, stopping and restarting
 daemons. If
 .Fl K , -stop
-or
-.Fl s , -signal
 is not provided, then we assume we are starting the daemon.
 .Nm
-only works with daemons which do not fork. If your daemon has options to
-tell it not to fork, it should be configured to not fork.
+only works with daemons which do not fork. Also, it uses its own pid
+file, so the daemon should not write a pid file, or the pid file passed
+to 
+.Nm
+should not be the one the daemon writes.
 .Pp
 Here are the options to specify the daemon and how it should start or stop:
 .Bl -tag -width indent
+.It Fl p , -pidfile Ar pidfile
+When starting, we write a
+.Ar pidfile
+so we know which supervisor to stop.  When stopping we only stop the pid(s)
+listed in the
+.Ar pidfile .
 .It Fl u , -user Ar user Ns Op : Ns Ar group
 Start the daemon as the
 .Ar user
@@ -88,17 +87,11 @@ owned by the user. You can optionally append a
 name here also.
 .It Fl v , -verbose
 Print the action(s) that are taken just before doing them.
-.El
 .Pp
 The options are as follows:
 .Bl -tag -width indent
-.It Fl a , -healthcheck-timer Ar seconds
-Run the healthcheck() command, possibly followed by the unhealthy()
-command every time this number of seconds passes.
-.It Fl A , -healthcheck-delay Ar seconds
-Wait this long before the first health check.
 .It Fl D , -respawn-delay Ar seconds
-Wait this number of seconds before restarting a daemon after it crashes.
+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.
@@ -113,19 +106,16 @@ 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. If a daemon
-crashes more than this number of times,
+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 and exit. The default is 10 and 0 means unlimited.
-.Pp
-If respawn-period is also set, more than respawn-max crashes must occur
-during respawn-period seconds to cause
-.Nm
-to give up and exit.
+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. See the
+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
@@ -133,11 +123,7 @@ signal/timeout pairs (like SIGTERM/5).
 If this option is not given, the default is 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 and chdir should be relative to the chroot.
-.It Fl  , -signal Ar signal
-Instruct a supervisor to signal the process it is supervising. The
-process to communicate with is determined by the name of the service
-taken from the RC_SVCNAME environment variable.
+as the path to the daemon, chdir and pidfile, should be relative to the chroot.
 .It Fl u , -user Ar user
 Start the daemon as the specified user.
 .It Fl 1 , -stdout Ar logfile
@@ -150,6 +136,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
@@ -171,16 +158,15 @@ 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 NOTE
-Invoking supervise-daemon requires both the RC_SVCNAME  environment
-variable to be set and the name of the service as the first argument on
-the command line, so it is best to invoke it inside a service script
-rather than manually.
 .Sh SEE ALSO
 .Xr chdir 2 ,
 .Xr chroot 2 ,
 .Xr getopt 3 ,
 .Xr nice 2 ,
+.Xr rc_find_pids 3
+.Sh BUGS
+.Nm
+cannot stop an interpreted daemon that no longer exists without a pidfile.
 .Sh HISTORY
 .Nm
 first appeared in Debian.

mk/lib.mk

@@ -52,12 +52,13 @@ ${SHLIB_NAME}:	${SOBJS}
 	${SOBJS} ${LDADD}
 
 install: all
-	${INSTALL} -d ${DESTDIR}${LIBDIR}
 ifeq (${MKSTATICLIBS},yes)
+	${INSTALL} -d ${DESTDIR}${LIBDIR}
 	${INSTALL} -m ${LIBMODE} lib${LIB}.a ${DESTDIR}${LIBDIR}
 endif
-	${INSTALL} -m ${LIBMODE} ${SHLIB_NAME} ${DESTDIR}${LIBDIR}
-	ln -fs ${SHLIB_NAME} ${DESTDIR}${LIBDIR}/${SHLIB_LINK}
+	${INSTALL} -d ${DESTDIR}${SHLIBDIR}
+	${INSTALL} -m ${LIBMODE} ${SHLIB_NAME} ${DESTDIR}${SHLIBDIR}
+	ln -fs ${SHLIB_NAME} ${DESTDIR}${SHLIBDIR}/${SHLIB_LINK}
 	${INSTALL} -d ${DESTDIR}${INCDIR}
 	for x in ${INCS}; do ${INSTALL} -m ${INCMODE} $$x ${DESTDIR}${INCDIR}; done
 

mk/os-Linux.mk

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

mk/scripts.mk

@@ -19,7 +19,7 @@ _PKG_SED:=		$(shell ${_PKG_SED_SH})
 _LCL_SED_SH=		if test "${PREFIX}" = "${LOCAL_PREFIX}"; then echo "-e 's:@LOCAL_PREFIX@::g'"; else echo "-e 's:@LOCAL_PREFIX@:${LOCAL_PREFIX}:g'"; fi
 _LCL_SED:=		$(shell ${_LCL_SED_SH})
 
-SED_REPLACE=		-e 's:@SHELL@:${SH}:' -e 's:@LIB@:${LIBNAME}:g' -e 's:@SYSCONFDIR@:${SYSCONFDIR}:g' -e 's:@LIBEXECDIR@:${LIBEXECDIR}:g' -e 's:@PREFIX@:${PREFIX}:g' -e 's:@BINDIR@:${BINDIR}:g' -e 's:@SBINDIR@:${SBINDIR}:g' ${_PKG_SED} ${_LCL_SED}
+SED_REPLACE=		-e 's:@SHELL@:${SH}:g' -e 's:@LIB@:${LIBNAME}:g' -e 's:@SYSCONFDIR@:${SYSCONFDIR}:g' -e 's:@LIBEXECDIR@:${LIBEXECDIR}:g' -e 's:@PREFIX@:${PREFIX}:g' -e 's:@BINDIR@:${BINDIR}:g' -e 's:@SBINDIR@:${SBINDIR}:g' ${_PKG_SED} ${_LCL_SED}
 
 # Tweak our shell scripts
 %.sh: %.sh.in
@@ -53,6 +53,7 @@ realinstall: ${BIN} ${CONF} ${INC}
 install: all realinstall ${INSTALLAFTER}
 
 check test::
+	@if test -e runtests.sh ; then ./runtests.sh || exit $$? ; fi
 
 # A lot of scripts don't have anything to clean
 # Also, some rm implentation require a file argument regardless of error

mk/sys.mk

@@ -45,20 +45,20 @@ SBINDIR?=		${PREFIX}/sbin
 SBINMODE?=		0755
 
 INCDIR?=		${UPREFIX}/include
-INCMODE?=		0644
+INCMODE?=		0444
 
 _LIBNAME_SH=		case `readlink /lib` in /lib64|lib64) echo "lib64";; *) echo "lib";; esac
 _LIBNAME:=		$(shell ${_LIBNAME_SH})
 LIBNAME?=		${_LIBNAME}
 LIBDIR?=		${UPREFIX}/${LIBNAME}
-LIBMODE?=		0644
+LIBMODE?=		0444
+SHLIBDIR?=		${PREFIX}/${LIBNAME}
 
 LIBEXECDIR?=		${PREFIX}/libexec/rc
-PKGCONFIGDIR?= ${UPREFIX}/${LIBNAME}/pkgconfig
 
 MANPREFIX?=		${UPREFIX}/share
 MANDIR?=		${MANPREFIX}/man
-MANMODE?=		0644
+MANMODE?=		0444
 
 BASHCOMPDIR?=		${UPREFIX}/share/bash-completion/completions
 

pkgconfig/Makefile

@@ -1,4 +1,4 @@
-DIR=	${PKGCONFIGDIR}
+DIR=	${LIBDIR}/pkgconfig
 SRCS=	einfo.pc.in openrc.pc.in
 INC=	einfo.pc openrc.pc
 

runlevels/Makefile

@@ -36,8 +36,7 @@ BOOT-FreeBSD+=	hostid modules newsyslog savecore syslogd
 # FreeBSD specific stuff
 BOOT-FreeBSD+=	adjkerntz dumpon syscons
 
-BOOT-Linux+=	binfmt hwclock keymaps modules mtab procfs save-keymaps \
-	save-termencoding termencoding
+BOOT-Linux+=	binfmt hwclock keymaps modules mtab procfs termencoding
 SHUTDOWN-Linux=	killprocs mount-ro
 SYSINIT-Linux=	devfs cgroups dmesg sysfs
 
@@ -90,12 +89,6 @@ install:
 			fi; \
 			ln -snf ${INITDIR}/"$$x" ${SHUTDOWNDIR}/"$$x" || exit $$?; done \
 	fi
-	if test "${MKSYSVINIT}" = yes && test "${OS}" = Linux; then \
-		for x in tty1 tty2 tty3 tty4 tty5 tty6; do \
-			ln -snf ${INITDIR}/agetty ${DESTDIR}/${INITDIR}/"agetty.$$x" || exit $$?; \
-			ln -snf ${INITDIR}/agetty.$$x ${DEFAULTDIR}/"agetty.$$x" || exit $$?; \
-		done; \
-	fi
 
 check test::
 

scripts/halt.in

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!@SHELL@
 
 option_arg=
 poweroff_arg=
@@ -21,9 +21,4 @@ if [ -z "${poweroff_arg}" ]; then
 	poweroff_arg=--poweroff
 fi
 
-script_args="$@"
-if [ -z "${script_args}" ]; then
-	script_args=now
-fi
-
-exec @SBINDIR@/openrc-shutdown ${option_arg} ${poweroff_arg} "${script_args}"
+exec @SBINDIR@/openrc-shutdown ${option_arg} ${poweroff_arg} "$@"

scripts/poweroff.in

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!@SHELL@
 
 option_arg=
 poweroff_arg=
@@ -20,9 +20,4 @@ if [ -z "${poweroff_arg}" ]; then
 	poweroff_arg=--poweroff
 fi
 
-script_args="$@"
-if [ -z "${script_args}" ]; then
-	script_args=now
-fi
-
-exec @SBINDIR@/openrc-shutdown ${option_arg} ${poweroff_arg} "${script_args}"
+exec @SBINDIR@/openrc-shutdown ${option_arg} ${poweroff_arg} "$@"

scripts/rc-sstat.in

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!@SHELL@
 # Copyright (c) 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

scripts/reboot.in

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!@SHELL@
 
 option_arg=
 poweroff_arg=
@@ -22,9 +22,4 @@ if [ -z "${poweroff_arg}" ]; then
 	poweroff_arg=--reboot
 fi
 
-script_args="$@"
-if [ -z "${script_args}" ]; then
-	script_args=now
-fi
-
-exec @SBINDIR@/openrc-shutdown ${option_arg} ${poweroff_arg} "${script_args}"
+exec @SBINDIR@/openrc-shutdown ${option_arg} ${poweroff_arg} "$@"

scripts/shutdown.in

@@ -1,31 +1,14 @@
-#!/bin/sh
+#!@SHELL@
 
-do_halt=false
+shutdown_arg=
 while getopts :akrhPHfFnct: opt; do
 	case "$opt" in
 		a) ;;
 		k) ;;
-		r)
-			shutdown_arg=--reboot
-			;;
-		h)
-			do_halt=true
-			shutdown_arg=--poweroff
-			;;
-		P)
-			if ! ${do_halt}; then
-				printf "%s\n" "The -P flag requires the -h flag" >&2
-				exit 1
-			fi
-			shutdown_arg=--poweroff
-			;;
-		H)
-			if ! ${do_halt}; then
-				printf "%s\n" "The -H flag requires the -h flag" >&2
-				exit 1
-			fi
-			shutdown_arg=--halt
-			;;
+		r) shutdown_arg=--reboot ;;
+		h) shutdown_arg=--halt ;;
+		P) shutdown_arg=--poweroff ;;
+		H) shutdown_arg=--halt ;;
 		f) ;;
 		F) ;;
 		n) ;;
@@ -42,5 +25,5 @@ if [ -z "${shutdown_arg}" ]; then
 	shutdown_arg=--single
 fi
 
-printf "%s %s\n" "@SBINDIR@/openrc-shutdown ${shutdown_arg}" "$@"
+echo @SBINDIR@/openrc-shutdown ${shutdown_arg} "$@"
 exec @SBINDIR@/openrc-shutdown ${shutdown_arg} "$@"

service-script-guide.md

@@ -29,9 +29,7 @@ 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)
 
 A `depend` function declares the dependencies of this service script.
-All scripts must have start/stop/status functions, but defaults are
-provided and should be used unless you have a very strong reason not to
-use them.
+All scripts must have start/stop/status functions, but defaults are provided and should be used unless you have a very strong reason not to use them.
 
 Extra functions can be added easily:
 

sh/.gitignore

@@ -1,7 +1,10 @@
 functions.sh
 gendepends.sh
+rc-functions.sh
 openrc-run.sh
 cgroup-release-agent.sh
 init.sh
 init-early.sh
+rc-cgroup.sh
+migrate-to-run.sh
 binfmt.sh

sh/Makefile

@@ -1,8 +1,8 @@
 DIR=	${LIBEXECDIR}/sh
 SRCS=	init.sh.in functions.sh.in gendepends.sh.in \
-	openrc-run.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 ${INC-${OS}}
+		start-stop-daemon.sh supervise-daemon.sh
 BIN=	gendepends.sh init.sh openrc-run.sh ${BIN-${OS}}
 
 INSTALLAFTER=	_installafter
@@ -13,9 +13,10 @@ include ${MK}/os.mk
 SRCS-FreeBSD=
 BIN-FreeBSD=
 
-SRCS-Linux=	binfmt.sh.in cgroup-release-agent.sh.in init-early.sh.in
-BIN-Linux=	binfmt.sh cgroup-release-agent.sh init-early.sh
-INC-Linux= rc-cgroup.sh
+SRCS-Linux=	binfmt.sh.in cgroup-release-agent.sh.in init-early.sh.in \
+	migrate-to-run.sh.in rc-cgroup.sh.in
+BIN-Linux=	binfmt.sh cgroup-release-agent.sh init-early.sh migrate-to-run.sh \
+	rc-cgroup.sh
 
 SRCS-NetBSD=
 BIN-NetBSD=
@@ -31,3 +32,4 @@ _installafter:
 	ln -snf ${LIBEXECDIR}/sh/functions.sh ${DESTDIR}/${INITDIR} || exit $$?
 
 check test::
+	./runtests.sh

sh/binfmt.sh.in

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!@SHELL@
 # This is a reimplementation of the systemd binfmt.d code to register
 # misc binary formats with the kernel.
 #
@@ -29,9 +29,6 @@ apply_file() {
 			\;*) continue ;;
 		esac
 
-		local reg=${line#*:}
-		[ -e /proc/sys/fs/binfmt_misc/${reg%%:*} ] && echo -1 > /proc/sys/fs/binfmt_misc/${reg%%:*}
-
 		echo "${line}" > /proc/sys/fs/binfmt_misc/register
 		rc=$?
 		if [ $rc -ne 0 ]; then

sh/cgroup-release-agent.sh.in

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!@SHELL@
 # This is run by the kernel after the last task is removed from a
 # control group in the openrc hierarchy.
 

sh/functions.sh.in

@@ -46,7 +46,7 @@ yesno()
 	case "$value" in
 		[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1) return 0;;
 		[Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0) return 1;;
-		*) vewarn "\$$1 is not set properly"; return 2;;
+		*) vewarn "\$$1 is not set properly"; return 1;;
 	esac
 }
 

sh/init-early.sh.Linux.in

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!@SHELL@
 # 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
@@ -20,7 +20,7 @@ service_present()
 	# succeed if $RC_SYS empty, can't check further, assume script will run
 	[ -z "$RC_SYS" ] && return 0
 	# fail if file contains "-$RC_SYS", because then it won't run
-	grep -Eqi "^[[:space:]]*keyword[[:space:]].*-$RC_SYS([[:space:]]|$)" "$p" && return 1
+	egrep -qi "^[[:space:]]*keyword[[:space:]].*-$RC_SYS\>" "$p" && return 1
 	# succeed otherwise
 	return 0
 }

sh/init.sh.BSD.in

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!@SHELL@
 # 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

sh/init.sh.GNU-kFreeBSD.in

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!@SHELL@
 # 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

sh/init.sh.GNU.in

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!@SHELL@
 # 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

sh/init.sh.Linux.in

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!@SHELL@
 # Copyright (c) 1999-2007 Gentoo Foundation
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
@@ -71,17 +71,20 @@ if [ "$sys" = VSERVER ]; then
 	rm -rf /run/*
 elif ! mountinfo -q /run; then
 	ebegin "Mounting /run"
-	run_mount_opts="mode=0755,nosuid,nodev,nr_inodes=800k,size=20%,strictatime"
+	rc=0
 	if ! fstabinfo --mount /run; then
-		if ! mount -t tmpfs -o ${run_mount_opts} tmpfs /run; then
-			eerror "Unable to mount tmpfs on /run."
-			eerror "Can't continue."
-			exit 1
-		fi
+		mount -t tmpfs -o mode=0755,nodev,size=10% tmpfs /run
+		rc=$?
+	fi
+	if [ $rc != 0 ]; then
+		eerror "Unable to mount tmpfs on /run."
+		eerror "Can't continue."
+		exit 1
 	fi
 fi
 
-checkpath -d "$RC_SVCDIR"
+[ -x /sbin/restorecon ] && /sbin/restorecon -rF /run
+checkpath -d $RC_SVCDIR
 checkpath -d -m 0775 -o root:uucp /run/lock
 
 # Try to mount xenfs as early as possible, otherwise rc_sys() will always
@@ -99,5 +102,4 @@ if [ -e "$RC_LIBEXECDIR"/cache/softlevel ]; then
 fi
 
 echo sysinit >"$RC_SVCDIR"/softlevel
-[ -x /sbin/restorecon ] && /sbin/restorecon -rF /run
 exit 0

sh/migrate-to-run.sh.in

@@ -0,0 +1,36 @@
+#!@SHELL@
+# Copyright (c) 2012-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.
+
+. "@LIBEXECDIR@/sh/functions.sh"
+
+if [ -e /run/openrc/softlevel ]; then
+	einfo "The OpenRC dependency data has already been migrated."
+	exit 0
+fi
+
+if [ ! -d /run ]; then
+	eerror "/run is not a directory."
+	eerror "moving /run to /run.pre-openrc"
+	mv /run /run.pre-openrc
+	mkdir /run
+fi
+
+rm -rf /run/openrc
+
+if ! mountinfo -q -f tmpfs /run; then
+	ln -s "@LIBEXECDIR@"/init.d /run/openrc
+else
+	cp -a "@LIBEXECDIR@/init.d" /run/openrc
+	rc-update -u
+fi
+
+einfo "The OpenRC dependency data was migrated successfully."
+exit 0

sh/openrc-run.sh.in

@@ -133,10 +133,11 @@ _status()
 	elif service_inactive; then
 		ewarn "status: inactive"
 		return 16
-	elif service_crashed; then
-		eerror "status: crashed"
-		return 32
 	elif service_started; then
+		if service_crashed; then
+			eerror "status: crashed"
+			return 32
+		fi
 		einfo "status: started"
 		return 0
 	else
@@ -254,11 +255,8 @@ fi
 for _cmd; do
 	if [ "$_cmd" != status -a "$_cmd" != describe ]; then
 		# Apply any ulimit defined
-		if [ -n "${rc_ulimit:-$RC_ULIMIT}" ]; then
-			if ! ulimit ${rc_ulimit:-$RC_ULIMIT}; then
-				eerror "${RC_SVCNAME}: unable to apply RC_ULIMIT settings"
-			fi
-		fi
+		[ -n "${rc_ulimit:-$RC_ULIMIT}" ] && \
+			ulimit ${rc_ulimit:-$RC_ULIMIT}
 		# Apply cgroups settings if defined
 		if [ "$(command -v cgroup_add_service)" = "cgroup_add_service" ]
 		then

sh/rc-cgroup.sh.in

@@ -1,3 +1,4 @@
+#!@SHELL@
 # Copyright (c) 2012-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
@@ -24,26 +25,18 @@ cgroup_find_path()
 	printf "%s" "${result}"
 }
 
-# This extracts all pids in a cgroup and puts them in the cgroup_pids
-# variable.
-# It is done this way to avoid subshells so we don't have to worry about
-# locating the pid of the subshell in the cgroup.
-# https://github.com/openrc/openrc/issues/396
 cgroup_get_pids()
 {
-	local cgroup_procs p
-	cgroup_pids=
+	local cgroup_procs p pids
 	cgroup_procs="$(cgroup2_find_path)"
-	if [ -n "${cgroup_procs}" ]; then
-		cgroup_procs="${cgroup_procs}/${RC_SVCNAME}/cgroup.procs"
-	else
+	[ -n "${cgroup_procs}" ] &&
+		cgroup_procs="${cgroup_procs}/${RC_SVCNAME}/cgroup.procs" ||
 		cgroup_procs="/sys/fs/cgroup/openrc/${RC_SVCNAME}/tasks"
-	fi
 	[ -f "${cgroup_procs}" ] || return 0
 	while read -r p; do
-		[ "$p" -eq $$ ] && continue
-		cgroup_pids="${cgroup_pids} ${p}"
+		[ "$p" -eq $$ ] || pids="${pids} ${p}"
 	done < "${cgroup_procs}"
+	printf "%s" "${pids}"
 	return 0
 }
 
@@ -69,7 +62,7 @@ cgroup_set_values()
 	while [ -n "$1" ] && [ "$controller" != "cpuacct" ]; do
 		case "$1" in
 			$controller.*)
-				if [ -n "${name}" ] && [ -w "${cgroup}/${name}" ] &&
+				if [ -n "${name}" ] && [ -w "${cgroup}/${name}" ] && 
 					[ -n "${val}" ]; then
 					veinfo "$RC_SVCNAME: Setting $cgroup/$name to $val"
 					printf "%s" "$val" > "$cgroup/$name"
@@ -189,8 +182,7 @@ cgroup2_set_limits()
 {
 	local cgroup_path
 	cgroup_path="$(cgroup2_find_path)"
-	[ -z "${cgroup_path}" ] && return 0
-	mountinfo -q "${cgroup_path}"|| return 0
+	[ -d "${cgroup_path}" ] || return 0
 	rc_cgroup_path="${cgroup_path}/${RC_SVCNAME}"
 	[ ! -d "${rc_cgroup_path}" ] && mkdir "${rc_cgroup_path}"
 	[ -f "${rc_cgroup_path}"/cgroup.procs ] &&
@@ -201,7 +193,7 @@ cgroup2_set_limits()
 		[ -z "${value}" ] && continue
 		[ ! -f "${rc_cgroup_path}/${key}" ] && continue
 		veinfo "${RC_SVCNAME}: cgroups: setting ${key} to ${value}"
-		printf "%s" "${value}" > "${rc_cgroup_path}/${key}"
+		printf "%s\n" "${value}" > "${rc_cgroup_path}/${key}"
 	done
 	return 0
 }
@@ -210,28 +202,25 @@ cgroup_cleanup()
 {
 	cgroup_running || return 0
 	ebegin "starting cgroups cleanup"
-	local loops=0
-	cgroup_get_pids
-	if [ -n "${cgroup_pids}" ]; then
-		kill -s CONT ${cgroup_pids} 2> /dev/null
-		kill -s "${stopsig:-TERM}" ${cgroup_pids} 2> /dev/null
+	local pids loops=0
+	pids="$(cgroup_get_pids)"
+	if [ -n "${pids}" ]; then
+		kill -s CONT ${pids} 2> /dev/null
+		kill -s "${stopsig:-TERM}" ${pids} 2> /dev/null
 		yesno "${rc_send_sighup:-no}" &&
-			kill -s HUP ${cgroup_pids} 2> /dev/null
-		kill -s "${stopsig:-TERM}" ${cgroup_pids} 2> /dev/null
-		cgroup_get_pids
-		while [ -n "$(cgroup_pids)" ] &&
+			kill -s HUP ${pids} 2> /dev/null
+		kill -s "${stopsig:-TERM}" ${pids} 2> /dev/null
+		while [ -n "$(cgroup_get_pids)" ] &&
 			[ "${loops}" -lt "${rc_timeout_stopsec:-90}" ]; do
 			loops=$((loops+1))
 			sleep 1
-			cgroup_get_pids
 		done
-		if [ -n "${cgroup_pids}" ] && yesno "${rc_send_sigkill:-yes}"; then
-			kill -s KILL ${cgroup_pids} 2> /dev/null
-		fi
+		pids="$(cgroup_get_pids)"
+		[ -n "${pids}" ] && yesno "${rc_send_sigkill:-yes}" &&
+			kill -s KILL ${pids} 2> /dev/null
 	fi
 	cgroup2_remove
-	cgroup_get_pids
-	[ -z "${cgroup_pids}" ]
+	[ -z "$(cgroup_get_pids)" ]
 	eend $? "Unable to stop all processes"
 	return 0
 }

sh/rc-functions.sh.in

@@ -2,6 +2,42 @@
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
+has_addon()
+{
+	[ -e /@LIB@/rc/addons/"$1".sh -o -e /@LIB@/rcscripts/addons/"$1".sh ]
+}
+
+_addon_warn()
+{
+	eindent
+	ewarn "$RC_SVCNAME uses addon code which is deprecated"
+	ewarn "and may not be available in the future."
+	eoutdent
+}
+
+import_addon()
+{
+	if [ -e /@LIB@/rc/addons/"$1".sh ]; then
+		_addon_warn
+		. /@LIB@/rc/addons/"$1".sh
+	elif [ -e /@LIB@/rcscripts/addons/"$1".sh ]; then
+		_addon_warn
+		. /@LIB@/rcscripts/addons/"$1".sh
+	else
+		return 1
+	fi
+}
+
+start_addon()
+{
+	( import_addon "$1-start" )
+}
+
+stop_addon()
+{
+	( import_addon "$1-stop" )
+}
+
 net_fs_list="afs ceph cifs coda davfs fuse fuse.sshfs gfs glusterfs lustre
 ncpfs nfs nfs4 ocfs2 shfs smbfs"
 is_net_fs()

sh/runtests.sh

@@ -15,6 +15,7 @@
 ret=0
 
 tret=0
+ebegin "Testing yesno()"
 for f in yes YES Yes true TRUE True 1 ; do
 	if ! yesno $f; then
 		: $(( tret += 1 ))
@@ -27,7 +28,7 @@ for f in no NO No false FALSE False 0 ; do
 		echo "!$f!"
 	fi
 done
+eend $tret
 : $(( ret += $tret ))
 
-eend $ret
 exit $ret

sh/s6.sh

@@ -57,7 +57,7 @@ s6_stop()
 	ebegin "Stopping ${name:-$RC_SVCNAME}"
 	s6-svc -d -wD -T ${s6_service_timeout_stop:-60000} "${s6_service_link}"
 	set -- $(s6-svstat "${s6_service_link}")
-	[ "$1" = "up" ] &&
+	[ "$1" = "up" ] && 
 		yesno "${s6_force_kill:-yes}" &&
 			_s6_force_kill "$@"
 	set -- $(s6-svstat "${s6_service_link}")

sh/start-stop-daemon.sh

@@ -38,10 +38,6 @@ ssd_start()
 		service_inactive && _inactive=true
 		mark_service_inactive
 	fi
-	[ -n "$output_logger" ] &&
-		output_logger_arg="--stdout-logger \"$output_logger\""
-	[ -n "$error_logger" ] &&
-		error_logger_arg="--stderr-logger \"$error_logger\""
 	#the eval call is necessary for cases like:
 	# command_args="this \"is a\" test"
 	# to work properly.
@@ -51,8 +47,6 @@ ssd_start()
 		${directory:+--chdir} $directory \
 		${output_log+--stdout} $output_log \
 		${error_log+--stderr} $error_log \
-		${output_logger_arg} \
-		${error_logger_arg} \
 		${procname:+--name} $procname \
 		${pidfile:+--pidfile} $pidfile \
 		${command_user+--user} $command_user \

sh/supervise-daemon.sh

@@ -10,8 +10,6 @@
 # This file may not be copied, modified, propagated, or distributed
 #    except according to the terms contained in the LICENSE file.
 
-extra_commands="healthcheck unhealthy ${extra_commands}"
-
 supervise_start()
 {
 	if [ -z "$command" ]; then
@@ -34,11 +32,9 @@ supervise_start()
 		${respawn_delay:+--respawn-delay} $respawn_delay \
 		${respawn_max:+--respawn-max} $respawn_max \
 		${respawn_period:+--respawn-period} $respawn_period \
-		${healthcheck_delay:+--healthcheck-delay} $healthcheck_delay \
-		${healthcheck_timer:+--healthcheck-timer} $healthcheck_timer \
 		${command_user+--user} $command_user \
 		${umask+--umask} $umask \
-		${supervise_daemon_args:-${start_stop_daemon_args}} \
+		$supervise_daemon_args \
 		$command \
 		-- $command_args $command_args_foreground
 	rc=$?
@@ -55,9 +51,11 @@ supervise_stop()
 	local startpidfile="$(service_get_value "pidfile")"
 	chroot="${startchroot:-$chroot}"
 	pidfile="${startpidfile:-$pidfile}"
+	[ -n "$pidfile" ] || return 0
 	ebegin "Stopping ${name:-$RC_SVCNAME}"
 	supervise-daemon "${RC_SVCNAME}" --stop \
-		${pidfile:+--pidfile} $chroot$pidfile
+		${pidfile:+--pidfile} $chroot$pidfile \
+		${stopsig:+--signal} $stopsig
 
 	eend $? "Failed to stop ${name:-$RC_SVCNAME}"
 }
@@ -100,13 +98,3 @@ supervise_status()
 		return 3
 	fi
 }
-
-healthcheck()
-{
-	return 0
-}
-
-unhealthy()
-{
-	return 0
-}

src/Makefile

@@ -1,7 +1,7 @@
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
-SUBDIR=		libeinfo librc rc
+SUBDIR=		test libeinfo librc rc
 
 MK=		../mk
 include		${MK}/subdir.mk

src/includes/hidden-visibility.h

@@ -0,0 +1,26 @@
+/*
+ * Written by Mike Frysinger
+ * Placed in the Public Domain
+ */
+
+#ifndef _HIDDEN_VISIBILITY_H_
+#define _HIDDEN_VISIBILITY_H_
+
+#if defined(__ELF__) && defined(__GNUC__)
+# define __hidden_asmname(name) __hidden_asmname1 (__USER_LABEL_PREFIX__, name)
+# define __hidden_asmname1(prefix, name) __hidden_asmname2(prefix, name)
+# define __hidden_asmname2(prefix, name) #prefix name
+# define __hidden_proto(name, internal) \
+	extern __typeof (name) name __asm__ (__hidden_asmname (#internal)) \
+	__attribute__ ((visibility ("hidden")));
+# define __hidden_ver(local, internal, name) \
+   extern __typeof (name) __EI_##name __asm__(__hidden_asmname (#internal)); \
+   extern __typeof (name) __EI_##name __attribute__((alias (__hidden_asmname1 (,#local))))
+# define hidden_proto(name) __hidden_proto(name, __RC_##name)
+# define hidden_def(name) __hidden_ver(__RC_##name, name, name);
+#else
+# define hidden_proto(name)
+# define hidden_def(name)
+#endif
+
+#endif

src/includes/rc-misc.h

@@ -66,6 +66,9 @@ int parse_mode(mode_t *, char *);
 /* Handy function so we can wrap einfo around our deptree */
 RC_DEPTREE *_rc_deptree_load (int, int *);
 
+/* Test to see if we can see pid 1 or not */
+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);

src/libeinfo/libeinfo.c

@@ -15,7 +15,7 @@
  *    except according to the terms contained in the LICENSE file.
  */
 
-static const char libeinfo_copyright[] = "Copyright (c) 2007-2008 Roy Marples";
+const char libeinfo_copyright[] = "Copyright (c) 2007-2008 Roy Marples";
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
@@ -39,6 +39,34 @@ static const char libeinfo_copyright[] = "Copyright (c) 2007-2008 Roy Marples";
 
 #include "einfo.h"
 #include "helpers.h"
+#include "hidden-visibility.h"
+
+hidden_proto(ecolor)
+hidden_proto(ebegin)
+hidden_proto(ebeginv)
+hidden_proto(ebracket)
+hidden_proto(eend)
+hidden_proto(eendv)
+hidden_proto(eerror)
+hidden_proto(eerrorn)
+hidden_proto(eerrorx)
+hidden_proto(eindent)
+hidden_proto(eindentv)
+hidden_proto(einfo)
+hidden_proto(einfon)
+hidden_proto(einfov)
+hidden_proto(einfovn)
+hidden_proto(elog)
+hidden_proto(eoutdent)
+hidden_proto(eoutdentv)
+hidden_proto(eprefix)
+hidden_proto(ewarn)
+hidden_proto(ewarnn)
+hidden_proto(ewarnv)
+hidden_proto(ewarnvn)
+hidden_proto(ewarnx)
+hidden_proto(ewend)
+hidden_proto(ewendv)
 
 /* Incase we cannot work out how many columns from ioctl, supply a default */
 #define DEFAULT_COLS		 80
@@ -482,6 +510,7 @@ eprefix(const char *EINFO_RESTRICT prefix)
 {
 	_eprefix = prefix;
 }
+hidden_def(eprefix)
 
 static void EINFO_PRINTF(2, 0)
 elogv(int level, const char *EINFO_RESTRICT fmt, va_list ap)
@@ -508,6 +537,7 @@ elog(int level, const char *EINFO_RESTRICT fmt, ...)
 	elogv(level, fmt, ap);
 	va_end(ap);
 }
+hidden_def(elog)
 
 static int
 _eindent(FILE * EINFO_RESTRICT stream)
@@ -546,6 +576,7 @@ _ecolor(FILE * EINFO_RESTRICT f, ECOLOR color)
 			return ecolors_str[i];
 	return "";
 }
+hidden_def(ecolor)
 
 const char *
 ecolor(ECOLOR color)
@@ -612,6 +643,7 @@ einfon(const char *EINFO_RESTRICT fmt, ...)
 	LASTCMD("einfon");
 	return retval;
 }
+hidden_def(einfon)
 
 int
 ewarnn(const char *EINFO_RESTRICT fmt, ...)
@@ -627,6 +659,7 @@ ewarnn(const char *EINFO_RESTRICT fmt, ...)
 	LASTCMD("ewarnn");
 	return retval;
 }
+hidden_def(ewarnn)
 
 int
 eerrorn(const char *EINFO_RESTRICT fmt, ...)
@@ -642,6 +675,7 @@ eerrorn(const char *EINFO_RESTRICT fmt, ...)
 	LASTCMD("errorn");
 	return retval;
 }
+hidden_def(eerrorn)
 
 int
 einfo(const char *EINFO_RESTRICT fmt, ...)
@@ -658,6 +692,7 @@ einfo(const char *EINFO_RESTRICT fmt, ...)
 	LASTCMD("einfo");
 	return retval;
 }
+hidden_def(einfo)
 
 int
 ewarn(const char *EINFO_RESTRICT fmt, ...)
@@ -675,6 +710,7 @@ ewarn(const char *EINFO_RESTRICT fmt, ...)
 	LASTCMD("ewarn");
 	return retval;
 }
+hidden_def(ewarn)
 
 void
 ewarnx(const char *EINFO_RESTRICT fmt, ...)
@@ -691,6 +727,7 @@ ewarnx(const char *EINFO_RESTRICT fmt, ...)
 	}
 	exit(EXIT_FAILURE);
 }
+hidden_def(ewarnx)
 
 int
 eerror(const char *EINFO_RESTRICT fmt, ...)
@@ -708,6 +745,7 @@ eerror(const char *EINFO_RESTRICT fmt, ...)
 	LASTCMD("eerror");
 	return retval;
 }
+hidden_def(eerror)
 
 void
 eerrorx(const char *EINFO_RESTRICT fmt, ...)
@@ -723,6 +761,7 @@ eerrorx(const char *EINFO_RESTRICT fmt, ...)
 	}
 	exit(EXIT_FAILURE);
 }
+hidden_def(eerrorx)
 
 int
 ebegin(const char *EINFO_RESTRICT fmt, ...)
@@ -741,6 +780,7 @@ ebegin(const char *EINFO_RESTRICT fmt, ...)
 	LASTCMD("ebegin");
 	return retval;
 }
+hidden_def(ebegin)
 
 static void
 _eend(FILE * EINFO_RESTRICT fp, int col, ECOLOR color, const char *msg)
@@ -814,6 +854,7 @@ eend(int retval, const char *EINFO_RESTRICT fmt, ...)
 	LASTCMD("eend");
 	return retval;
 }
+hidden_def(eend)
 
 int
 ewend(int retval, const char *EINFO_RESTRICT fmt, ...)
@@ -828,19 +869,21 @@ ewend(int retval, const char *EINFO_RESTRICT fmt, ...)
 	LASTCMD("ewend");
 	return retval;
 }
+hidden_def(ewend)
 
 void
 ebracket(int col, ECOLOR color, const char *msg)
 {
 	_eend(stdout, col, color, msg);
 }
+hidden_def(ebracket)
 
 void
 eindent(void)
 {
 	char *env = getenv("EINFO_INDENT");
 	int amount = 0;
-	char *num;
+	char num[10];
 
 	if (env) {
 		errno = 0;
@@ -851,16 +894,16 @@ eindent(void)
 	amount += INDENT_WIDTH;
 	if (amount > INDENT_MAX)
 		amount = INDENT_MAX;
-	xasprintf(&num, "%08d", amount);
+	snprintf(num, 10, "%08d", amount);
 	setenv("EINFO_INDENT", num, 1);
-	free(num);
 }
+hidden_def(eindent)
 
 void eoutdent(void)
 {
 	char *env = getenv("EINFO_INDENT");
 	int amount = 0;
-	char *num = NULL;
+	char num[10];
 	int serrno = errno;
 
 	if (!env)
@@ -874,12 +917,12 @@ void eoutdent(void)
 	if (amount <= 0)
 		unsetenv("EINFO_INDENT");
 	else {
-		xasprintf(&num, "%08d", amount);
+		snprintf(num, 10, "%08d", amount);
 		setenv("EINFO_INDENT", num, 1);
-		free(num);
 	}
 	errno = serrno;
 }
+hidden_def(eoutdent)
 
 int
 einfovn(const char *EINFO_RESTRICT fmt, ...)
@@ -895,6 +938,7 @@ einfovn(const char *EINFO_RESTRICT fmt, ...)
 	LASTCMD("einfovn");
 	return retval;
 }
+hidden_def(einfovn)
 
 int
 ewarnvn(const char *EINFO_RESTRICT fmt, ...)
@@ -910,6 +954,7 @@ ewarnvn(const char *EINFO_RESTRICT fmt, ...)
 	LASTCMD("ewarnvn");
 	return retval;
 }
+hidden_def(ewarnvn)
 
 int
 einfov(const char *EINFO_RESTRICT fmt, ...)
@@ -926,6 +971,7 @@ einfov(const char *EINFO_RESTRICT fmt, ...)
 	LASTCMD("einfov");
 	return retval;
 }
+hidden_def(einfov)
 
 int
 ewarnv(const char *EINFO_RESTRICT fmt, ...)
@@ -942,6 +988,7 @@ ewarnv(const char *EINFO_RESTRICT fmt, ...)
 	LASTCMD("ewarnv");
 	return retval;
 }
+hidden_def(ewarnv)
 
 int
 ebeginv(const char *EINFO_RESTRICT fmt, ...)
@@ -961,6 +1008,7 @@ ebeginv(const char *EINFO_RESTRICT fmt, ...)
 	LASTCMD("ebeginv");
 	return retval;
 }
+hidden_def(ebeginv)
 
 int
 eendv(int retval, const char *EINFO_RESTRICT fmt, ...)
@@ -975,6 +1023,7 @@ eendv(int retval, const char *EINFO_RESTRICT fmt, ...)
 	LASTCMD("eendv");
 	return retval;
 }
+hidden_def(eendv)
 
 int
 ewendv(int retval, const char *EINFO_RESTRICT fmt, ...)
@@ -989,6 +1038,7 @@ ewendv(int retval, const char *EINFO_RESTRICT fmt, ...)
 	LASTCMD("ewendv");
 	return retval;
 }
+hidden_def(ewendv)
 
 void
 eindentv(void)
@@ -996,6 +1046,7 @@ eindentv(void)
 	if (is_verbose())
 		eindent();
 }
+hidden_def(eindentv)
 
 void
 eoutdentv(void)
@@ -1003,3 +1054,4 @@ eoutdentv(void)
 	if (is_verbose())
 		eoutdent();
 }
+hidden_def(eoutdentv)

src/librc/librc-daemon.c

@@ -23,13 +23,13 @@
 static bool
 pid_is_exec(pid_t pid, const char *exec)
 {
-	char *buffer = NULL;
+	char buffer[32];
 	FILE *fp;
 	int c;
 	bool retval = false;
 
 	exec = basename_c(exec);
-	xasprintf(&buffer, "/proc/%d/stat", pid);
+	snprintf(buffer, sizeof(buffer), "/proc/%d/stat", pid);
 	if ((fp = fopen(buffer, "r"))) {
 		while ((c = getc(fp)) != EOF && c != '(')
 			;
@@ -41,27 +41,23 @@ pid_is_exec(pid_t pid, const char *exec)
 		}
 		fclose(fp);
 	}
-	free(buffer);
 	return retval;
 }
 
 static bool
 pid_is_argv(pid_t pid, const char *const *argv)
 {
-	char *cmdline = NULL;
+	char cmdline[32];
 	int fd;
 	char buffer[PATH_MAX];
 	char *p;
 	ssize_t bytes;
 
-	xasprintf(&cmdline, "/proc/%u/cmdline", pid);
-	if ((fd = open(cmdline, O_RDONLY)) < 0) {
-		free(cmdline);
+	snprintf(cmdline, sizeof(cmdline), "/proc/%u/cmdline", pid);
+	if ((fd = open(cmdline, O_RDONLY)) < 0)
 		return false;
-	}
-	bytes = read(fd, buffer, sizeof(buffer) - 1);
+	bytes = read(fd, buffer, sizeof(buffer));
 	close(fd);
-	free(cmdline);
 	if (bytes == -1)
 		return false;
 
@@ -92,7 +88,7 @@ rc_find_pids(const char *exec, const char *const *argv, uid_t uid, pid_t pid)
 	char proc_ns[30];
 	size_t len = 0;
 	pid_t p;
-	char *buffer = NULL;
+	char buffer[PATH_MAX];
 	struct stat sb;
 	pid_t openrc_pid = 0;
 	char *pp;
@@ -141,7 +137,7 @@ rc_find_pids(const char *exec, const char *const *argv, uid_t uid, pid_t pid)
 	memset(my_ns, 0, sizeof(my_ns));
 	memset(proc_ns, 0, sizeof(proc_ns));
 	if (exists("/proc/self/ns/pid")) {
-		rc = readlink("/proc/self/ns/pid", my_ns, sizeof(my_ns)-1);
+		rc = readlink("/proc/self/ns/pid", my_ns, sizeof(my_ns));
 		if (rc <= 0)
 			my_ns[0] = '\0';
 	}
@@ -153,22 +149,18 @@ rc_find_pids(const char *exec, const char *const *argv, uid_t uid, pid_t pid)
 			continue;
 		if (pid != 0 && pid != p)
 			continue;
-		xasprintf(&buffer, "/proc/%d/ns/pid", p);
+		snprintf(buffer, sizeof(buffer), "/proc/%d/ns/pid", p);
 		if (exists(buffer)) {
-			rc = readlink(buffer, proc_ns, sizeof(proc_ns)-1);
+			rc = readlink(buffer, proc_ns, sizeof(proc_ns));
 			if (rc <= 0)
 				proc_ns[0] = '\0';
 		}
-		free(buffer);
-		if (pid == 0 && strlen(my_ns) && strlen (proc_ns) && strcmp(my_ns, proc_ns))
+		if (strlen(my_ns) && strlen (proc_ns) && strcmp(my_ns, proc_ns))
 			continue;
 		if (uid) {
-			xasprintf(&buffer, "/proc/%d", p);
-			if (stat(buffer, &sb) != 0 || sb.st_uid != uid) {
-				free(buffer);
+			snprintf(buffer, sizeof(buffer), "/proc/%d", p);
+			if (stat(buffer, &sb) != 0 || sb.st_uid != uid)
 				continue;
-			}
-			free(buffer);
 		}
 		if (exec && !pid_is_exec(p, exec))
 			continue;
@@ -177,10 +169,9 @@ rc_find_pids(const char *exec, const char *const *argv, uid_t uid, pid_t pid)
 			continue;
 		/* If this is an OpenVZ host, filter out container processes */
 		if (openvz_host) {
-			xasprintf(&buffer, "/proc/%d/status", p);
+			snprintf(buffer, sizeof(buffer), "/proc/%d/status", p);
 			if (exists(buffer)) {
 				fp = fopen(buffer, "r");
-				free(buffer);
 				if (! fp)
 					continue;
 				while (! feof(fp)) {
@@ -208,6 +199,7 @@ rc_find_pids(const char *exec, const char *const *argv, uid_t uid, pid_t pid)
 	closedir(procdir);
 	return pids;
 }
+librc_hidden_def(rc_find_pids)
 
 #elif BSD
 
@@ -312,6 +304,7 @@ rc_find_pids(const char *exec, const char *const *argv, uid_t uid, pid_t pid)
 
 	return pids;
 }
+librc_hidden_def(rc_find_pids)
 
 #else
 #  error "Platform not supported!"
@@ -322,13 +315,12 @@ _match_daemon(const char *path, const char *file, RC_STRINGLIST *match)
 {
 	char *line = NULL;
 	size_t len = 0;
-	char *ffile = NULL;
+	char ffile[PATH_MAX];
 	FILE *fp;
 	RC_STRING *m;
 
-	xasprintf(&ffile, "%s/%s", path, file);
+	snprintf(ffile, sizeof(ffile), "%s/%s", path, file);
 	fp = fopen(ffile, "r");
-	free(ffile);
 
 	if (!fp)
 		return false;
@@ -354,22 +346,29 @@ _match_list(const char *exec, const char *const *argv, const char *pidfile)
 {
 	RC_STRINGLIST *match = rc_stringlist_new();
 	int i = 0;
+	size_t l;
 	char *m;
 
 	if (exec) {
-		xasprintf(&m, "exec=%s", exec);
+		l = strlen(exec) + 6;
+		m = xmalloc(sizeof(char) * l);
+		snprintf(m, l, "exec=%s", exec);
 		rc_stringlist_add(match, m);
 		free(m);
 	}
 
 	while (argv && argv[i]) {
-		xasprintf(&m, "argv_0=%s", argv[i++]);
+		l = strlen(*argv) + strlen("argv_=") + 16;
+		m = xmalloc(sizeof(char) * l);
+		snprintf(m, l, "argv_0=%s", argv[i++]);
 		rc_stringlist_add(match, m);
 		free(m);
 	}
 
 	if (pidfile) {
-		xasprintf(&m, "pidfile=%s", pidfile);
+		l = strlen(pidfile) + 9;
+		m = xmalloc(sizeof(char) * l);
+		snprintf(m, l, "pidfile=%s", pidfile);
 		rc_stringlist_add(match, m);
 		free(m);
 	}
@@ -382,8 +381,8 @@ rc_service_daemon_set(const char *service, const char *exec,
     const char *const *argv,
     const char *pidfile, bool started)
 {
-	char *dirpath = NULL;
-	char *file = NULL;
+	char dirpath[PATH_MAX];
+	char file[PATH_MAX];
 	int nfiles = 0;
 	char oldfile[PATH_MAX] = { '\0' };
 	bool retval = false;
@@ -398,7 +397,8 @@ rc_service_daemon_set(const char *service, const char *exec,
 		return false;
 	}
 
-	xasprintf(&dirpath, RC_SVCDIR "/daemons/%s", basename_c(service));
+	snprintf(dirpath, sizeof(dirpath), RC_SVCDIR "/daemons/%s",
+	    basename_c(service));
 
 	/* Regardless, erase any existing daemon info */
 	if ((dp = opendir(dirpath))) {
@@ -407,7 +407,8 @@ rc_service_daemon_set(const char *service, const char *exec,
 			if (d->d_name[0] == '.')
 				continue;
 
-			xasprintf(&file, "%s/%s", dirpath, d->d_name);
+			snprintf(file, sizeof(file), "%s/%s",
+			    dirpath, d->d_name);
 			nfiles++;
 
 			if (!*oldfile) {
@@ -420,7 +421,6 @@ rc_service_daemon_set(const char *service, const char *exec,
 				rename(file, oldfile);
 				strlcpy(oldfile, file, sizeof(oldfile));
 			}
-			free(file);
 		}
 		closedir(dp);
 		rc_stringlist_free(match);
@@ -429,7 +429,8 @@ rc_service_daemon_set(const char *service, const char *exec,
 	/* Now store our daemon info */
 	if (started) {
 		if (mkdir(dirpath, 0755) == 0 || errno == EEXIST) {
-			xasprintf(&file, "%s/%03d", dirpath, nfiles + 1);
+			snprintf(file, sizeof(file), "%s/%03d",
+			    dirpath, nfiles + 1);
 			if ((fp = fopen(file, "w"))) {
 				fprintf(fp, "exec=");
 				if (exec)
@@ -445,21 +446,20 @@ rc_service_daemon_set(const char *service, const char *exec,
 				fclose(fp);
 				retval = true;
 			}
-			free(file);
 		}
 	} else
 		retval = true;
 
-	free(dirpath);
 	return retval;
 }
+librc_hidden_def(rc_service_daemon_set)
 
 bool
 rc_service_started_daemon(const char *service,
     const char *exec, const char *const *argv, int indx)
 {
-	char *dirpath = NULL;
-	char *file = NULL;
+	char dirpath[PATH_MAX];
+	char file[16];
 	RC_STRINGLIST *match;
 	bool retval = false;
 	DIR *dp;
@@ -468,13 +468,13 @@ rc_service_started_daemon(const char *service,
 	if (!service || !exec)
 		return false;
 
-	xasprintf(&dirpath, RC_SVCDIR "/daemons/%s", basename_c(service));
+	snprintf(dirpath, sizeof(dirpath), RC_SVCDIR "/daemons/%s",
+	    basename_c(service));
 	match = _match_list(exec, argv, NULL);
 
 	if (indx > 0) {
-		xasprintf(&file, "%03d", indx);
+		snprintf(file, sizeof(file), "%03d", indx);
 		retval = _match_daemon(dirpath, file, match);
-		free(file);
 	} else {
 		if ((dp = opendir(dirpath))) {
 			while ((d = readdir(dp))) {
@@ -489,9 +489,9 @@ rc_service_started_daemon(const char *service,
 	}
 
 	rc_stringlist_free(match);
-	free(dirpath);
 	return retval;
 }
+librc_hidden_def(rc_service_started_daemon)
 
 bool
 rc_service_daemons_crashed(const char *service)
@@ -611,7 +611,7 @@ rc_service_daemons_crashed(const char *service)
 				i = 0;
 				TAILQ_FOREACH(s, list, entries)
 				    argv[i++] = s->value;
-				argv[i] = NULL;
+				argv[i] = '\0';
 			}
 		}
 
@@ -649,3 +649,4 @@ rc_service_daemons_crashed(const char *service)
 
 	return retval;
 }
+librc_hidden_def(rc_service_daemons_crashed)

src/librc/librc-depend.c

@@ -78,16 +78,16 @@ rc_deptree_free(RC_DEPTREE *deptree)
 	}
 	free(deptree);
 }
+librc_hidden_def(rc_deptree_free)
 
 static RC_DEPINFO *
 get_depinfo(const RC_DEPTREE *deptree, const char *service)
 {
 	RC_DEPINFO *di;
-	if (deptree) {
-		TAILQ_FOREACH(di, deptree, entries)
-			if (strcmp(di->service, service) == 0)
-				return di;
-	}
+
+	TAILQ_FOREACH(di, deptree, entries)
+		if (strcmp(di->service, service) == 0)
+			return di;
 	return NULL;
 }
 
@@ -96,11 +96,9 @@ get_deptype(const RC_DEPINFO *depinfo, const char *type)
 {
 	RC_DEPTYPE *dt;
 
-	if (depinfo) {
-		TAILQ_FOREACH(dt, &depinfo->depends, entries)
-			if (strcmp(dt->type, type) == 0)
-				return dt;
-	}
+	TAILQ_FOREACH(dt, &depinfo->depends, entries)
+		if (strcmp(dt->type, type) == 0)
+			return dt;
 	return NULL;
 }
 
@@ -108,6 +106,7 @@ RC_DEPTREE *
 rc_deptree_load(void) {
 	return rc_deptree_load_file(RC_DEPTREE_CACHE);
 }
+librc_hidden_def(rc_deptree_load)
 
 RC_DEPTREE *
 rc_deptree_load_file(const char *deptree_file)
@@ -171,6 +170,7 @@ rc_deptree_load_file(const char *deptree_file)
 
 	return deptree;
 }
+librc_hidden_def(rc_deptree_load_file)
 
 static bool
 valid_service(const char *runlevel, const char *service, const char *type)
@@ -456,6 +456,7 @@ rc_deptree_depend(const RC_DEPTREE *deptree,
 		rc_stringlist_add(svcs, svc->value);
 	return svcs;
 }
+librc_hidden_def(rc_deptree_depend)
 
 RC_STRINGLIST *
 rc_deptree_depends(const RC_DEPTREE *deptree,
@@ -483,6 +484,7 @@ rc_deptree_depends(const RC_DEPTREE *deptree,
 	rc_stringlist_free(visited);
 	return sorted;
 }
+librc_hidden_def(rc_deptree_depends)
 
 RC_STRINGLIST *
 rc_deptree_order(const RC_DEPTREE *deptree, const char *runlevel, int options)
@@ -538,6 +540,7 @@ rc_deptree_order(const RC_DEPTREE *deptree, const char *runlevel, int options)
 	rc_stringlist_free(types);
 	return services;
 }
+librc_hidden_def(rc_deptree_order)
 
 
 /* Given a time, recurse the target path to find out if there are
@@ -613,11 +616,11 @@ mtime_check(const char *source, const char *target, bool newer,
 		return false;
 	mtime = buf.st_mtime;
 
-	retval = deep_mtime_check(target,newer,&mtime,file);
-	if (rel) {
-		*rel = mtime;
-	}
-	return retval;
+    retval = deep_mtime_check(target,newer,&mtime,file);
+    if (rel) {
+        *rel = mtime;
+    }
+    return retval;
 }
 
 bool
@@ -627,6 +630,7 @@ rc_newer_than(const char *source, const char *target,
 
 	return mtime_check(source, target, true, newest, file);
 }
+librc_hidden_def(rc_newer_than)
 
 bool
 rc_older_than(const char *source, const char *target,
@@ -634,6 +638,7 @@ rc_older_than(const char *source, const char *target,
 {
 	return mtime_check(source, target, false, oldest, file);
 }
+librc_hidden_def(rc_older_than)
 
 typedef struct deppair
 {
@@ -729,6 +734,7 @@ rc_deptree_update_needed(time_t *newest, char *file)
 
 	return newer;
 }
+librc_hidden_def(rc_deptree_update_needed)
 
 /* This is a 7 phase operation
    Phase 1 is a shell script which loads each init script and config in turn
@@ -1075,3 +1081,4 @@ rc_deptree_update(void)
 	rc_deptree_free(deptree);
 	return retval;
 }
+librc_hidden_def(rc_deptree_update)

src/librc/librc-misc.c

@@ -43,6 +43,7 @@ rc_yesno(const char *value)
 
 	return false;
 }
+librc_hidden_def(rc_yesno)
 
 
 /**
@@ -90,6 +91,7 @@ rc_getfile(const char *file, char **buffer, size_t *len)
 	fclose(fp);
 	return ret;
 }
+librc_hidden_def(rc_getfile)
 
 ssize_t
 rc_getline(char **line, size_t *len, FILE *fp)
@@ -114,6 +116,7 @@ rc_getline(char **line, size_t *len, FILE *fp)
 	}
 	return last;
 }
+librc_hidden_def(rc_getline)
 
 char *
 rc_proc_getent(const char *ent _unused)
@@ -160,6 +163,7 @@ rc_proc_getent(const char *ent _unused)
 	return NULL;
 #endif
 }
+librc_hidden_def(rc_proc_getent)
 
 RC_STRINGLIST *
 rc_config_list(const char *file)
@@ -198,6 +202,7 @@ rc_config_list(const char *file)
 
 	return list;
 }
+librc_hidden_def(rc_config_list)
 
 static void rc_config_set_value(RC_STRINGLIST *config, char *value)
 {
@@ -232,9 +237,13 @@ static void rc_config_set_value(RC_STRINGLIST *config, char *value)
 		if (token[i] == '\n')
 			token[i] = 0;
 
-		xasprintf(&newline, "%s=%s", entry, token);
+		i = strlen(entry) + strlen(token) + 2;
+		newline = xmalloc(sizeof(char) * i);
+		snprintf(newline, i, "%s=%s", entry, token);
 	} else {
-		xasprintf(&newline, "%s=", entry);
+		i = strlen(entry) + 2;
+		newline = xmalloc(sizeof(char) * i);
+		snprintf(newline, i, "%s=", entry);
 	}
 
 	replaced = false;
@@ -272,6 +281,7 @@ static RC_STRINGLIST *rc_config_kcl(RC_STRINGLIST *config)
 	char *tmp = NULL;
 	char *value = NULL;
 	size_t varlen = 0;
+	size_t len = 0;
 
 	overrides = rc_stringlist_new();
 
@@ -289,7 +299,9 @@ static RC_STRINGLIST *rc_config_kcl(RC_STRINGLIST *config)
 		}
 
 		if (value != NULL) {
-			xasprintf(&tmp, "%s=%s", override->value, value);
+			len = varlen + strlen(value) + 2;
+			tmp = xmalloc(sizeof(char) * len);
+			snprintf(tmp, len, "%s=%s", override->value, value);
 		}
 
 		/*
@@ -368,6 +380,7 @@ rc_config_load(const char *file)
 
 	return config;
 }
+librc_hidden_def(rc_config_load)
 
 char *
 rc_config_value(RC_STRINGLIST *list, const char *entry)
@@ -386,6 +399,7 @@ rc_config_value(RC_STRINGLIST *list, const char *entry)
 	}
 	return NULL;
 }
+librc_hidden_def(rc_config_value)
 
 /* Global for caching the strings loaded from rc.conf to avoid reparsing for
  * each rc_conf_value call */
@@ -416,7 +430,7 @@ rc_conf_value(const char *setting)
 		}
 
 		rc_conf = rc_config_directory(rc_conf);
-		rc_conf = rc_config_kcl(rc_conf);
+	rc_conf = rc_config_kcl(rc_conf);
 
 		/* Convert old uppercase to lowercase */
 		TAILQ_FOREACH(s, rc_conf, entries) {
@@ -431,3 +445,4 @@ rc_conf_value(const char *setting)
 
 	return rc_config_value(rc_conf, setting);
 }
+librc_hidden_def(rc_conf_value)

src/librc/librc-stringlist.c

@@ -25,6 +25,7 @@ rc_stringlist_new(void)
 	TAILQ_INIT(l);
 	return l;
 }
+librc_hidden_def(rc_stringlist_new)
 
 RC_STRING *
 rc_stringlist_add(RC_STRINGLIST *list, const char *value)
@@ -35,6 +36,7 @@ rc_stringlist_add(RC_STRINGLIST *list, const char *value)
 	TAILQ_INSERT_TAIL(list, s, entries);
 	return s;
 }
+librc_hidden_def(rc_stringlist_add)
 
 RC_STRING *
 rc_stringlist_addu(RC_STRINGLIST *list, const char *value)
@@ -49,6 +51,7 @@ rc_stringlist_addu(RC_STRINGLIST *list, const char *value)
 
 	return rc_stringlist_add(list, value);
 }
+librc_hidden_def(rc_stringlist_addu)
 
 bool
 rc_stringlist_delete(RC_STRINGLIST *list, const char *value)
@@ -66,6 +69,7 @@ rc_stringlist_delete(RC_STRINGLIST *list, const char *value)
 	errno = EEXIST;
 	return false;
 }
+librc_hidden_def(rc_stringlist_delete)
 
 RC_STRING *
 rc_stringlist_find(RC_STRINGLIST *list, const char *value)
@@ -79,6 +83,7 @@ rc_stringlist_find(RC_STRINGLIST *list, const char *value)
 	}
 	return NULL;
 }
+librc_hidden_def(rc_stringlist_find)
 
 RC_STRINGLIST *
 rc_stringlist_split(const char *value, const char *sep)
@@ -93,6 +98,7 @@ rc_stringlist_split(const char *value, const char *sep)
 
 	return list;
 }
+librc_hidden_def(rc_stringlist_split)
 
 void
 rc_stringlist_sort(RC_STRINGLIST **list)
@@ -122,6 +128,7 @@ rc_stringlist_sort(RC_STRINGLIST **list)
 	free(l);
 	*list = new;
 }
+librc_hidden_def(rc_stringlist_sort)
 
 void
 rc_stringlist_free(RC_STRINGLIST *list)
@@ -141,3 +148,4 @@ rc_stringlist_free(RC_STRINGLIST *list)
 	}
 	free(list);
 }
+librc_hidden_def(rc_stringlist_free)

src/librc/librc.c

@@ -15,7 +15,7 @@
  *    except according to the terms contained in the LICENSE file.
  */
 
-static const char librc_copyright[] = "Copyright (c) 2007-2008 Roy Marples";
+const char librc_copyright[] = "Copyright (c) 2007-2008 Roy Marples";
 
 #include "queue.h"
 #include "librc.h"
@@ -50,7 +50,6 @@ static const rc_service_state_name_t rc_service_state_names[] = {
 	{ RC_SERVICE_HOTPLUGGED,  "hotplugged" },
 	{ RC_SERVICE_FAILED,      "failed" },
 	{ RC_SERVICE_SCHEDULED,   "scheduled"},
-	{ RC_SERVICE_CRASHED,     "crashed"},
 	{ 0, NULL}
 };
 
@@ -351,6 +350,7 @@ rc_sys(void)
 
 	return sys;
 }
+librc_hidden_def(rc_sys)
 
 static const char *
 rc_parse_service_state(RC_SERVICE state)
@@ -425,17 +425,20 @@ rc_runlevel_starting(void)
 {
 	return exists(RC_STARTING);
 }
+librc_hidden_def(rc_runlevel_starting)
 
 bool
 rc_runlevel_stopping(void)
 {
 	return exists(RC_STOPPING);
 }
+librc_hidden_def(rc_runlevel_stopping)
 
 RC_STRINGLIST *rc_runlevel_list(void)
 {
 	return ls_dir(RC_RUNLEVELDIR, LS_DIR);
 }
+librc_hidden_def(rc_runlevel_list)
 
 char *
 rc_runlevel_get(void)
@@ -462,6 +465,7 @@ rc_runlevel_get(void)
 
 	return runlevel;
 }
+librc_hidden_def(rc_runlevel_get)
 
 bool
 rc_runlevel_set(const char *runlevel)
@@ -474,6 +478,7 @@ rc_runlevel_set(const char *runlevel)
 	fclose(fp);
 	return true;
 }
+librc_hidden_def(rc_runlevel_set)
 
 bool
 rc_runlevel_exists(const char *runlevel)
@@ -488,6 +493,7 @@ rc_runlevel_exists(const char *runlevel)
 		return true;
 	return false;
 }
+librc_hidden_def(rc_runlevel_exists)
 
 bool
 rc_runlevel_stack(const char *dst, const char *src)
@@ -500,6 +506,7 @@ rc_runlevel_stack(const char *dst, const char *src)
 	snprintf(d, sizeof(s), "%s/%s/%s", RC_RUNLEVELDIR, dst, src);
 	return (symlink(s, d) == 0 ? true : false);
 }
+librc_hidden_def(rc_runlevel_stack)
 
 bool
 rc_runlevel_unstack(const char *dst, const char *src)
@@ -509,6 +516,7 @@ rc_runlevel_unstack(const char *dst, const char *src)
 	snprintf(path, sizeof(path), "%s/%s/%s", RC_RUNLEVELDIR, dst, src);
 	return (unlink(path) == 0 ? true : false);
 }
+librc_hidden_def(rc_runlevel_unstack)
 
 RC_STRINGLIST *
 rc_runlevel_stacks(const char *runlevel)
@@ -521,6 +529,7 @@ rc_runlevel_stacks(const char *runlevel)
 	rc_stringlist_free(ancestor_list);
 	return stack;
 }
+librc_hidden_def(rc_runlevel_stacks)
 
 /* Resolve a service name to its full path */
 char *
@@ -548,7 +557,7 @@ rc_service_resolve(const char *service)
 
 	if (*file) {
 		memset(buffer, 0, sizeof(buffer));
-		r = readlink(file, buffer, sizeof(buffer)-1);
+		r = readlink(file, buffer, sizeof(buffer));
 		if (r > 0)
 			return xstrdup(buffer);
 	}
@@ -574,6 +583,7 @@ rc_service_resolve(const char *service)
 
 	return NULL;
 }
+librc_hidden_def(rc_service_resolve)
 
 bool
 rc_service_exists(const char *service)
@@ -612,6 +622,7 @@ rc_service_exists(const char *service)
 	free(file);
 	return retval;
 }
+librc_hidden_def(rc_service_exists)
 
 #define OPTSTR \
 ". '%s'; echo $extra_commands $extra_started_commands $extra_stopped_commands"
@@ -653,6 +664,7 @@ rc_service_extra_commands(const char *service)
 	free(cmd);
 	return commands;
 }
+librc_hidden_def(rc_service_extra_commands)
 
 #define DESCSTR ". '%s'; echo \"${description%s%s}\""
 char *
@@ -682,6 +694,7 @@ rc_service_description(const char *service, const char *option)
 	free(cmd);
 	return desc;
 }
+librc_hidden_def(rc_service_description)
 
 bool
 rc_service_in_runlevel(const char *service, const char *runlevel)
@@ -692,6 +705,7 @@ rc_service_in_runlevel(const char *service, const char *runlevel)
 	    runlevel, basename_c(service));
 	return exists(file);
 }
+librc_hidden_def(rc_service_in_runlevel)
 
 bool
 rc_service_mark(const char *service, const RC_SERVICE state)
@@ -811,6 +825,7 @@ rc_service_mark(const char *service, const RC_SERVICE state)
 	free(init);
 	return true;
 }
+librc_hidden_def(rc_service_mark)
 
 RC_SERVICE
 rc_service_state(const char *service)
@@ -833,10 +848,6 @@ rc_service_state(const char *service)
 		}
 	}
 
-	if (state & RC_SERVICE_STARTED) {
-		if (rc_service_daemons_crashed(service) && errno != EACCES)
-			state |= RC_SERVICE_CRASHED;
-	}
 	if (state & RC_SERVICE_STOPPED) {
 		dirs = ls_dir(RC_SVCDIR "/scheduled", 0);
 		TAILQ_FOREACH(dir, dirs, entries) {
@@ -853,6 +864,7 @@ rc_service_state(const char *service)
 
 	return state;
 }
+librc_hidden_def(rc_service_state)
 
 char *
 rc_service_value_get(const char *service, const char *option)
@@ -867,6 +879,7 @@ rc_service_value_get(const char *service, const char *option)
 
 	return buffer;
 }
+librc_hidden_def(rc_service_value_get)
 
 bool
 rc_service_value_set(const char *service, const char *option,
@@ -891,6 +904,7 @@ rc_service_value_set(const char *service, const char *option,
 	}
 		return true;
 }
+librc_hidden_def(rc_service_value_set)
 
 
 bool
@@ -917,6 +931,7 @@ rc_service_schedule_start(const char *service, const char *service_to_start)
 	free(init);
 	return retval;
 }
+librc_hidden_def(rc_service_schedule_start)
 
 bool
 rc_service_schedule_clear(const char *service)
@@ -929,6 +944,7 @@ rc_service_schedule_clear(const char *service)
 		return true;
 	return false;
 }
+librc_hidden_def(rc_service_schedule_clear)
 
 RC_STRINGLIST *
 rc_services_in_runlevel(const char *runlevel)
@@ -966,6 +982,7 @@ rc_services_in_runlevel(const char *runlevel)
 		list = rc_stringlist_new();
 	return list;
 }
+librc_hidden_def(rc_services_in_runlevel)
 
 RC_STRINGLIST *
 rc_services_in_runlevel_stacked(const char *runlevel)
@@ -982,6 +999,7 @@ rc_services_in_runlevel_stacked(const char *runlevel)
 	}
 	return list;
 }
+librc_hidden_def(rc_services_in_runlevel_stacked)
 
 RC_STRINGLIST *
 rc_services_in_state(RC_SERVICE state)
@@ -1015,6 +1033,7 @@ rc_services_in_state(RC_SERVICE state)
 	rc_stringlist_free(dirs);
 	return list;
 }
+librc_hidden_def(rc_services_in_state)
 
 bool
 rc_service_add(const char *runlevel, const char *service)
@@ -1023,6 +1042,7 @@ rc_service_add(const char *runlevel, const char *service)
 	char *init;
 	char file[PATH_MAX];
 	char path[MAXPATHLEN] = { '\0' };
+	char *p = NULL;
 	char binit[PATH_MAX];
 	char *i;
 
@@ -1043,7 +1063,8 @@ rc_service_add(const char *runlevel, const char *service)
 	/* We need to ensure that only things in /etc/init.d are added
 	 * to the boot runlevel */
 	if (strcmp(runlevel, RC_LEVEL_BOOT) == 0) {
-		if (realpath(dirname(init), path) == NULL) {
+		p = realpath(dirname(init), path);
+		if (!*p) {
 			free(init);
 			return false;
 		}
@@ -1060,6 +1081,7 @@ rc_service_add(const char *runlevel, const char *service)
 	free(init);
 	return retval;
 }
+librc_hidden_def(rc_service_add)
 
 bool
 rc_service_delete(const char *runlevel, const char *service)
@@ -1072,6 +1094,7 @@ rc_service_delete(const char *runlevel, const char *service)
 		return true;
 	return false;
 }
+librc_hidden_def(rc_service_delete)
 
 RC_STRINGLIST *
 rc_services_scheduled_by(const char *service)
@@ -1090,6 +1113,7 @@ rc_services_scheduled_by(const char *service)
 	rc_stringlist_free(dirs);
 	return list;
 }
+librc_hidden_def(rc_services_scheduled_by)
 
 RC_STRINGLIST *
 rc_services_scheduled(const char *service)
@@ -1100,3 +1124,4 @@ rc_services_scheduled(const char *service)
 	    basename_c(service));
 	return ls_dir(dir, LS_INITD);
 }
+librc_hidden_def(rc_services_scheduled)

src/librc/librc.h

@@ -56,4 +56,67 @@
 #include "rc.h"
 #include "rc-misc.h"
 
+#include "hidden-visibility.h"
+#define librc_hidden_proto(x) hidden_proto(x)
+#define librc_hidden_def(x) hidden_def(x)
+
+librc_hidden_proto(rc_conf_value)
+librc_hidden_proto(rc_config_list)
+librc_hidden_proto(rc_config_load)
+librc_hidden_proto(rc_config_value)
+librc_hidden_proto(rc_deptree_depend)
+librc_hidden_proto(rc_deptree_depends)
+librc_hidden_proto(rc_deptree_free)
+librc_hidden_proto(rc_deptree_load)
+librc_hidden_proto(rc_deptree_load_file)
+librc_hidden_proto(rc_deptree_order)
+librc_hidden_proto(rc_deptree_update)
+librc_hidden_proto(rc_deptree_update_needed)
+librc_hidden_proto(rc_find_pids)
+librc_hidden_proto(rc_getfile)
+librc_hidden_proto(rc_getline)
+librc_hidden_proto(rc_newer_than)
+librc_hidden_proto(rc_proc_getent)
+librc_hidden_proto(rc_older_than)
+librc_hidden_proto(rc_runlevel_exists)
+librc_hidden_proto(rc_runlevel_get)
+librc_hidden_proto(rc_runlevel_list)
+librc_hidden_proto(rc_runlevel_set)
+librc_hidden_proto(rc_runlevel_stack)
+librc_hidden_proto(rc_runlevel_stacks)
+librc_hidden_proto(rc_runlevel_starting)
+librc_hidden_proto(rc_runlevel_stopping)
+librc_hidden_proto(rc_runlevel_unstack)
+librc_hidden_proto(rc_service_add)
+librc_hidden_proto(rc_service_daemons_crashed)
+librc_hidden_proto(rc_service_daemon_set)
+librc_hidden_proto(rc_service_delete)
+librc_hidden_proto(rc_service_description)
+librc_hidden_proto(rc_service_exists)
+librc_hidden_proto(rc_service_extra_commands)
+librc_hidden_proto(rc_service_in_runlevel)
+librc_hidden_proto(rc_service_mark)
+librc_hidden_proto(rc_service_resolve)
+librc_hidden_proto(rc_service_schedule_clear)
+librc_hidden_proto(rc_service_schedule_start)
+librc_hidden_proto(rc_services_in_runlevel)
+librc_hidden_proto(rc_services_in_runlevel_stacked)
+librc_hidden_proto(rc_services_in_state)
+librc_hidden_proto(rc_services_scheduled)
+librc_hidden_proto(rc_services_scheduled_by)
+librc_hidden_proto(rc_service_started_daemon)
+librc_hidden_proto(rc_service_state)
+librc_hidden_proto(rc_service_value_get)
+librc_hidden_proto(rc_service_value_set)
+librc_hidden_proto(rc_stringlist_add)
+librc_hidden_proto(rc_stringlist_addu)
+librc_hidden_proto(rc_stringlist_delete)
+librc_hidden_proto(rc_stringlist_find)
+librc_hidden_proto(rc_stringlist_free)
+librc_hidden_proto(rc_stringlist_new)
+librc_hidden_proto(rc_stringlist_split)
+librc_hidden_proto(rc_stringlist_sort)
+librc_hidden_proto(rc_sys)
+librc_hidden_proto(rc_yesno)
+
 #endif

src/librc/rc.h.in

@@ -188,8 +188,7 @@ typedef enum
 	/* Optional states service could also be in */
 	RC_SERVICE_FAILED      = 0x0200,
 	RC_SERVICE_SCHEDULED   = 0x0400,
-	RC_SERVICE_WASINACTIVE = 0x0800,
-	RC_SERVICE_CRASHED     = 0x1000,
+	RC_SERVICE_WASINACTIVE = 0x0800
 } RC_SERVICE;
 
 /*! Add the service to the runlevel

src/rc/.gitignore

@@ -56,7 +56,6 @@ mark_service_inactive
 mark_service_wasinactive
 mark_service_hotplugged
 mark_service_failed
-mark_service_crashed
 rc-abort
 rc
 openrc

src/rc/Makefile

@@ -5,8 +5,8 @@ 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 \
-		rc-depend.c rc-logger.c rc-misc.c rc-pipes.c \
-		rc-plugin.c rc-service.c rc-status.c rc-update.c \
+		rc-depend.c rc-logger.c rc-misc.c rc-plugin.c \
+		rc-service.c rc-status.c rc-update.c \
 		shell_var.c start-stop-daemon.c supervise-daemon.c swclock.c _usage.c
 
 ifeq (${MKSELINUX},yes)
@@ -14,8 +14,7 @@ SRCS+=		rc-selinux.c
 endif
 
 ifeq (${OS},Linux)
-SRCS+=		kill_all.c openrc-init.c openrc-shutdown.c rc-sysvinit.c broadcast.c \
-			rc-wtmp.c
+SRCS+=		kill_all.c openrc-init.c openrc-shutdown.c rc-wtmp.c
 endif
 
 CLEANFILES=	version.h rc-selinux.o
@@ -42,7 +41,6 @@ RC_SBINPROGS=	mark_service_starting mark_service_started \
 		mark_service_stopping mark_service_stopped \
 		mark_service_inactive mark_service_wasinactive \
 		mark_service_hotplugged mark_service_failed \
-		mark_service_crashed \
 		rc-abort swclock
 
 ifeq (${OS},Linux)
@@ -113,7 +111,7 @@ 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-plugin.o rc-wtmp.o
+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
@@ -125,8 +123,7 @@ is_older_than: is_older_than.o rc-misc.o
 mark_service_starting mark_service_started \
 mark_service_stopping mark_service_stopped \
 mark_service_inactive mark_service_wasinactive \
-mark_service_hotplugged mark_service_failed \
-mark_service_crashed: do_mark_service.o rc-misc.o
+mark_service_hotplugged mark_service_failed: do_mark_service.o rc-misc.o
 	${CC} ${LOCAL_CFLAGS} ${LOCAL_LDFLAGS} ${CFLAGS} ${LDFLAGS} -o $@ $^ ${LDADD}
 
 mountinfo: mountinfo.o _usage.o rc-misc.o
@@ -135,7 +132,7 @@ 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 rc-misc.o _usage.o broadcast.o rc-wtmp.o rc-sysvinit.o
+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
@@ -159,10 +156,10 @@ rc-service: rc-service.o _usage.o rc-misc.o
 rc-update: rc-update.o _usage.o rc-misc.o
 	${CC} ${LOCAL_CFLAGS} ${LOCAL_LDFLAGS} ${CFLAGS} ${LDFLAGS} -o $@ $^ ${LDADD}
 
-start-stop-daemon: start-stop-daemon.o _usage.o rc-misc.o rc-pipes.o rc-schedules.o
+start-stop-daemon: start-stop-daemon.o _usage.o rc-misc.o rc-schedules.o
 	${CC} ${LOCAL_CFLAGS} ${LOCAL_LDFLAGS} ${CFLAGS} ${LDFLAGS} -o $@ $^ ${LDADD}
 
-supervise-daemon: supervise-daemon.o _usage.o rc-misc.o rc-plugin.o rc-schedules.o
+supervise-daemon: supervise-daemon.o _usage.o rc-misc.o rc-schedules.o
 	${CC} ${LOCAL_CFLAGS} ${LOCAL_LDFLAGS} ${CFLAGS} ${LDFLAGS} -o $@ $^ ${LDADD}
 
 service_get_value service_set_value get_options save_options: do_value.o rc-misc.o

src/rc/broadcast.c

@@ -1,204 +0,0 @@
-/*
- * broadcast.c
- * broadcast a message to every logged in user
- */
-
-/*
- * Copyright 2018 Sony Interactive Entertainment Inc.
- *
- * 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 <ctype.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/sysmacros.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <utmpx.h>
-#include <pwd.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <setjmp.h>
-#include <paths.h>
-#include <sys/utsname.h>
-
-#include "broadcast.h"
-#include "helpers.h"
-
-#ifndef _PATH_DEV
-# define _PATH_DEV	"/dev/"
-#endif
-
-static sigjmp_buf jbuf;
-
-/*
- *	Alarm handler
- */
-/*ARGSUSED*/
-# ifdef __GNUC__
-static void handler(int arg __attribute__((unused)))
-# else
-static void handler(int arg)
-# endif
-{
-	siglongjmp(jbuf, 1);
-}
-
-static void getuidtty(char **userp, char **ttyp)
-{
-	struct passwd 		*pwd;
-	uid_t			uid;
-	char			*tty;
-	static char		uidbuf[32];
-	char		*ttynm = NULL;
-
-	uid = getuid();
-	if ((pwd = getpwuid(uid)) != NULL) {
-		uidbuf[0] = 0;
-		strncat(uidbuf, pwd->pw_name, sizeof(uidbuf) - 1);
-	} else {
-		if (uid)
-			sprintf(uidbuf, "uid %d", (int) uid);
-		else
-			sprintf(uidbuf, "root");
-	}
-
-	if ((tty = ttyname(0)) != NULL) {
-		const size_t plen = strlen(_PATH_DEV);
-		if (strncmp(tty, _PATH_DEV, plen) == 0) {
-			tty += plen;
-			if (tty[0] == '/')
-				tty++;
-		}
-		xasprintf(&ttynm, "(%s) ", tty);
-	}
-
-	*userp = uidbuf;
-	*ttyp  = ttynm;
-}
-
-/*
- *	Check whether the given filename looks like a tty device.
- */
-static int file_isatty(const char *fname)
-{
-	struct stat		st;
-	int			major;
-
-	if (stat(fname, &st) < 0)
-		return 0;
-
-	if (st.st_nlink != 1 || !S_ISCHR(st.st_mode))
-		return 0;
-
-	/*
-	 *	It would be an impossible task to list all major/minors
-	 *	of tty devices here, so we just exclude the obvious
-	 *	majors of which just opening has side-effects:
-	 *	printers and tapes.
-	 */
-	major = major(st.st_dev);
-	if (major == 1 || major == 2 || major == 6 || major == 9 ||
-	    major == 12 || major == 16 || major == 21 || major == 27 ||
-	    major == 37 || major == 96 || major == 97 || major == 206 ||
-	    major == 230)
-		return 0;
-	return 1;
-}
-
-/*
- *	broadcast function.
- */
-void broadcast(char *text)
-{
-	char *tty;
-	char *user;
-	struct utsname name;
-	time_t t;
-	char	*date;
-	char *p;
-	char *line = NULL;
-	struct sigaction sa;
-	volatile int fd;
-	FILE *tp;
-	int	flags;
-	char *term = NULL;
-	struct utmpx *utmp;
-
-	getuidtty(&user, &tty);
-
-	/*
-	 * Get and report current hostname, to make it easier to find out
-	 * which machine is being shut down.
-	 */
-	uname(&name);
-
-	/* Get the time */
-	time(&t);
-	date = ctime(&t);
-	p = strchr(date, '\n');
-	if (p)
-		*p = 0;
-
-	xasprintf(&line, "\007\r\nBroadcast message from %s@%s %s(%s):\r\n\r\n",
-			user, name.nodename, tty, date);
-	free(tty);
-
-	/*
-	 *	Fork to avoid hanging in a write()
-	 */
-	if (fork() != 0)
-		return;
-
-	memset(&sa, 0, sizeof(sa));
-	sa.sa_handler = handler;
-	sigemptyset(&sa.sa_mask);
-	sigaction(SIGALRM, &sa, NULL);
-
-	setutxent();
-
-	while ((utmp = getutxent()) != NULL) {
-		if (utmp->ut_type != USER_PROCESS || utmp->ut_user[0] == 0)
-			continue;
-		if (strncmp(utmp->ut_line, _PATH_DEV, strlen(_PATH_DEV)) == 0)
-			xasprintf(&term, "%s", utmp->ut_line);
-		else
-			xasprintf(&term, "%s%s", _PATH_DEV, utmp->ut_line);
-		if (strstr(term, "/../")) {
-			free(term);
-			continue;
-		}
-
-		/*
-		 *	Open it non-delay
-		 */
-		if (sigsetjmp(jbuf, 1) == 0) {
-			alarm(2);
-			flags = O_WRONLY|O_NDELAY|O_NOCTTY;
-			if (file_isatty(term) && (fd = open(term, flags)) >= 0) {
-				if (isatty(fd) && (tp = fdopen(fd, "w")) != NULL) {
-					fputs(line, tp);
-					fputs(text, tp);
-					fflush(tp);
-				}
-			}
-		}
-		alarm(0);
-		if (fd >= 0)
-			close(fd);
-		if (tp != NULL)
-			fclose(tp);
-		free(term);
-	}
-	endutxent();
-	free(line);
-	exit(0);
-}

src/rc/broadcast.h

@@ -1,16 +0,0 @@
-/*
- * Copyright 2018 Sony Interactive Entertainment Inc.
- *
- * 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 BROADCAST_H
-#define BROADCAST_H
-
-void broadcast(char *text);
-
-#endif

src/rc/checkpath.c

@@ -16,7 +16,6 @@
  *    except according to the terms contained in the LICENSE file.
  */
 
-#define _GNU_SOURCE
 #include <sys/types.h>
 #include <sys/stat.h>
 
@@ -24,7 +23,6 @@
 #include <fcntl.h>
 #include <getopt.h>
 #include <grp.h>
-#include <libgen.h>
 #include <pwd.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -46,7 +44,7 @@ typedef enum {
 
 const char *applet = NULL;
 const char *extraopts ="path1 [path2] [...]";
-const char *getoptstring = "dDfFpm:o:sW" getoptstring_COMMON;
+const char *getoptstring = "dDfFpm:o:W" getoptstring_COMMON;
 const struct option longopts[] = {
 	{ "directory",          0, NULL, 'd'},
 	{ "directory-truncate", 0, NULL, 'D'},
@@ -55,7 +53,6 @@ const struct option longopts[] = {
 	{ "pipe",               0, NULL, 'p'},
 	{ "mode",               1, NULL, 'm'},
 	{ "owner",              1, NULL, 'o'},
-	{ "symlinks",           0, NULL, 's'},
 	{ "writable",           0, NULL, 'W'},
 	longopts_COMMON
 };
@@ -67,119 +64,15 @@ const char * const longopts_help[] = {
 	"Create a named pipe (FIFO) if not exists",
 	"Mode to check",
 	"Owner to check (user:group)",
-	"follow symbolic links (irrelivent on linux)",
 	"Check whether the path is writable or not",
 	longopts_help_COMMON
 };
 const char *usagestring = NULL;
 
-static int get_dirfd(char *path, bool symlinks) {
-	char *ch;
-	char *item;
-	char *linkpath = NULL;
-	char *path_dupe;
-	char *str;
-	int components = 0;
-	int dirfd;
-	int flags = 0;
-	int new_dirfd;
-	struct stat st;
-	ssize_t linksize;
-
-	if (!path || *path != '/')
-		eerrorx("%s: empty or relative path", applet);
-	dirfd = openat(dirfd, "/", O_RDONLY);
-	if (dirfd == -1)
-		eerrorx("%s: unable to open the root directory: %s",
-				applet, strerror(errno));
-	ch = path;
-	while (*ch) {
-		if (*ch == '/')
-			components++;
-		ch++;
-	}
-	path_dupe = xstrdup(path);
-	item = strtok(path_dupe, "/");
-#ifdef O_PATH
-	flags |= O_PATH;
-#endif
-	if (!symlinks)
-		flags |= O_NOFOLLOW;
-	flags |= O_RDONLY;
-	while (dirfd > 0 && item && components > 1) {
-		str = xstrdup(linkpath ? linkpath : item);
-		new_dirfd = openat(dirfd, str, flags);
-		if (new_dirfd == -1)
-			eerrorx("%s: %s: could not open %s: %s", applet, path, str,
-					strerror(errno));
-		if (fstat(new_dirfd, &st) == -1)
-			eerrorx("%s: %s: unable to stat %s: %s", applet, path, item,
-					strerror(errno));
-		if (S_ISLNK(st.st_mode) ) {
-			if (st.st_uid != 0)
-				eerrorx("%s: %s: symbolic link %s not owned by root",
-						applet, path, str);
-			linksize = st.st_size+1;
-			if (linkpath)
-				free(linkpath);
-			linkpath = xmalloc(linksize);
-			memset(linkpath, 0, linksize);
-			if (readlinkat(new_dirfd, "", linkpath, linksize) != st.st_size)
-				eerrorx("%s: symbolic link destination changed", applet);
-			/*
-			 * now follow the symlink.
-			 */
-			close(new_dirfd);
-		} else {
-			/* now walk down the directory path */
-			close(dirfd);
-			dirfd = new_dirfd;
-			free(linkpath);
-			linkpath = NULL;
-			item = strtok(NULL, "/");
-			components--;
-		}
-	}
-	free(path_dupe);
-	free(linkpath);
-	return dirfd;
-}
-
-static char *clean_path(char *path)
-{
-	char *ch;
-	char *ch2;
-	char *str;
-	str = xmalloc(strlen(path));
-	ch = path;
-	ch2 = str;
-	while (true) {
-		*ch2 = *ch;
-		ch++;
-		ch2++;
-		if (!*(ch-1))
-			break;
-		while (*(ch - 1) == '/' && *ch == '/')
-			ch++;
-	}
-	/* get rid of trailing / characters */
-	while ((ch = strrchr(str, '/'))) {
-		if (ch == str)
-			break;
-		if (!*(ch+1))
-			*ch = 0;
-		else
-			break;
-	}
-	return str;
-}
-
 static int do_check(char *path, uid_t uid, gid_t gid, mode_t mode,
-	inode_t type, bool trunc, bool chowner, bool symlinks, bool selinux_on)
+	inode_t type, bool trunc, bool chowner, bool selinux_on)
 {
 	struct stat st;
-	char *name = NULL;
-	int dirfd;
 	int fd;
 	int flags;
 	int r;
@@ -200,16 +93,14 @@ static int do_check(char *path, uid_t uid, gid_t gid, mode_t mode,
 #endif
 	if (trunc)
 		flags |= O_TRUNC;
-	xasprintf(&name, "%s", basename_c(path));
-	dirfd = get_dirfd(path, symlinks);
-	readfd = openat(dirfd, name, readflags);
+	readfd = open(path, readflags);
 	if (readfd == -1 || (type == inode_file && trunc)) {
 		if (type == inode_file) {
 			einfo("%s: creating file", path);
 			if (!mode) /* 664 */
 				mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH;
 			u = umask(0);
-			fd = openat(dirfd, name, flags, mode);
+			fd = open(path, flags, mode);
 			umask(u);
 			if (fd == -1) {
 				eerror("%s: open: %s", applet, strerror(errno));
@@ -224,14 +115,14 @@ static int do_check(char *path, uid_t uid, gid_t gid, mode_t mode,
 				mode = S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH;
 			u = umask(0);
 			/* We do not recursively create parents */
-			r = mkdirat(dirfd, name, mode);
+			r = mkdir(path, mode);
 			umask(u);
 			if (r == -1 && errno != EEXIST) {
-				eerror("%s: mkdirat: %s", applet,
+				eerror("%s: mkdir: %s", applet,
 				    strerror (errno));
 				return -1;
 			}
-			readfd = openat(dirfd, name, readflags);
+			readfd = open(path, readflags);
 			if (readfd == -1) {
 				eerror("%s: unable to open directory: %s", applet,
 						strerror(errno));
@@ -249,7 +140,7 @@ static int do_check(char *path, uid_t uid, gid_t gid, mode_t mode,
 				    strerror (errno));
 				return -1;
 			}
-			readfd = openat(dirfd, name, readflags);
+			readfd = open(path, readflags);
 			if (readfd == -1) {
 				eerror("%s: unable to open fifo: %s", applet,
 						strerror(errno));
@@ -368,10 +259,8 @@ int main(int argc, char **argv)
 	int retval = EXIT_SUCCESS;
 	bool trunc = false;
 	bool chowner = false;
-	bool symlinks = false;
 	bool writable = false;
 	bool selinux_on = false;
-	char *path = NULL;
 
 	applet = basename_c(argv[0]);
 	while ((opt = getopt_long(argc, argv, getoptstring,
@@ -380,13 +269,11 @@ int main(int argc, char **argv)
 		switch (opt) {
 		case 'D':
 			trunc = true;
-			/* falls through */
 		case 'd':
 			type = inode_dir;
 			break;
 		case 'F':
 			trunc = true;
-			/* falls through */
 		case 'f':
 			type = inode_file;
 			break;
@@ -404,11 +291,6 @@ int main(int argc, char **argv)
 				eerrorx("%s: owner `%s' not found",
 				    applet, optarg);
 			break;
-		case 's':
-#ifndef O_PATH
-			symlinks = true;
-#endif
-			break;
 		case 'W':
 			writable = true;
 			break;
@@ -434,14 +316,11 @@ int main(int argc, char **argv)
 		selinux_on = true;
 
 	while (optind < argc) {
-		path = clean_path(argv[optind]);
 		if (writable)
-			exit(!is_writable(path));
-		if (do_check(path, uid, gid, mode, type, trunc, chowner,
-					symlinks, selinux_on))
+			exit(!is_writable(argv[optind]));
+		if (do_check(argv[optind], uid, gid, mode, type, trunc, chowner, selinux_on))
 			retval = EXIT_FAILURE;
 		optind++;
-		free(path);
 	}
 
 	if (selinux_on)

src/rc/do_e.c

@@ -35,9 +35,9 @@
 
 const char *applet = NULL;
 
-static int syslog_decode(char *name, const CODE *codetab)
+static int syslog_decode(char *name, CODE *codetab)
 {
-	const CODE *c;
+	CODE *c;
 
 	if (isdigit((unsigned char)*name))
 		return atoi(name);

src/rc/do_service.c

@@ -68,7 +68,9 @@ int main(int argc, char **argv)
 		ok = rc_service_started_daemon(service, exec, NULL, idx);
 
 	} else if (strcmp(applet, "service_crashed") == 0) {
-		ok = ( rc_service_daemons_crashed(service) && errno != EACCES);
+		ok = (_rc_can_find_pids() &&
+		    rc_service_daemons_crashed(service) &&
+		    errno != EACCES);
 	} else
 		eerrorx("%s: unknown applet", applet);
 

src/rc/kill_all.c

@@ -58,7 +58,7 @@ static int mount_proc(void)
 	if (exists("/proc/version"))
 		return 0;
 	pid = fork();
-	switch (pid) {
+	switch(pid) {
 		case -1:
 			syslog(LOG_ERR, "Unable to fork");
 			return -1;
@@ -248,7 +248,7 @@ int main(int argc, char **argv)
 		usage(EXIT_FAILURE);
 	}
 	}
-
+	
 	openlog(applet, LOG_CONS|LOG_PID, LOG_DAEMON);
 	if (mount_proc() != 0) {
 		rc_stringlist_free(omits);

src/rc/openrc-init.c

@@ -19,71 +19,59 @@
  */
 
 #include <errno.h>
-#include <pwd.h>
 #include <signal.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <time.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/reboot.h>
 #include <sys/wait.h>
 
-#ifdef HAVE_SELINUX
-#  include <selinux/selinux.h>
-#endif
-
 #include "helpers.h"
 #include "rc.h"
-#include "rc-plugin.h"
 #include "rc-wtmp.h"
 #include "version.h"
 
 static const char *path_default = "/sbin:/usr/sbin:/bin:/usr/bin";
 static const char *rc_default_runlevel = "default";
 
-static void do_openrc(const char *runlevel)
+static pid_t do_openrc(const char *runlevel)
 {
 	pid_t pid;
-	sigset_t all_signals;
-	sigset_t our_signals;
+	sigset_t signals;
 
-	sigfillset(&all_signals);
-	/* block all signals */
-	sigprocmask(SIG_BLOCK, &all_signals, &our_signals);
 	pid = fork();
-	switch (pid) {
+	switch(pid) {
 		case -1:
 			perror("fork");
-			exit(1);
 			break;
 		case 0:
 			setsid();
 			/* unblock all signals */
-			sigprocmask(SIG_UNBLOCK, &all_signals, NULL);
+			sigemptyset(&signals);
+			sigprocmask(SIG_SETMASK, &signals, NULL);
 			printf("Starting %s runlevel\n", runlevel);
 			execlp("openrc", "openrc", runlevel, NULL);
 			perror("exec");
-			exit(1);
 			break;
 		default:
-			/* restore our signal mask */
-			sigprocmask(SIG_SETMASK, &our_signals, NULL);
-			while (waitpid(pid, NULL, 0) != pid)
-				if (errno == ECHILD)
-					break;
 			break;
 	}
+	return pid;
 }
 
 static void init(const char *default_runlevel)
 {
 	const char *runlevel = NULL;
-	do_openrc("sysinit");
-	do_openrc("boot");
+	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
@@ -94,7 +82,8 @@ static void init(const char *default_runlevel)
 		printf("%s is an invalid runlevel\n", runlevel);
 		runlevel = rc_default_runlevel;
 	}
-	do_openrc(runlevel);
+	pid = do_openrc(runlevel);
+	waitpid(pid, NULL, 0);
 	log_wtmp("reboot", "~~", 0, RUN_LVL, "~~");
 }
 
@@ -106,82 +95,25 @@ static void handle_reexec(char *my_name)
 
 static void handle_shutdown(const char *runlevel, int cmd)
 {
-	struct timespec ts;
+	pid_t pid;
 
-	do_openrc(runlevel);
+	pid = do_openrc(runlevel);
+	while (waitpid(pid, NULL, 0) != pid);
 	printf("Sending the final term signal\n");
 	kill(-1, SIGTERM);
-	ts.tv_sec = 3;
-	ts.tv_nsec = 0;
-	nanosleep(&ts, NULL);
+	sleep(3);
 	printf("Sending the final kill signal\n");
 	kill(-1, SIGKILL);
 	sync();
 	reboot(cmd);
 }
 
-static void run_program(const char *prog)
-{
-	sigset_t full;
-	sigset_t old;
-	pid_t pid;
-
-	/* We need to block signals until we have forked */
-	sigfillset(&full);
-	sigprocmask(SIG_SETMASK, &full, &old);
-	pid = fork();
-	if (pid == -1) {
-		perror("init");
-		return;
-	}
-	if (pid == 0) {
-		/* Unmask signals */
-		sigprocmask(SIG_SETMASK, &old, NULL);
-		execl(prog, prog, (char *)NULL);
-		perror("init");
-		exit(1);
-	}
-	/* Unmask signals and wait for child */
-	sigprocmask(SIG_SETMASK, &old, NULL);
-	if (rc_waitpid(pid) == -1)
-		perror("init");
-}
-
-static void open_shell(void)
-{
-	const char *shell;
-	struct passwd *pw;
-
-#ifdef __linux__
-	const char *sys = rc_sys();
-
-	/* VSERVER systems cannot really drop to shells */
-	if (sys && strcmp(sys, RC_SYS_VSERVER) == 0)
-	{
-		execlp("halt", "halt", "-f", (char *) NULL);
-		perror("init");
-		return;
-	}
-#endif
-
-	shell = rc_conf_value("rc_shell");
-	/* No shell set, so obey env, then passwd, then default to /bin/sh */
-	if (!shell) {
-		shell = getenv("SHELL");
-		if (!shell) {
-			pw = getpwuid(getuid());
-			if (pw)
-				shell = pw->pw_shell;
-			if (!shell)
-				shell = "/bin/sh";
-		}
-	}
-	run_program(shell);
-}
-
 static void handle_single(void)
 {
-	do_openrc("single");
+	pid_t pid;
+
+	pid = do_openrc("single");
+	while (waitpid(pid, NULL, 0) != pid);
 }
 
 static void reap_zombies(void)
@@ -203,16 +135,10 @@ static void reap_zombies(void)
 
 static void signal_handler(int sig)
 {
-	switch (sig) {
+	switch(sig) {
 		case SIGINT:
 			handle_shutdown("reboot", RB_AUTOBOOT);
 			break;
-		case SIGTERM:
-#ifdef SIGPWR
-		case SIGPWR:
-#endif
-			handle_shutdown("shutdown", RB_HALT_SYSTEM);
-			break;
 		case SIGCHLD:
 			reap_zombies();
 			break;
@@ -231,36 +157,10 @@ int main(int argc, char **argv)
 	bool reexec = false;
 	sigset_t signals;
 	struct sigaction sa;
-#ifdef HAVE_SELINUX
-	int			enforce = 0;
-#endif
 
 	if (getpid() != 1)
 		return 1;
 
-#ifdef HAVE_SELINUX
-	if (getenv("SELINUX_INIT") == NULL) {
-		if (is_selinux_enabled() != 1) {
-			if (selinux_init_load_policy(&enforce) == 0) {
-				putenv("SELINUX_INIT=YES");
-				execv(argv[0], argv);
-			} else {
-				if (enforce > 0) {
-					/*
-					 * SELinux in enforcing mode but load_policy failed
-					 * At this point, we probably can't open /dev/console,
-					 * so log() won't work
-					 */
-					fprintf(stderr,"Unable to load SELinux Policy.\n");
-					fprintf(stderr,"Machine is  in enforcing mode.\n");
-					fprintf(stderr,"Halting now.\n");
-					exit(1);
-				}
-			}
-		}
-	}
-#endif
-
 	printf("OpenRC init version %s starting\n", VERSION);
 
 	if (argc > 1)
@@ -275,10 +175,6 @@ int main(int argc, char **argv)
 	sigfillset(&signals);
 	sigdelset(&signals, SIGCHLD);
 	sigdelset(&signals, SIGINT);
-	sigdelset(&signals, SIGTERM);
-#ifdef SIGPWR
-	sigdelset(&signals, SIGPWR);
-#endif
 	sigprocmask(SIG_SETMASK, &signals, NULL);
 
 	/* install signal  handler */
@@ -286,10 +182,6 @@ int main(int argc, char **argv)
 	sa.sa_handler = signal_handler;
 	sigaction(SIGCHLD, &sa, NULL);
 	sigaction(SIGINT, &sa, NULL);
-	sigaction(SIGTERM, &sa, NULL);
-#ifdef SIGPWR
-	sigaction(SIGPWR, &sa, NULL);
-#endif
 	reboot(RB_DISABLE_CAD);
 
 	/* set default path */
@@ -323,11 +215,8 @@ int main(int argc, char **argv)
 			handle_shutdown("reboot", RB_AUTOBOOT);
 		else if (strcmp(buf, "reexec") == 0)
 			handle_reexec(argv[0]);
-		else if (strcmp(buf, "single") == 0) {
+		else if (strcmp(buf, "single") == 0)
 			handle_single();
-			open_shell();
-			init(default_runlevel);
-		}
 	}
 	return 0;
 }

src/rc/openrc-run.c

@@ -1120,7 +1120,7 @@ int main(int argc, char **argv)
 	char *dir, *save = NULL, *saveLnk = NULL;
 	char *pidstr = NULL;
 	size_t l = 0, ll;
-	const char *file;
+ 	const char *file;
 	struct stat stbuf;
 
 	/* Show help if insufficient args */
@@ -1152,7 +1152,7 @@ int main(int argc, char **argv)
 	}
 	lnk = xmalloc(4096);
 	memset(lnk, 0, 4096);
-	if (readlink(argv[1], lnk, 4096-1)) {
+	if (readlink(argv[1], lnk, 4096)) {
 		dir = dirname(path);
 		if (strchr(lnk, '/')) {
 			save = xstrdup(dir);
@@ -1223,6 +1223,7 @@ int main(int argc, char **argv)
 
 		/* Make our prefix string */
 		prefix = xmalloc(sizeof(char) * l + 1);
+		ll = strlen(applet);
 		memcpy(prefix, applet, ll);
 		memset(prefix + ll, ' ', l - ll);
 		memset(prefix + l, 0, 1);
@@ -1267,9 +1268,6 @@ int main(int argc, char **argv)
 		case_RC_COMMON_GETOPT
 		}
 
-	if (rc_yesno(getenv("RC_NODEPS")))
-		deps = false;
-
 	/* If we're changing runlevels and not called by rc then we cannot
 	   work with any dependencies */
 	if (deps && getenv("RC_PID") == NULL &&
@@ -1284,8 +1282,6 @@ int main(int argc, char **argv)
 		unsetenv("IN_BACKGROUND");
 	}
 
-	if (rc_yesno(getenv("IN_DRYRUN")))
-	dry_run = true;
 	if (rc_yesno(getenv("IN_HOTPLUG"))) {
 		if (!service_plugable())
 			eerrorx("%s: not allowed to be hotplugged", applet);

src/rc/openrc-shutdown.c

@@ -25,25 +25,20 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <syslog.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/utsname.h>
 
-#include "broadcast.h"
 #include "einfo.h"
 #include "rc.h"
 #include "helpers.h"
-#include "rc-misc.h"
-#include "rc-sysvinit.h"
-#include "rc-wtmp.h"
 #include "_usage.h"
+#include "rc-wtmp.h"
 
 const char *applet = NULL;
 const char *extraopts = NULL;
-const char *getoptstring = "cdDfFHKpRrsw" getoptstring_COMMON;
+const char *getoptstring = "dDHKpRrsw" getoptstring_COMMON;
 const struct option longopts[] = {
-	{ "cancel",        no_argument, NULL, 'c'},
 	{ "no-write",        no_argument, NULL, 'd'},
 	{ "dry-run",        no_argument, NULL, 'D'},
 	{ "halt",        no_argument, NULL, 'H'},
@@ -56,7 +51,6 @@ const struct option longopts[] = {
 	longopts_COMMON
 };
 const char * const longopts_help[] = {
-	"cancel a pending shutdown",
 	"do not write wtmp record",
 	"print actions instead of executing them",
 	"halt the system",
@@ -68,22 +62,10 @@ const char * const longopts_help[] = {
 	"write wtmp boot record and exit",
 	longopts_help_COMMON
 };
-const char *usagestring = "" \
-						   "Usage: openrc-shutdown -c | --cancel\n" \
-						   "   or: openrc-shutdown -R | --reexec\n" \
-						   "   or: openrc-shutdown -w | --write-only\n" \
-						   "   or: openrc-shutdown -H | --halt time\n" \
-						   "   or: openrc-shutdown -K | --kexec time\n" \
-						   "   or: openrc-shutdown -p | --poweroff time\n" \
-						   "   or: openrc-shutdown -r | --reboot time\n" \
-						   "   or: openrc-shutdown -s | --single time";
+const char *usagestring = NULL;
 const char *exclusive = "Select one of "
-	"--cancel, --halt, --kexec, --poweroff, --reexec, --reboot, --single or \n"
-	"--write-only";
-const char *nologin_file = RC_SYSCONFDIR"/nologin";
-const char *shutdown_pid = "/run/openrc-shutdown.pid";
+"--halt, --kexec, --poweroff, --reexec, --reboot, --single or --write-only";
 
-static bool do_cancel = false;
 static bool do_dryrun = false;
 static bool do_halt = false;
 static bool do_kexec = false;
@@ -94,44 +76,10 @@ static bool do_single = false;
 static bool do_wtmp = true;
 static bool do_wtmp_only = false;
 
-static void cancel_shutdown(void)
-{
-	pid_t pid;
-
-	pid = get_pid(applet, shutdown_pid);
-	if (pid <= 0)
-		eerrorx("%s: Unable to cancel shutdown", applet);
-
-	if (kill(pid, SIGTERM) != -1)
-		einfo("%s: shutdown canceled", applet);
-	else
-		eerrorx("%s: Unable to cancel shutdown", applet);
-}
-
-/*
- *	Create the nologin file.
- */
-static void create_nologin(int mins)
-{
-	FILE *fp;
-	time_t t;
-
-	time(&t);
-	t += 60 * mins;
-
-	if ((fp = fopen(nologin_file, "w")) != NULL) {
-		fprintf(fp, "\rThe system is going down on %s\r\n", ctime(&t));
-		fclose(fp);
-	}
-}
-
-/*
- * Send a command to our init
- */
 static void send_cmd(const char *cmd)
 {
 	FILE *fifo;
-	size_t ignored;
+ 	size_t ignored;
 
 	if (do_dryrun) {
 		einfo("Would send %s to init", cmd);
@@ -151,57 +99,16 @@ static void send_cmd(const char *cmd)
 	fclose(fifo);
 }
 
-/*
- * sleep without being interrupted.
- * The idea for this code came from sysvinit.
- */
-static void sleep_no_interrupt(int seconds)
-{
-	struct timespec duration;
-	struct timespec remaining;
-
-	duration.tv_sec = seconds;
-	duration.tv_nsec = 0;
-
-	while (nanosleep(&duration, &remaining) < 0 && errno == EINTR)
-		duration = remaining;
-}
-
-static void stop_shutdown(int sig)
-{
-	(void) sig;
-	unlink(nologin_file);
-	unlink(shutdown_pid);
-einfo("Shutdown canceled");
-exit(0);
-}
-
 int main(int argc, char **argv)
 {
-	char *ch = NULL;
 	int opt;
 	int cmd_count = 0;
-	int hour = 0;
-	int min = 0;
-	int shutdown_delay = 0;
-	struct sigaction sa;
-	struct tm *lt;
-	time_t tv;
-	bool need_warning = false;
-	char *msg = NULL;
-	char *state = NULL;
-	char *time_arg = NULL;
-	FILE *fp;
 
 	applet = basename_c(argv[0]);
 	while ((opt = getopt_long(argc, argv, getoptstring,
 		    longopts, (int *) 0)) != -1)
 	{
 		switch (opt) {
-			case 'c':
-				do_cancel = true;
-			cmd_count++;
-				break;
 			case 'd':
 				do_wtmp = false;
 				break;
@@ -210,17 +117,14 @@ int main(int argc, char **argv)
 			break;
 		case 'H':
 			do_halt = true;
-			xasprintf(&state, "%s", "halt");
 			cmd_count++;
 			break;
 		case 'K':
 			do_kexec = true;
-			xasprintf(&state, "%s", "reboot");
 			cmd_count++;
 			break;
 		case 'p':
 			do_poweroff = true;
-			xasprintf(&state, "%s", "power off");
 			cmd_count++;
 			break;
 		case 'R':
@@ -229,12 +133,10 @@ int main(int argc, char **argv)
 			break;
 		case 'r':
 			do_reboot = true;
-			xasprintf(&state, "%s", "reboot");
 			cmd_count++;
 			break;
 		case 's':
 			do_single = true;
-			xasprintf(&state, "%s", "go down for maintenance");
 			cmd_count++;
 			break;
 		case 'w':
@@ -244,115 +146,25 @@ int main(int argc, char **argv)
 		case_RC_COMMON_GETOPT
 		}
 	}
-	if (geteuid() != 0)
+	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_cancel) {
-		cancel_shutdown();
-		exit(EXIT_SUCCESS);
-	} else if (do_reexec) {
-		send_cmd("reexec");
-		exit(EXIT_SUCCESS);
-	} else if (do_wtmp_only) {
-		log_wtmp("shutdown", "~~", 0, RUN_LVL, "~~");
-		exit(EXIT_SUCCESS);
-	}
-
-	if (optind >= argc) {
-		eerror("%s: No shutdown time specified", applet);
-		usage(EXIT_FAILURE);
-	}
-	time_arg = argv[optind];
-	if (*time_arg == '+')
-		time_arg++;
-	if (strcasecmp(time_arg, "now") == 0)
-		strcpy(time_arg, "0");
-	for (ch=time_arg; *ch; ch++)
-		if ((*ch < '0' || *ch > '9') && *ch != ':') {
-			eerror("%s: invalid time %s", applet, time_arg);
-			usage(EXIT_FAILURE);
-		}
-	if (strchr(time_arg, ':')) {
-		if ((sscanf(time_arg, "%2d:%2d", &hour, &min) != 2) ||
-				(hour > 23) || (min > 59)) {
-			eerror("%s: invalid time %s", applet, time_arg);
-			usage(EXIT_FAILURE);
-		}
-		time(&tv);
-		lt = localtime(&tv);
-		shutdown_delay = (hour * 60 + min) - (lt->tm_hour * 60 + lt->tm_min);
-		if (shutdown_delay < 0)
-			shutdown_delay += 1440;
-	} else {
-		shutdown_delay = atoi(time_arg);
-	}
-
-	fp = fopen(shutdown_pid, "w");
-	if (!fp)
-		eerrorx("%s: fopen `%s': %s", applet, shutdown_pid, strerror(errno));
-	fprintf(fp, "%d\n", getpid());
-	fclose(fp);
-
-	openlog(applet, LOG_PID, LOG_DAEMON);
-	memset(&sa, 0, sizeof(sa));
-	sa.sa_handler = stop_shutdown;
-	sigemptyset(&sa.sa_mask);
-	sigaction(SIGINT, &sa, NULL);
-	sigaction(SIGTERM, &sa, NULL);
-	while (shutdown_delay > 0) {
-		need_warning = false;
-		if (shutdown_delay > 180)
-			need_warning = (shutdown_delay % 60 == 0);
-		else if (shutdown_delay > 60)
-			need_warning = (shutdown_delay % 30 == 0);
-		else if	(shutdown_delay > 10)
-			need_warning = (shutdown_delay % 15 == 0);
-		else
-			need_warning = true;
-		if (shutdown_delay <= 5)
-			create_nologin(shutdown_delay);
-		if (need_warning) {
-		xasprintf(&msg, "\rThe system will %s in %d minutes\r\n",
-		          state, shutdown_delay);
-			broadcast(msg);
-			free(msg);
-		}
-		sleep_no_interrupt(60);
-		shutdown_delay--;
-	}
-	xasprintf(&msg, "\rThe system will %s now\r\n", state);
-	broadcast(msg);
-	syslog(LOG_NOTICE, "The system will %s now", state);
-	unlink(nologin_file);
-	unlink(shutdown_pid);
-	if (do_halt) {
-		if (exists("/run/initctl")) {
-			sysvinit_setenv("INIT_HALT", "HALT");
-			sysvinit_runlevel('0');
-		} else
-			send_cmd("halt");
-	} else if (do_kexec)
+	if (do_halt)
+		send_cmd("halt");
+	else if (do_kexec)
 		send_cmd("kexec");
-	else if (do_poweroff) {
-		if (exists("/run/initctl")) {
-			sysvinit_setenv("INIT_HALT", "POWEROFF");
-			sysvinit_runlevel('0');
-		} else
-			send_cmd("poweroff");
-	} else if (do_reboot) {
-		if (exists("/run/initctl"))
-			sysvinit_runlevel('6');
-		else
-			send_cmd("reboot");
-	} else if (do_single) {
-		if (exists("/run/initctl"))
-			sysvinit_runlevel('S');
-		else
-			send_cmd("single");
-	}
+	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

@@ -87,8 +87,6 @@ write_log(int logfd, const char *buffer, size_t bytes)
 		}
 
 		if (!in_escape) {
-			if (!isprint((int) *p) && *p != '\n')
-				goto cont;
 			if (write(logfd, p++, 1) == -1)
 				eerror("write: %s", strerror(errno));
 			continue;

src/rc/rc-logger.h

@@ -13,8 +13,8 @@
 #ifndef RC_LOGGER_H
 #define RC_LOGGER_H
 
-extern pid_t rc_logger_pid;
-extern int rc_logger_tty;
+pid_t rc_logger_pid;
+int rc_logger_tty;
 extern bool rc_in_logger;
 
 void rc_logger_open(const char *runlevel);

src/rc/rc-misc.c

@@ -51,8 +51,7 @@ rc_conf_yesno(const char *setting)
 
 static const char *const env_whitelist[] = {
 	"EERROR_QUIET", "EINFO_QUIET",
-	"IN_BACKGROUND", "IN_DRYRUN", "IN_HOTPLUG",
-	"RC_DEBUG", "RC_NODEPS",
+	"IN_BACKGROUND", "IN_HOTPLUG",
 	"LANG", "LC_MESSAGES", "TERM",
 	"EINFO_COLOR", "EINFO_VERBOSE",
 	NULL
@@ -411,6 +410,34 @@ RC_DEPTREE * _rc_deptree_load(int force, int *regen)
 	return rc_deptree_load();
 }
 
+bool _rc_can_find_pids(void)
+{
+	RC_PIDLIST *pids;
+	RC_PID *pid;
+	RC_PID *pid2;
+	bool retval = false;
+
+	if (geteuid() == 0)
+		return true;
+
+	/* If we cannot see process 1, then we don't test to see if
+	 * services crashed or not */
+	pids = rc_find_pids(NULL, NULL, 0, 1);
+	if (pids) {
+		pid = LIST_FIRST(pids);
+		if (pid) {
+			retval = true;
+			while (pid) {
+				pid2 = LIST_NEXT(pid, entries);
+				free(pid);
+				pid = pid2;
+			}
+		}
+		free(pids);
+	}
+	return retval;
+}
+
 static const struct {
 	const char * const name;
 	RC_SERVICE bit;
@@ -423,7 +450,6 @@ static const struct {
 	{ "service_hotplugged",  RC_SERVICE_HOTPLUGGED,  },
 	{ "service_wasinactive", RC_SERVICE_WASINACTIVE, },
 	{ "service_failed",      RC_SERVICE_FAILED,      },
-	{ "service_crashed",     RC_SERVICE_CRASHED,     },
 };
 
 RC_SERVICE lookup_service_state(const char *service)

src/rc/rc-pipes.c

@@ -1,56 +0,0 @@
-/*
- * rc-pipes.c
- * Helper to handle spawning processes and connecting them to pipes.
- */
-
-/*
- * Copyright (c) 2018 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 <stdlib.h>
-#include <unistd.h>
-#include <sys/types.h>
-
-#include "rc-pipes.h"
-
-static const int pipe_read_end = 0;
-static const int pipe_write_end = 1;
-
-/*
- * Starts a command with stdin redirected from a pipe
- * Returns the write end of the pipe or -1
- */
-int rc_pipe_command(char *cmd)
-{
-	int pfd[2];
-	pid_t pid;
-
-	if (pipe(pfd) < 0)
-		return -1;
-
-	pid = fork();
-	if (pid > 0) {
-		/* parent */
-		close(pfd[pipe_read_end]);
-		return pfd[pipe_write_end];
-	} else if (pid == 0) {
-		/* child */
-		close(pfd[pipe_write_end]);
-		if (pfd[pipe_read_end] != STDIN_FILENO) {
-			if (dup2(pfd[pipe_read_end], STDIN_FILENO) < 0)
-				exit(1);
-			close(pfd[pipe_read_end]);
-		}
-		execl("/bin/sh", "sh", "-c", cmd, NULL);
-		exit(1);
-	}
-	return -1;
-}

src/rc/rc-pipes.h

@@ -1,18 +0,0 @@
-/*
- * Copyright (c) 2018 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_PIPES_H
-#define RC_PIPES_H
-
-int rc_pipe_command(char *cmd);
-
-#endif

src/rc/rc-schedules.c

@@ -28,7 +28,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <syslog.h>
 #include <time.h>
 #include <unistd.h>
 #include <sys/stat.h>
@@ -271,11 +270,8 @@ int do_stop(const char *applet, const char *exec, const char *const *argv,
 			einfo("Would send signal %d to PID %d", sig, pi->pid);
 			nkilled++;
 		} else {
-			if (sig) {
-				syslog(LOG_DEBUG, "Sending signal %d to PID %d", sig, pi->pid);
-				if (!quiet)
-					ebeginv("Sending signal %d to PID %d", sig, pi->pid);
-			}
+			if (!quiet)
+				ebeginv("Sending signal %d to PID %d", sig, pi->pid);
 			errno = 0;
 			killed = (kill(pi->pid, sig) == 0 ||
 			    errno == ESRCH ? true : false);
@@ -283,9 +279,6 @@ int do_stop(const char *applet, const char *exec, const char *const *argv,
 				eendv(killed ? 0 : 1,
 				"%s: failed to send signal %d to PID %d: %s",
 				applet, sig, pi->pid, strerror(errno));
-			else if (!killed)
-				syslog(LOG_ERR, "Failed to send signal %d to PID %d: %s",
-						sig, pi->pid, strerror(errno));
 			if (!killed) {
 				nkilled = -1;
 			} else {
@@ -317,18 +310,12 @@ int run_stop_schedule(const char *applet,
 	if (!(pid > 0 || exec || uid || (argv && *argv)))
 		return 0;
 
-	if (exec) {
+	if (exec)
 		einfov("Will stop %s", exec);
-		syslog(LOG_DEBUG, "Will stop %s", exec);
-	}
-	if (pid > 0) {
+	if (pid > 0)
 		einfov("Will stop PID %d", pid);
-		syslog(LOG_DEBUG, "Will stop PID %d", pid);
-	}
-	if (uid) {
+	if (uid)
 		einfov("Will stop processes owned by UID %d", uid);
-		syslog(LOG_DEBUG, "Will stop processes owned by UID %d", uid);
-	}
 	if (argv && *argv) {
 		einfovn("Will stop processes of `");
 		if (rc_yesno(getenv("EINFO_VERBOSE"))) {
@@ -364,9 +351,8 @@ int run_stop_schedule(const char *applet,
 
 			tkilled += nkilled;
 			break;
-		case SC_FOREVER:
 		case SC_TIMEOUT:
-			if (item->type == SC_TIMEOUT && item->value < 1) {
+			if (item->value < 1) {
 				item = NULL;
 				break;
 			}
@@ -374,7 +360,7 @@ int run_stop_schedule(const char *applet,
 			ts.tv_sec = 0;
 			ts.tv_nsec = POLL_INTERVAL;
 
-			for (nsecs = 0; item->type == SC_FOREVER || nsecs < item->value; nsecs++) {
+			for (nsecs = 0; nsecs < item->value; nsecs++) {
 				for (nloops = 0;
 				     nloops < ONE_SECOND / POLL_INTERVAL;
 				     nloops++)
@@ -389,7 +375,10 @@ int run_stop_schedule(const char *applet,
 							printf("\n");
 							progressed = false;
 						}
-						if (errno != EINTR) {
+						if (errno == EINTR)
+							eerror("%s: caught an"
+							    " interrupt", applet);
+						else {
 							eerror("%s: nanosleep: %s",
 							    applet, strerror(errno));
 							return 0;