Update ChangeLog

supervise-daemon: reap zombies
We need to make sure to reap zombies so that we can shut down successfully. Fixes #252. Possibly related to #250.
2018-11-05 21:46:47 -06:00 · 2018-11-05 21:43:24 -06:00 · 2018-11-05 21:43:24 -06:00 · 2018-11-05 21:40:07 -06:00 · 2018-10-24 15:36:38 -05:00 · 2018-10-24 15:32:16 -05:00
72 changed files with 1208 additions and 1479 deletions
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -1,15 +0,0 @@
-# Cirrus CI integration
-# https://cirrus-ci.org
-
-test_task:
-  freebsd_instance:
-    matrix:
-      image: freebsd-12-0-release-amd64
-      image: freebsd-11-2-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
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,28 +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
-
-script:
-  - ./ci/travis.sh
--- a/1238
+++ b/1238
--- a/3
+++ b/3
@@ -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

--- a/Makefile.inc
+++ b/Makefile.inc
@@ -1,3 +1,3 @@
 NAME=		openrc
-VERSION=	0.41
+VERSION=	0.39.2
 PKG=		${NAME}-${VERSION}
--- a/NEWS.md
+++ b/NEWS.md
@@ -4,31 +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.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.
--- a/README.md
+++ b/README.md
@@ -38,7 +38,6 @@ PKG_PREFIX=/usr/pkg
 LOCAL_PREFIX=/usr/local
 PREFIX=/usr/local
 BRANDING=\"Gentoo/$(uname -s)\"
-SH=/bin/sh
 ```

 ## Notes
--- a/bash-completion/rc-service
+++ b/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
--- a/ci/cirrus.sh
+++ b/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
--- a/ci/travis.sh
+++ b/ci/travis.sh
@@ -1,23 +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.
-
-cpus=$(getconf _NPROCESSORS_CONF || echo 1)
-# make on TravisCI doesn't support -O yet
-make -j"${cpus}"
-
-make test
--- a/etc/rc.conf
+++ b/etc/rc.conf
@@ -230,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.
--- a/etc/rc.in
+++ b/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
--- a/etc/rc.shutdown.in
+++ b/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
--- a/init.d/.gitignore
+++ b/init.d/.gitignore
@@ -41,8 +41,6 @@ rc-enabled
 rpcbind
 runsvdir
 savecore
-save-keymaps
-save-termencoding
 swap-blk
 swclock
 syslogd
--- a/init.d/Makefile
+++ b/init.d/Makefile
@@ -23,8 +23,8 @@ SRCS-FreeBSD+=	adjkerntz.in devd.in dumpon.in encswap.in ipfw.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
+	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 \
--- a/init.d/agetty.in
+++ b/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}"
--- a/init.d/keymaps.in
+++ b/init.d/keymaps.in
@@ -14,7 +14,7 @@ description="Applies a keymap for the consoles."
 depend()
 {
 	need termencoding
-	after devfs
+	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
 }
--- a/init.d/save-keymaps.in
+++ b/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"
-}
--- a/init.d/save-termencoding.in
+++ b/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
-}
--- a/init.d/termencoding.in
+++ b/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()
--- a/man/openrc-shutdown.8
+++ b/man/openrc-shutdown.8
@@ -17,35 +17,15 @@
 .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
@@ -76,7 +56,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 ,
--- a/man/openrc.8
+++ b/man/openrc.8
@@ -66,7 +66,6 @@ and
 .Xr shutdown 8
 and let them call these special runlevels.
 .Sh SEE ALSO
-.Xr openrc-run 8 ,
 .Xr rc-status 8 ,
 .Xr rc-update 8 ,
 .Xr init 8 ,
--- a/man/rc-status.8
+++ b/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
--- a/man/supervise-daemon.8
+++ b/man/supervise-daemon.8
@@ -9,14 +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
@@ -37,6 +36,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 +55,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 +66,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 +91,16 @@ 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
+.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
+.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 +115,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 +132,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 +145,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 +167,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.
--- a/mk/os-Linux.mk
+++ b/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 -D_POSIX_C_SOURCE=200809L
 LIBDL=		-Wl,-Bdynamic -ldl

 ifeq (${MKSELINUX},yes)
--- a/mk/scripts.mk
+++ b/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
--- a/runlevels/Makefile
+++ b/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

--- a/scripts/halt.in
+++ b/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} "$@"
--- a/scripts/poweroff.in
+++ b/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} "$@"
--- a/scripts/rc-sstat.in
+++ b/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
--- a/scripts/reboot.in
+++ b/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} "$@"
--- a/scripts/shutdown.in
+++ b/scripts/shutdown.in
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!@SHELL@

 shutdown_arg=
 while getopts :akrhPHfFnct: opt; do
--- a/sh/.gitignore
+++ b/sh/.gitignore
@@ -4,4 +4,6 @@ openrc-run.sh
 cgroup-release-agent.sh
 init.sh
 init-early.sh
+rc-cgroup.sh
+migrate-to-run.sh
 binfmt.sh
--- a/sh/Makefile
+++ b/sh/Makefile
@@ -2,7 +2,7 @@ DIR=	${LIBEXECDIR}/sh
 SRCS=	init.sh.in functions.sh.in gendepends.sh.in \
 	openrc-run.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
--- a/sh/binfmt.sh.in
+++ b/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.
 #
--- a/sh/cgroup-release-agent.sh.in
+++ b/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.

--- a/sh/functions.sh.in
+++ b/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
 }

--- a/sh/init-early.sh.Linux.in
+++ b/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
--- a/sh/init.sh.BSD.in
+++ b/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
--- a/sh/init.sh.GNU-kFreeBSD.in
+++ b/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
--- a/sh/init.sh.GNU.in
+++ b/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
--- a/sh/init.sh.Linux.in
+++ b/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.
--- a/sh/migrate-to-run.sh.in
+++ b/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
--- a/sh/rc-cgroup.sh.in
+++ b/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
--- a/test/units/sh_yesno
+++ b/test/units/sh_yesno
@@ -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
--- a/sh/supervise-daemon.sh
+++ b/sh/supervise-daemon.sh
@@ -55,9 +55,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}"
 }
--- a/src/Makefile
+++ b/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
--- a/src/librc/librc-daemon.c
+++ b/src/librc/librc-daemon.c
@@ -48,40 +48,34 @@ pid_is_exec(pid_t pid, const char *exec)
 static bool
 pid_is_argv(pid_t pid, const char *const *argv)
 {
-	char *buffer = NULL;
 	char *cmdline = NULL;
+	int fd;
+	char buffer[PATH_MAX];
 	char *p;
-	size_t bytes;
-	bool rc;
+	ssize_t bytes;

 	xasprintf(&cmdline, "/proc/%u/cmdline", pid);
-	if (!rc_getfile(cmdline, &buffer, &bytes)) {
+	if ((fd = open(cmdline, O_RDONLY)) < 0) {
 		free(cmdline);
 		return false;
 	}
+	bytes = read(fd, buffer, sizeof(buffer));
+	close(fd);
 	free(cmdline);
-	if (bytes <= 0) {
-		if (buffer)
-			free(buffer);
+	if (bytes == -1)
 		return false;
-	}
-	p = buffer;
-	rc = true;
-	while (*argv) {
-		if (strcmp(*argv, p) != 0) {
-			rc = false;
-			break;
-		}

+	buffer[bytes] = '\0';
+	p = buffer;
+	while (*argv) {
+		if (strcmp(*argv, p) != 0)
+			return false;
 		argv++;
 		p += strlen(p) + 1;
-		if ((unsigned)(p - buffer) >= bytes) {
-			rc = false;
-			break;
-		}
+		if ((unsigned)(p - buffer) > sizeof(buffer))
+			return false;
 	}
-	free(buffer);
-	return rc;
+	return true;
 }

 RC_PIDLIST *
@@ -147,7 +141,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';
 	}
@@ -161,7 +155,7 @@ rc_find_pids(const char *exec, const char *const *argv, uid_t uid, pid_t pid)
 			continue;
 		xasprintf(&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';
 		}
--- a/src/librc/librc-depend.c
+++ b/src/librc/librc-depend.c
@@ -84,11 +84,10 @@ 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;
 }

@@ -97,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;
 }

@@ -619,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
--- a/src/librc/librc-misc.c
+++ b/src/librc/librc-misc.c
@@ -277,6 +277,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();

@@ -294,6 +295,7 @@ static RC_STRINGLIST *rc_config_kcl(RC_STRINGLIST *config)
 		}

 		if (value != NULL) {
+			len = varlen + strlen(value) + 2;
 			xasprintf(&tmp, "%s=%s", override->value, value);
 		}

@@ -423,7 +425,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) {
--- a/src/librc/librc.c
+++ b/src/librc/librc.c
@@ -558,7 +558,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);
 	}
@@ -1047,6 +1047,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;

@@ -1067,7 +1068,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;
 		}
--- a/src/rc/broadcast.c
+++ b/src/rc/broadcast.c
@@ -37,6 +37,10 @@
 # define _PATH_DEV	"/dev/"
 #endif

+#ifndef UT_LINESIZE
+#define UT_LINESIZE __UT_LINESIZE
+#endif
+
 static sigjmp_buf jbuf;

 /*
@@ -58,7 +62,7 @@ static void getuidtty(char **userp, char **ttyp)
 	uid_t			uid;
 	char			*tty;
 	static char		uidbuf[32];
-	char		*ttynm = NULL;
+	static char		ttynm[UT_LINESIZE + 4];

 	uid = getuid();
 	if ((pwd = getpwuid(uid)) != NULL) {
@@ -78,8 +82,10 @@ static void getuidtty(char **userp, char **ttyp)
 			if (tty[0] == '/')
 				tty++;
 		}
-		xasprintf(&ttynm, "(%s) ", tty);
-	}
+		snprintf(ttynm, sizeof(ttynm), "(%.*s) ",
+				 UT_LINESIZE, tty);
+	} else
+		ttynm[0] = 0;

 	*userp = uidbuf;
 	*ttyp  = ttynm;
@@ -127,7 +133,7 @@ void broadcast(char *text)
 	char *p;
 	char *line = NULL;
 	struct sigaction sa;
-	volatile int fd;
+	int fd;
 	FILE *tp;
 	int	flags;
 	char *term = NULL;
@@ -150,7 +156,6 @@ void broadcast(char *text)
 	
 	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()
--- a/src/rc/openrc-init.c
+++ b/src/rc/openrc-init.c
@@ -31,10 +31,6 @@
 #include <sys/reboot.h>
 #include <sys/wait.h>

-#ifdef HAVE_SELINUX
-#  include <selinux/selinux.h>
-#endif
-
 #include "helpers.h"
 #include "rc.h"
 #include "rc-wtmp.h"
@@ -165,36 +161,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)
--- a/src/rc/openrc-run.c
+++ b/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);
--- a/src/rc/openrc-shutdown.c
+++ b/src/rc/openrc-shutdown.c
@@ -67,15 +67,7 @@ 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: openmrc-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";
@@ -119,8 +111,8 @@ static void create_nologin(int mins)
 	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);
+  		fprintf(fp, "\rThe system is going down on %s\r\n", ctime(&t));
+  		fclose(fp);
 	}
 }

@@ -130,7 +122,7 @@ static void create_nologin(int mins)
 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);
@@ -162,13 +154,15 @@ static void sleep_no_interrupt(int seconds)
 	duration.tv_sec = seconds;
 	duration.tv_nsec = 0;

-	while (nanosleep(&duration, &remaining) < 0 && errno == EINTR)
+	while(nanosleep(&duration, &remaining) < 0 && errno == EINTR)
 		duration = remaining;
 }

 static void stop_shutdown(int sig)
 {
-	(void) sig;
+	/* use the sig parameter so the compiler will not complain */
+	if (sig == SIGINT)
+		;
 	unlink(nologin_file);
 	unlink(shutdown_pid);
 einfo("Shutdown canceled");
--- a/src/rc/rc-schedules.c
+++ b/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"))) {
@@ -389,7 +376,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;
--- a/src/rc/rc-status.c
+++ b/src/rc/rc-status.c
@@ -27,40 +27,31 @@
 #include "rc-misc.h"
 #include "_usage.h"

-enum format_t {
-	FORMAT_DEFAULT,
-	FORMAT_INI,
-};
-
 const char *applet = NULL;
 const char *extraopts = NULL;
-const char *getoptstring = "acf:lmrsSu" getoptstring_COMMON;
+const char *getoptstring = "aclmrsu" getoptstring_COMMON;
 const struct option longopts[] = {
 	{"all",         0, NULL, 'a'},
 	{"crashed",     0, NULL, 'c'},
-	{"format",     1, NULL, 'f'},
 	{"list",        0, NULL, 'l'},
 	{"manual",        0, NULL, 'm'},
 	{"runlevel",    0, NULL, 'r'},
 	{"servicelist", 0, NULL, 's'},
-	{"supervised", 0, NULL, 'S'},
 	{"unused",      0, NULL, 'u'},
 	longopts_COMMON
 };
 const char * const longopts_help[] = {
 	"Show services from all run levels",
 	"Show crashed services",
-	"format status to be parsable (currently arg must be ini)",
 	"Show list of run levels",
 	"Show manually started services",
 	"Show the name of the current runlevel",
 	"Show service list",
-	"show supervised services",
 	"Show services not assigned to any runlevel",
 	longopts_help_COMMON
 };
 const char *usagestring = ""						\
-	"Usage: rc-status [options] -f ini <runlevel>...\n"		\
+	"Usage: rc-status [options] <runlevel>...\n"		\
 	"   or: rc-status [options] [-a | -c | -l | -m | -r | -s | -u]";

 static RC_DEPTREE *deptree;
@@ -69,27 +60,19 @@ static RC_STRINGLIST *types;
 static RC_STRINGLIST *levels, *services, *tmp, *alist;
 static RC_STRINGLIST *sservices, *nservices, *needsme;

-static void print_level(const char *prefix, const char *level,
-		enum format_t format)
+static void
+print_level(const char *prefix, const char *level)
 {
-	switch (format) {
-	case FORMAT_DEFAULT:
-		if (prefix)
-			printf("%s ", prefix);
-		printf ("Runlevel: ");
-		if (isatty(fileno(stdout)))
-			printf("%s%s%s\n",
-					ecolor(ECOLOR_HILITE), level, ecolor(ECOLOR_NORMAL));
-		else
-			printf("%s\n", level);
-		break;
-	case FORMAT_INI:
-		printf("%s", "[");
-		if (prefix)
-			printf("%s ", prefix);
-		printf("%s]\n", level);
-		break;
-	}
+	if (prefix)
+		printf("%s ", prefix);
+	printf ("Runlevel: ");
+	if (isatty(fileno(stdout)))
+		printf("%s%s%s\n",
+		       ecolor(ECOLOR_HILITE),
+		       level,
+		       ecolor(ECOLOR_NORMAL));
+	else
+		printf("%s\n", level);
 }

 static char *get_uptime(const char *service)
@@ -140,13 +123,14 @@ static char *get_uptime(const char *service)
 	return uptime;
 }

-static void print_service(const char *service, enum format_t format)
+static void
+print_service(const char *service)
 {
 	char *status = NULL;
 	char *uptime = NULL;
 	char *child_pid = NULL;
 	char *start_time = NULL;
-	int cols;
+	int cols =  printf(" %s", service);
 	const char *c = ecolor(ECOLOR_GOOD);
 	RC_SERVICE state = rc_service_state(service);
 	ECOLOR color = ECOLOR_BAD;
@@ -183,29 +167,18 @@ static void print_service(const char *service, enum format_t format)
 	} else if (state & RC_SERVICE_SCHEDULED) {
 		xasprintf(&status, "scheduled");
 		color = ECOLOR_WARN;
-	} else if (state & RC_SERVICE_FAILED) {
-		xasprintf(&status, "failed");
-		color = ECOLOR_WARN;
 	} else
 		xasprintf(&status, " stopped ");

 	errno = 0;
-	switch (format) {
-	case FORMAT_DEFAULT:
-		cols =  printf(" %s", service);
-		if (c && *c && isatty(fileno(stdout)))
-			printf("\n");
-		ebracket(cols, color, status);
-		break;
-	case FORMAT_INI:
-		printf("%s = %s\n", service, status);
-		break;
-	}
+	if (c && *c && isatty(fileno(stdout)))
+		printf("\n");
+	ebracket(cols, color, status);
 	free(status);
 }

-static void print_services(const char *runlevel, RC_STRINGLIST *svcs,
-		enum format_t format)
+static void
+print_services(const char *runlevel, RC_STRINGLIST *svcs)
 {
 	RC_STRINGLIST *l = NULL;
 	RC_STRING *s;
@@ -219,7 +192,7 @@ static void print_services(const char *runlevel, RC_STRINGLIST *svcs,
 		TAILQ_FOREACH(s, svcs, entries)
 			if (!runlevel ||
 			    rc_service_in_runlevel(s->value, runlevel))
-				print_service(s->value, format);
+				print_service(s->value);
 		return;
 	}
 	if (!types) {
@@ -239,12 +212,13 @@ static void print_services(const char *runlevel, RC_STRINGLIST *svcs,
 		if (!rc_stringlist_find(svcs, s->value))
 			continue;
 		if (!runlevel || rc_service_in_runlevel(s->value, runlevel))
-			print_service(s->value, format);
+			print_service(s->value);
 	}
 	rc_stringlist_free(l);
 }

-static void print_stacked_services(const char *runlevel, enum format_t format)
+static void
+print_stacked_services(const char *runlevel)
 {
 	RC_STRINGLIST *stackedlevels, *servicelist;
 	RC_STRING *stackedlevel;
@@ -253,9 +227,9 @@ static void print_stacked_services(const char *runlevel, enum format_t format)
 	TAILQ_FOREACH(stackedlevel, stackedlevels, entries) {
 		if (rc_stringlist_find(levels, stackedlevel->value) != NULL)
 			continue;
-		print_level("Stacked", stackedlevel->value, format);
+		print_level("Stacked", stackedlevel->value);
 		servicelist = rc_services_in_runlevel(stackedlevel->value);
-		print_services(stackedlevel->value, servicelist, format);
+		print_services(stackedlevel->value, servicelist);
 		rc_stringlist_free(servicelist);
 	}
 	rc_stringlist_free(stackedlevels);
@@ -264,10 +238,7 @@ static void print_stacked_services(const char *runlevel, enum format_t format)

 int main(int argc, char **argv)
 {
-	RC_SERVICE state;
-	RC_STRING *s, *l, *t, *level;
-	enum format_t format = FORMAT_DEFAULT;
-	bool levels_given = false;
+    RC_STRING *s, *l, *t, *level;
 	bool show_all = false;
 	char *p, *runlevel = NULL;
 	int opt, retval = 0;
@@ -290,12 +261,6 @@ int main(int argc, char **argv)
 				}
 			goto exit;
 			/* NOTREACHED */
-		case 'f':
-			if (strcasecmp(optarg, "ini") == 0)
-				format = FORMAT_INI;
-			else
-				eerrorx("%s: invalid argument to --format switch\n", applet);
-			break;
 		case 'l':
 			levels = rc_runlevel_list();
 			TAILQ_FOREACH(l, levels, entries)
@@ -320,24 +285,16 @@ int main(int argc, char **argv)
 					free(s->value);
 					free(s);
 				}
-			print_services(NULL, services, FORMAT_DEFAULT);
+			print_services(NULL, services);
 			goto exit;
 		case 'r':
 			runlevel = rc_runlevel_get();
 			printf("%s\n", runlevel);
 			goto exit;
 			/* NOTREACHED */
-		case 'S':
-			services = rc_services_in_state(RC_SERVICE_STARTED);
-			TAILQ_FOREACH_SAFE(s, services, entries, t)
-				if (!rc_service_value_get(s->value, "child_pid"))
-					TAILQ_REMOVE(services, s, entries);
-			print_services(NULL, services, FORMAT_DEFAULT);
-			goto exit;
-			/* NOTREACHED */
 		case 's':
 			services = rc_services_in_runlevel(NULL);
-			print_services(NULL, services, FORMAT_DEFAULT);
+			print_services(NULL, services);
 			goto exit;
 			/* NOTREACHED */
 		case 'u':
@@ -352,7 +309,7 @@ int main(int argc, char **argv)
 						break;
 					}
 			}
-			print_services(NULL, services, FORMAT_DEFAULT);
+			print_services(NULL, services);
 			goto exit;
 			/* NOTREACHED */

@@ -364,7 +321,6 @@ int main(int argc, char **argv)
 	opt = (optind < argc) ? 0 : 1;
 	while (optind < argc) {
 		if (rc_runlevel_exists(argv[optind])) {
-			levels_given = true;
 			rc_stringlist_add(levels, argv[optind++]);
 			opt++;
 		} else
@@ -381,21 +337,21 @@ int main(int argc, char **argv)
 	deptree = _rc_deptree_load(0, NULL);

 	TAILQ_FOREACH(l, levels, entries) {
-		print_level(NULL, l->value, format);
+		print_level(NULL, l->value);
 		services = rc_services_in_runlevel(l->value);
-		print_services(l->value, services, format);
-		print_stacked_services(l->value, format);
+		print_services(l->value, services);
+		print_stacked_services(l->value);
 		rc_stringlist_free(nservices);
 		nservices = NULL;
 		rc_stringlist_free(services);
 		services = NULL;
 	}

-	if (show_all || !levels_given) {
+	if (show_all || argc < 2) {
 		/* Show hotplugged services */
-		print_level("Dynamic", "hotplugged", format);
+		print_level("Dynamic", "hotplugged");
 		services = rc_services_in_state(RC_SERVICE_HOTPLUGGED);
-		print_services(NULL, services, format);
+		print_services(NULL, services);
 		rc_stringlist_free(services);
 		services = NULL;

@@ -417,14 +373,11 @@ int main(int argc, char **argv)
 			free(nservices);
 		}
 		TAILQ_FOREACH_SAFE(s, services, entries, t) {
-			state = rc_service_state(s->value);
 			if ((rc_stringlist_find(sservices, s->value) ||
-			    (state & ( RC_SERVICE_STOPPED | RC_SERVICE_HOTPLUGGED)))) {
-				if (! (state & RC_SERVICE_FAILED)) {
-					TAILQ_REMOVE(services, s, entries);
-					free(s->value);
-					free(s);
-				}
+			    (rc_service_state(s->value) & ( RC_SERVICE_STOPPED | RC_SERVICE_HOTPLUGGED)))) {
+				TAILQ_REMOVE(services, s, entries);
+				free(s->value);
+				free(s);
 			}
 		}
 		needsme = rc_stringlist_new();
@@ -452,10 +405,10 @@ int main(int argc, char **argv)
 		 * be added to the list
 		 */
 		unsetenv("RC_SVCNAME");
-		print_level("Dynamic", "needed/wanted", format);
-		print_services(NULL, nservices, format);
-		print_level("Dynamic", "manual", format);
-		print_services(NULL, services, format);
+		print_level("Dynamic", "needed/wanted");
+		print_services(NULL, nservices);
+		print_level("Dynamic", "manual");
+		print_services(NULL, services);
 	}

 exit:
--- a/src/rc/rc-wtmp.c
+++ b/src/rc/rc-wtmp.c
@@ -43,8 +43,8 @@ void log_wtmp(const char *user, const char *id, pid_t pid, int type,
 	strncpy(utmp.ut_id  , id  , sizeof(utmp.ut_id  ));
 	strncpy(utmp.ut_line, line, sizeof(utmp.ut_line));

-	/* Put the OS version in place of the hostname */
-	if (uname(&uname_buf) == 0)
+        /* Put the OS version in place of the hostname */
+        if (uname(&uname_buf) == 0)
 		strncpy(utmp.ut_host, uname_buf.release, sizeof(utmp.ut_host));

 	updwtmp(WTMP_FILE, &utmp);
--- a/src/rc/start-stop-daemon.c
+++ b/src/rc/start-stop-daemon.c
@@ -492,7 +492,7 @@ int main(int argc, char **argv)
 			startas = optarg;
 			break;
 		case 'w':
-			if (sscanf(optarg, "%u", &start_wait) != 1)
+			if (sscanf(optarg, "%d", &start_wait) != 1)
 				eerrorx("%s: `%s' not a number",
 				    applet, optarg);
 			break;
@@ -547,7 +547,7 @@ int main(int argc, char **argv)
 	} else if (name) {
 		*--argv = name;
 		++argc;
-	} else if (exec) {
+    } else if (exec) {
 		*--argv = exec;
 		++argc;
 	};
@@ -996,7 +996,9 @@ int main(int argc, char **argv)
 		ts.tv_sec = start_wait / 1000;
 		ts.tv_nsec = (start_wait % 1000) * ONE_MS;
 		if (nanosleep(&ts, NULL) == -1) {
-			if (errno != EINTR) {
+			if (errno == EINTR)
+				eerror("%s: caught an interrupt", applet);
+			else {
 				eerror("%s: nanosleep: %s",
 				    applet, strerror(errno));
 				return 0;
--- a/src/rc/supervise-daemon.c
+++ b/src/rc/supervise-daemon.c
@@ -68,7 +68,7 @@ static struct pam_conv conv = { NULL, NULL};

 const char *applet = NULL;
 const char *extraopts = NULL;
-const char *getoptstring = "A:a:D:d:e:g:H:I:Kk:m:N:p:R:r:s:Su:1:2:3" \
+const char *getoptstring = "A:a:D:d:e:g:H:I:Kk:m:N:p:R:r:Su:1:2:3" \
 	getoptstring_COMMON;
 const struct option longopts[] = {
 	{ "healthcheck-timer",        1, NULL, 'a'},
@@ -86,7 +86,6 @@ const struct option longopts[] = {
 	{ "respawn-period",        1, NULL, 'P'},
 	{ "retry",       1, NULL, 'R'},
 	{ "chroot",       1, NULL, 'r'},
-	{ "signal",       1, NULL, 's'},
 	{ "start",        0, NULL, 'S'},
 	{ "user",         1, NULL, 'u'},
 	{ "stdout",       1, NULL, '1'},
@@ -110,7 +109,6 @@ const char * const longopts_help[] = {
 	"Set respawn time period",
 	"Retry schedule to use when stopping",
 	"Chroot to this directory",
-	"Send a signal to the daemon",
 	"Start daemon",
 	"Change the process user",
 	"Redirect stdout to file",
@@ -123,7 +121,6 @@ const char *usagestring = NULL;
 static int healthcheckdelay = 0;
 static int healthchecktimer = 0;
 static volatile sig_atomic_t do_healthcheck = 0;
-static volatile sig_atomic_t exiting = 0;
 static int nicelevel = 0;
 static int ionicec = -1;
 static int ioniced = 0;
@@ -136,6 +133,7 @@ static int stdout_fd;
 static int stderr_fd;
 static char *redirect_stderr = NULL;
 static char *redirect_stdout = NULL;
+static bool exiting = false;
 #ifdef TIOCNOTTY
 static int tty_fd = -1;
 #endif
@@ -143,9 +141,7 @@ static pid_t child_pid;
 static int respawn_count = 0;
 static int respawn_delay = 0;
 static int respawn_max = 10;
-static int respawn_period = 0;
-static char *fifopath = NULL;
-static int fifo_fd = 0;
+static int respawn_period = 5;
 static char *pidfile = NULL;
 static char *svcname = NULL;

@@ -184,32 +180,31 @@ static void re_exec_supervisor(void)
 static void handle_signal(int sig)
 {
 	int serrno = errno;
-	pid_t pid;

-	switch (sig) {
-	case SIGALRM:
-		do_healthcheck = 1;
-		break;
-	case SIGCHLD:
-		if (exiting)
-			while (waitpid((pid_t)(-1), NULL, WNOHANG) > 0) {}
-		else {
-			while ((pid = waitpid((pid_t)(-1), NULL, WNOHANG|WNOWAIT)) > 0) {
-				if (pid == child_pid)
-					break;
-				pid = waitpid(pid, NULL, WNOHANG);
-			}
-		}
-		break;
-	case SIGTERM:
-		exiting = 1;
-		break;
-	default:
-		syslog(LOG_WARNING, "caught signal %d", sig);
-		re_exec_supervisor();
-	}
+	syslog(LOG_WARNING, "caught signal %d", sig);
+
+	if (sig == SIGTERM)
+		exiting = true;
 	/* Restore errno */
 	errno = serrno;
+	if (! exiting)
+		re_exec_supervisor();
+}
+
+static void healthcheck(int sig)
+{
+	if (sig == SIGALRM)
+		do_healthcheck = 1;
+}
+
+static void reap_zombies(int sig)
+{
+	int serrno;
+	(void) sig;
+
+	serrno = errno;
+	while (waitpid((pid_t)(-1), NULL, WNOHANG) > 0) {}
+	errno = serrno;
 }

 static char * expand_home(const char *home, const char *path)
@@ -237,7 +232,7 @@ static char * expand_home(const char *home, const char *path)
 		ppath++;

 	if (!home) {
-		free(opath);
+	free(opath);
 		return xstrdup(path);
 	}
 	if (!ppath) {
@@ -267,56 +262,6 @@ static char *make_cmdline(char **argv)
 	return cmdline;
 }

-static pid_t exec_command(const char *cmd)
-{
-	char *file;
-	pid_t pid = -1;
-	sigset_t full;
-	sigset_t old;
-	struct sigaction sa;
-
-	file = rc_service_resolve(svcname);
-	if (!exists(file)) {
-		free(file);
-		return 0;
-	}
-
-	/* We need to block signals until we have forked */
-	memset(&sa, 0, sizeof (sa));
-	sa.sa_handler = SIG_DFL;
-	sigemptyset(&sa.sa_mask);
-	sigfillset(&full);
-	sigprocmask(SIG_SETMASK, &full, &old);
-
-	pid = fork();
-	if (pid == 0) {
-		/* Restore default handlers */
-		sigaction(SIGCHLD, &sa, NULL);
-		sigaction(SIGHUP, &sa, NULL);
-		sigaction(SIGINT, &sa, NULL);
-		sigaction(SIGQUIT, &sa, NULL);
-		sigaction(SIGTERM, &sa, NULL);
-		sigaction(SIGUSR1, &sa, NULL);
-		sigaction(SIGWINCH, &sa, NULL);
-
-		/* Unmask signals */
-		sigprocmask(SIG_SETMASK, &old, NULL);
-
-		/* Safe to run now */
-		execl(file, file, cmd, (char *) NULL);
-		syslog(LOG_ERR, "unable to exec `%s': %s\n",
-		    file, strerror(errno));
-		_exit(EXIT_FAILURE);
-	}
-
-	if (pid == -1)
-		syslog(LOG_ERR, "fork: %s\n",strerror (errno));
-
-	sigprocmask(SIG_SETMASK, &old, NULL);
-	free(file);
-	return pid;
-}
-
 static void child_process(char *exec, char **argv)
 {
 	RC_STRINGLIST *env_list;
@@ -502,40 +447,57 @@ static void child_process(char *exec, char **argv)
 static void supervisor(char *exec, char **argv)
 {
 	FILE *fp;
-	char buf[2048];
-	char cmd[2048];
-	int count;
-	int failing;
-	int health_status;
-	int healthcheck_respawn;
+	pid_t wait_pid;
 	int i;
 	int nkilled;
-	int sig_send;
-	pid_t health_pid;
-	pid_t wait_pid;
-	sigset_t old_signals;
-	sigset_t signals;
-	struct sigaction sa;
 	struct timespec ts;
 	time_t respawn_now= 0;
 	time_t first_spawn= 0;
+	pid_t health_pid;
+	int health_status;

-	/* block all signals we do not handle */
-	sigfillset(&signals);
-	sigdelset(&signals, SIGALRM);
-	sigdelset(&signals, SIGCHLD);
-	sigdelset(&signals, SIGTERM);
-	sigprocmask(SIG_SETMASK, &signals, &old_signals);
-
-	/* install signal  handler */
-	memset(&sa, 0, sizeof(sa));
-	sa.sa_handler = handle_signal;
-	sigaction(SIGALRM, &sa, NULL);
-	sigaction(SIGCHLD, &sa, NULL);
-	sigaction(SIGTERM, &sa, NULL);
+#ifndef RC_DEBUG
+	signal_setup_restart(SIGHUP, handle_signal);
+	signal_setup_restart(SIGINT, handle_signal);
+	signal_setup_restart(SIGQUIT, handle_signal);
+	signal_setup_restart(SIGILL, handle_signal);
+	signal_setup_restart(SIGABRT, handle_signal);
+	signal_setup_restart(SIGFPE, handle_signal);
+	signal_setup_restart(SIGSEGV, handle_signal);
+	signal_setup_restart(SIGPIPE, handle_signal);
+	signal_setup_restart(SIGALRM, handle_signal);
+	signal_setup(SIGTERM, handle_signal);
+	signal_setup(SIGCHLD, reap_zombies);
+	signal_setup_restart(SIGUSR1, handle_signal);
+	signal_setup_restart(SIGUSR2, handle_signal);
+	signal_setup_restart(SIGBUS, handle_signal);
+#ifdef SIGPOLL
+	signal_setup_restart(SIGPOLL, handle_signal);
+#endif
+	signal_setup_restart(SIGPROF, handle_signal);
+	signal_setup_restart(SIGSYS, handle_signal);
+	signal_setup_restart(SIGTRAP, handle_signal);
+	signal_setup_restart(SIGVTALRM, handle_signal);
+	signal_setup_restart(SIGXCPU, handle_signal);
+	signal_setup_restart(SIGXFSZ, handle_signal);
+#ifdef SIGEMT
+	signal_setup_restart(SIGEMT, handle_signal);
+#endif
+	signal_setup_restart(SIGIO, handle_signal);
+#ifdef SIGPWR
+	signal_setup_restart(SIGPWR, handle_signal);
+#endif
+#ifdef SIGUNUSED
+	signal_setup_restart(SIGUNUSED, handle_signal);
+#endif
+#ifdef SIGRTMIN
+	for (i = SIGRTMIN; i <= SIGRTMAX; i++)
+		signal_setup_restart(i, handle_signal);
+#endif
+#endif

 	fp = fopen(pidfile, "w");
-	if (!fp)
+	if (! fp)
 		eerrorx("%s: fopen `%s': %s", applet, pidfile, strerror(errno));
 	fprintf(fp, "%d\n", getpid());
 	fclose(fp);
@@ -553,131 +515,100 @@ static void supervisor(char *exec, char **argv)
 	/*
 	 * Supervisor main loop
 	 */
-	if (healthcheckdelay)
+	i = 0;
+	if (healthcheckdelay) {
+		signal_setup(SIGALRM, healthcheck);
 		alarm(healthcheckdelay);
-	else if (healthchecktimer)
+	} else if (healthchecktimer) {
+		signal_setup(SIGALRM, healthcheck);
 		alarm(healthchecktimer);
-	failing = 0;
+	}
 	while (!exiting) {
-		healthcheck_respawn = 0;
-		fifo_fd = open(fifopath, O_RDONLY);
-		if (fifo_fd > 0) {
-			memset(buf, 0, sizeof(buf));
-			count = read(fifo_fd, buf, sizeof(buf) - 1);
-			close(fifo_fd);
-			if (count != -1)
-				buf[count] = 0;
-			if (count == 0)
-				continue;
-			syslog(LOG_DEBUG, "Received %s from fifo", buf);
-			if (strncasecmp(buf, "sig", 3) == 0) {
-				if ((sscanf(buf, "%s %d", cmd, &sig_send) == 2)
-						&& (sig_send >= 0 && sig_send < NSIG)) {
-					syslog(LOG_INFO, "Sending signal %d to %d", sig_send,
-							child_pid);
-					if (kill(child_pid, sig_send) == -1)
-						syslog(LOG_ERR, "Unable to send signal %d to %d",
-								sig_send, child_pid);
+		wait_pid = wait(&i);
+		if (wait_pid == -1) {
+			if (do_healthcheck) {
+				do_healthcheck = 0;
+				alarm(0);
+				syslog(LOG_DEBUG, "running health check for %s", svcname);
+				health_pid = exec_service(svcname, "healthcheck");
+				health_status = rc_waitpid(health_pid);
+				if (WIFEXITED(health_status) && !WEXITSTATUS(health_status)) {
+					alarm(healthchecktimer);
+					continue;
+				} else {
+					syslog(LOG_WARNING, "health check for %s failed", svcname);
+					health_pid = exec_service(svcname, "unhealthy");
+					rc_waitpid(health_pid);
+					syslog(LOG_INFO, "stopping %s, pid %d", exec, child_pid);
+					nkilled = run_stop_schedule(applet, NULL, NULL, child_pid, 0,
+							false, false, true);
+					if (nkilled > 0)
+						syslog(LOG_INFO, "killed %d processes", nkilled);
+					else if (errno != 0)
+						syslog(LOG_INFO, "Unable to kill %d: %s",
+								child_pid, strerror(errno));
 				}
-			}
-			continue;
-		}
-		if (do_healthcheck) {
-			do_healthcheck = 0;
-			alarm(0);
-			syslog(LOG_DEBUG, "running health check for %s", svcname);
-			health_pid = exec_command("healthcheck");
-			health_status = rc_waitpid(health_pid);
-			if (WIFEXITED(health_status) && WEXITSTATUS(health_status) == 0)
-				alarm(healthchecktimer);
-			else {
-				syslog(LOG_WARNING, "health check for %s failed", svcname);
-				health_pid = exec_command("unhealthy");
-				rc_waitpid(health_pid);
+			} else if (exiting ) {
+				alarm(0);
 				syslog(LOG_INFO, "stopping %s, pid %d", exec, child_pid);
-				nkilled = run_stop_schedule(applet, NULL, NULL, child_pid, 0,
+				nkilled = run_stop_schedule(applet, exec, NULL, child_pid, 0,
 						false, false, true);
-				if (nkilled < 0)
-					syslog(LOG_INFO, "Unable to kill %d: %s",
-							child_pid, strerror(errno));
-				else
-					healthcheck_respawn = 1;
+				if (nkilled > 0)
+					syslog(LOG_INFO, "killed %d processes", nkilled);
+				continue;
 			}
-		}
-		if (exiting) {
-			alarm(0);
-			syslog(LOG_INFO, "stopping %s, pid %d", exec, child_pid);
-			nkilled = run_stop_schedule(applet, NULL, NULL, child_pid, 0,
-					false, false, true);
-			if (nkilled > 0)
-				syslog(LOG_INFO, "killed %d processes", nkilled);
-			continue;
-		}
-		wait_pid = waitpid(child_pid, &i, WNOHANG);
-		if (wait_pid == child_pid) {
+		} else if (wait_pid == child_pid) {
 			if (WIFEXITED(i))
 				syslog(LOG_WARNING, "%s, pid %d, exited with return code %d",
 						exec, child_pid, WEXITSTATUS(i));
 			else if (WIFSIGNALED(i))
 				syslog(LOG_WARNING, "%s, pid %d, terminated by signal %d",
 						exec, child_pid, WTERMSIG(i));
-		}
-		if (wait_pid == child_pid || healthcheck_respawn) {
-			do_healthcheck = 0;
-			healthcheck_respawn = 0;
-			alarm(0);
+		} else
+			continue;
+
+		ts.tv_sec = respawn_delay;
+		ts.tv_nsec = 0;
+		nanosleep(&ts, NULL);
+		if (respawn_max > 0 && respawn_period > 0) {
 			respawn_now = time(NULL);
 			if (first_spawn == 0)
 				first_spawn = respawn_now;
-			if ((respawn_period > 0)
-					&& (respawn_now - first_spawn > respawn_period)) {
+			if (respawn_now - first_spawn > respawn_period) {
 				respawn_count = 0;
 				first_spawn = 0;
 			} else
 				respawn_count++;
-			if (respawn_max > 0 && respawn_count > respawn_max) {
-				syslog(LOG_WARNING, "respawned \"%s\" too many times, exiting",
-						exec);
-				exiting = 1;
-				failing = 1;
+			if (respawn_count > respawn_max) {
+				syslog(LOG_WARNING,
+						"respawned \"%s\" too many times, exiting", exec);
+				exiting = true;
 				continue;
 			}
-			ts.tv_sec = respawn_delay;
-			ts.tv_nsec = 0;
-			nanosleep(&ts, NULL);
-			child_pid = fork();
-			if (child_pid == -1) {
-				syslog(LOG_ERR, "%s: fork: %s", applet, strerror(errno));
-				exit(EXIT_FAILURE);
-			}
-			if (child_pid == 0) {
-				sigprocmask(SIG_SETMASK, &old_signals, NULL);
-				memset(&sa, 0, sizeof(sa));
-				sa.sa_handler = SIG_DFL;
-				sigaction(SIGALRM, &sa, NULL);
-				sigaction(SIGCHLD, &sa, NULL);
-				sigaction(SIGTERM, &sa, NULL);
-				child_process(exec, argv);
-			}
-			if (healthcheckdelay)
-				alarm(healthcheckdelay);
-			else if (healthchecktimer)
-				alarm(healthchecktimer);
+		}
+		alarm(0);
+		child_pid = fork();
+		if (child_pid == -1)
+			eerrorx("%s: fork: %s", applet, strerror(errno));
+		if (child_pid == 0)
+			child_process(exec, argv);
+		if (healthcheckdelay) {
+			signal_setup(SIGALRM, healthcheck);
+			alarm(healthcheckdelay);
+		} else if (healthchecktimer) {
+			signal_setup(SIGALRM, healthcheck);
+			alarm(healthchecktimer);
 		}
 	}

+	if (pidfile && exists(pidfile))
+		unlink(pidfile);
 	if (svcname) {
 		rc_service_daemon_set(svcname, exec, (const char *const *)argv,
 				pidfile, false);
-		rc_service_value_set(svcname, "child_pid", NULL);
 		rc_service_mark(svcname, RC_SERVICE_STOPPED);
-		if (failing)
-			rc_service_mark(svcname, RC_SERVICE_FAILED);
+		rc_service_value_set(svcname, "child_pid", NULL);
 	}
-	if (pidfile && exists(pidfile))
-		unlink(pidfile);
-	if (fifopath && exists(fifopath))
-		unlink(fifopath);
 	exit(EXIT_SUCCESS);
 }

@@ -689,7 +620,6 @@ int main(int argc, char **argv)
 	bool start = false;
 	bool stop = false;
 	bool reexec = false;
-	bool sendsig = false;
 	char *exec = NULL;
 	char *retry = NULL;
 	int sig = SIGTERM;
@@ -720,7 +650,7 @@ int main(int argc, char **argv)
 		eerrorx("%s: The RC_SVCNAME environment variable is not set", applet);
 	openlog(applet, LOG_PID, LOG_DAEMON);

-	if (argc <= 1 || strcmp(argv[1], svcname))
+	if (argc >= 1 && svcname && strcmp(argv[1], svcname))
 		eerrorx("%s: the first argument is %s and must be %s",
 				applet, argv[1], svcname);

@@ -795,10 +725,6 @@ int main(int argc, char **argv)
 				eerrorx("Invalid respawn-period value '%s'", optarg);
 			break;

-		case 's':  /* --signal */
-			sig = parse_signal(applet, optarg);
-			sendsig = true;
-			break;
 		case 'S':  /* --start */
 			start = true;
 			break;
@@ -904,6 +830,8 @@ int main(int argc, char **argv)
 		case_RC_COMMON_GETOPT
 		}

+	if (!pidfile && !reexec)
+		eerrorx("%s: --pidfile must be specified", applet);
 	endpwent();
 	argc -= optind;
 	argv += optind;
@@ -916,12 +844,6 @@ int main(int argc, char **argv)
 		ch_root = expand_home(home, ch_root);

 	umask(numask);
-	if (!pidfile)
-		xasprintf(&pidfile, "/var/run/supervise-%s.pid", svcname);
-	xasprintf(&fifopath, "%s/supervise-%s.ctl", RC_SVCDIR, svcname);
-	if (mkfifo(fifopath, 0600) == -1 && errno != EEXIST)
-		eerrorx("%s: unable to create control fifo: %s",
-				applet, strerror(errno));

 	if (reexec) {
 		str = rc_service_value_get(svcname, "argc");
@@ -996,7 +918,7 @@ int main(int argc, char **argv)
 						0, false, true) > 0)
 				eerrorx("%s: %s is already running", applet, exec);

-		if (respawn_period > 0 && respawn_delay * respawn_max > respawn_period)
+		if (respawn_delay * respawn_max > respawn_period)
 			ewarn("%s: Please increase the value of --respawn-period to more "
 				"than %d to avoid infinite respawning", applet,
 				respawn_delay * respawn_max);
@@ -1043,9 +965,6 @@ int main(int argc, char **argv)
 		tty_fd = open("/dev/tty", O_RDWR);
 #endif
 		devnull_fd = open("/dev/null", O_RDWR);
-		dup2(devnull_fd, STDIN_FILENO);
-		dup2(devnull_fd, STDOUT_FILENO);
-		dup2(devnull_fd, STDERR_FILENO);
 		child_pid = fork();
 		if (child_pid == -1)
 			eerrorx("%s: fork: %s", applet, strerror(errno));
@@ -1062,8 +981,8 @@ int main(int argc, char **argv)
 				c++;
 			}
 			xasprintf(&varbuf, "%d", x);
-			rc_service_value_set(svcname, "argc", varbuf);
-			free(varbuf);
+				rc_service_value_set(svcname, "argc", varbuf);
+				free(varbuf);
 			rc_service_value_set(svcname, "exec", exec);
 			supervisor(exec, argv);
 		} else
@@ -1098,18 +1017,5 @@ int main(int argc, char **argv)
 			rc_service_mark(svcname, RC_SERVICE_STOPPED);
 		}
 		exit(EXIT_SUCCESS);
-	} else if (sendsig) {
-		fifo_fd = open(fifopath, O_WRONLY |O_NONBLOCK);
-		if (fifo_fd < 0)
-			eerrorx("%s: unable to open control fifo %s", applet, strerror(errno));
-		xasprintf(&str, "sig %d", sig);
-		x = write(fifo_fd, str, strlen(str));
-		if (x == -1) {
-			free(tmp);
-			eerrorx("%s: error writing to control fifo: %s", applet,
-					strerror(errno));
-		}
-		free(tmp);
-		exit(EXIT_SUCCESS);
 	}
 }
--- a/src/test/.gitignore
+++ b/src/test/.gitignore
@@ -0,0 +1,6 @@
+einfo.data.out
+einfo.funcs.out
+librc.funcs.hidden.out
+librc.funcs.hidden.list
+rc.data.out
+rc.funcs.out
--- a/src/test/Makefile
+++ b/src/test/Makefile
--- a/src/test/einfo.data.list
+++ b/src/test/einfo.data.list
@@ -0,0 +1 @@
+EINFO_1.0
--- a/src/test/einfo.funcs.list
+++ b/src/test/einfo.funcs.list
@@ -0,0 +1,52 @@
+ebegin
+ebegin@@EINFO_1.0
+ebeginv
+ebeginv@@EINFO_1.0
+ebracket
+ebracket@@EINFO_1.0
+ecolor
+ecolor@@EINFO_1.0
+eend
+eend@@EINFO_1.0
+eendv
+eendv@@EINFO_1.0
+eerror
+eerror@@EINFO_1.0
+eerrorn
+eerrorn@@EINFO_1.0
+eerrorx
+eerrorx@@EINFO_1.0
+eindent
+eindent@@EINFO_1.0
+eindentv
+eindentv@@EINFO_1.0
+einfo
+einfo@@EINFO_1.0
+einfon
+einfon@@EINFO_1.0
+einfov
+einfov@@EINFO_1.0
+einfovn
+einfovn@@EINFO_1.0
+elog
+elog@@EINFO_1.0
+eoutdent
+eoutdent@@EINFO_1.0
+eoutdentv
+eoutdentv@@EINFO_1.0
+eprefix
+eprefix@@EINFO_1.0
+ewarn
+ewarn@@EINFO_1.0
+ewarnn
+ewarnn@@EINFO_1.0
+ewarnv
+ewarnv@@EINFO_1.0
+ewarnvn
+ewarnvn@@EINFO_1.0
+ewarnx
+ewarnx@@EINFO_1.0
+ewend
+ewend@@EINFO_1.0
+ewendv
+ewendv@@EINFO_1.0
--- a/src/test/rc.data.list
+++ b/src/test/rc.data.list
@@ -0,0 +1,3 @@
+RC_1.0
+rc_environ_fd
+rc_environ_fd@@RC_1.0
--- a/src/test/rc.funcs.list
+++ b/src/test/rc.funcs.list
@@ -0,0 +1,116 @@
+rc_conf_value
+rc_conf_value@@RC_1.0
+rc_config_list
+rc_config_list@@RC_1.0
+rc_config_load
+rc_config_load@@RC_1.0
+rc_config_value
+rc_config_value@@RC_1.0
+rc_deptree_depend
+rc_deptree_depend@@RC_1.0
+rc_deptree_depends
+rc_deptree_depends@@RC_1.0
+rc_deptree_free
+rc_deptree_free@@RC_1.0
+rc_deptree_load
+rc_deptree_load@@RC_1.0
+rc_deptree_load_file
+rc_deptree_load_file@@RC_1.0
+rc_deptree_order
+rc_deptree_order@@RC_1.0
+rc_deptree_update
+rc_deptree_update@@RC_1.0
+rc_deptree_update_needed
+rc_deptree_update_needed@@RC_1.0
+rc_find_pids
+rc_find_pids@@RC_1.0
+rc_getfile
+rc_getfile@@RC_1.0
+rc_getline
+rc_getline@@RC_1.0
+rc_newer_than
+rc_newer_than@@RC_1.0
+rc_older_than
+rc_older_than@@RC_1.0
+rc_proc_getent
+rc_proc_getent@@RC_1.0
+rc_runlevel_exists
+rc_runlevel_exists@@RC_1.0
+rc_runlevel_get
+rc_runlevel_get@@RC_1.0
+rc_runlevel_list
+rc_runlevel_list@@RC_1.0
+rc_runlevel_set
+rc_runlevel_set@@RC_1.0
+rc_runlevel_stack
+rc_runlevel_stack@@RC_1.0
+rc_runlevel_stacks
+rc_runlevel_stacks@@RC_1.0
+rc_runlevel_starting
+rc_runlevel_starting@@RC_1.0
+rc_runlevel_stopping
+rc_runlevel_stopping@@RC_1.0
+rc_runlevel_unstack
+rc_runlevel_unstack@@RC_1.0
+rc_service_add
+rc_service_add@@RC_1.0
+rc_service_daemon_set
+rc_service_daemon_set@@RC_1.0
+rc_service_daemons_crashed
+rc_service_daemons_crashed@@RC_1.0
+rc_service_delete
+rc_service_delete@@RC_1.0
+rc_service_description
+rc_service_description@@RC_1.0
+rc_service_exists
+rc_service_exists@@RC_1.0
+rc_service_extra_commands
+rc_service_extra_commands@@RC_1.0
+rc_service_in_runlevel
+rc_service_in_runlevel@@RC_1.0
+rc_service_mark
+rc_service_mark@@RC_1.0
+rc_service_resolve
+rc_service_resolve@@RC_1.0
+rc_service_schedule_clear
+rc_service_schedule_clear@@RC_1.0
+rc_service_schedule_start
+rc_service_schedule_start@@RC_1.0
+rc_service_started_daemon
+rc_service_started_daemon@@RC_1.0
+rc_service_state
+rc_service_state@@RC_1.0
+rc_service_value_get
+rc_service_value_get@@RC_1.0
+rc_service_value_set
+rc_service_value_set@@RC_1.0
+rc_services_in_runlevel
+rc_services_in_runlevel@@RC_1.0
+rc_services_in_runlevel_stacked
+rc_services_in_runlevel_stacked@@RC_1.0
+rc_services_in_state
+rc_services_in_state@@RC_1.0
+rc_services_scheduled
+rc_services_scheduled@@RC_1.0
+rc_services_scheduled_by
+rc_services_scheduled_by@@RC_1.0
+rc_stringlist_add
+rc_stringlist_add@@RC_1.0
+rc_stringlist_addu
+rc_stringlist_addu@@RC_1.0
+rc_stringlist_delete
+rc_stringlist_delete@@RC_1.0
+rc_stringlist_find
+rc_stringlist_find@@RC_1.0
+rc_stringlist_free
+rc_stringlist_free@@RC_1.0
+rc_stringlist_new
+rc_stringlist_new@@RC_1.0
+rc_stringlist_sort
+rc_stringlist_sort@@RC_1.0
+rc_stringlist_split
+rc_stringlist_split@@RC_1.0
+rc_sys
+rc_sys@@RC_1.0
+rc_yesno
+rc_yesno@@RC_1.0
--- a/src/test/runtests.sh
+++ b/src/test/runtests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh

-top_srcdir=${top_srcdir:-..}
+top_srcdir=${top_srcdir:-../..}
 . ${top_srcdir}/test/setup_env.sh

 libeinfo_srcdir="${srcdir}/../libeinfo"
@@ -20,12 +20,52 @@ checkit() {

 ret=0

-fail_on_out() {
-	if [ -n "${out}" ]; then
-		eerror "Last command failed; failing"
-		exit 1
-	fi
-}
+ebegin "Checking exported symbols in libeinfo.so (data)"
+checkit einfo.data $(
+readelf -Ws ${libeinfo_builddir}/libeinfo.so \
+	| awk '$4 == "OBJECT" && $5 == "GLOBAL" && $7 != "UND" {print $NF}' \
+	| LC_ALL=C sort -u
+)
+
+ebegin "Checking exported symbols in libeinfo.so (functions)"
+checkit einfo.funcs $(
+readelf -Ws ${libeinfo_builddir}/libeinfo.so \
+	| awk '$4 == "FUNC" && $5 == "GLOBAL" && $7 != "UND" {print $NF}' \
+	| LC_ALL=C sort -u \
+	| egrep -v \
+		-e '^_(init|fini)$'
+)
+
+ebegin "Checking exported symbols in librc.so (data)"
+checkit rc.data $(
+readelf -Ws ${librc_builddir}/librc.so \
+	| awk '$4 == "OBJECT" && $5 == "GLOBAL" && $7 != "UND" {print $NF}' \
+	| LC_ALL=C sort -u
+)
+
+ebegin "Checking exported symbols in librc.so (functions)"
+checkit rc.funcs $(
+readelf -Ws ${librc_builddir}/librc.so \
+	| awk '$4 == "FUNC" && $5 == "GLOBAL" && $7 != "UND" {print $NF}' \
+	| LC_ALL=C sort -u \
+	| egrep -v \
+		-e '^_(init|fini)$'
+)
+
+ebegin "Checking hidden functions in librc.so"
+sed -n '/^librc_hidden_proto/s:.*(\(.*\))$:\1:p' ${librc_srcdir}/librc.h \
+	| LC_ALL=C sort -u \
+	> librc.funcs.hidden.list
+readelf -Wr $(grep -l '#include[[:space:]]"librc\.h"' ${librc_srcdir}/*.c | sed 's:\.c$:.o:') \
+	| egrep -v -e 'R_PARISC_(DP|SEG)REL' \
+	| awk '$5 ~ /^rc_/ {print $5}' \
+	| LC_ALL=C sort -u \
+	| egrep -v '^rc_environ_fd$' \
+	> librc.funcs.hidden.out
+syms=$(diff -u librc.funcs.hidden.list librc.funcs.hidden.out | sed -n '/^+[^+]/s:^+::p')
+[ -z "${syms}" ]
+eend $? "Missing hidden defs:"$'\n'"${syms}"
+: $(( ret += $? ))

 ebegin "Checking trailing whitespace in code"
 # XXX: Should we check man pages too ?
@@ -34,7 +74,6 @@ out=$(cd ${top_srcdir}; find */ \
 	-exec grep -n -E '[[:space:]]+$' {} +)
 [ -z "${out}" ]
 eend $? "Trailing whitespace needs to be deleted:"$'\n'"${out}"
-fail_on_out

 ebegin "Checking trailing newlines in code"
 out=$(cd ${top_srcdir};
@@ -43,7 +82,6 @@ out=$(cd ${top_srcdir};
 	done)
 [ -z "${out}" ]
 eend $? "Trailing newlines need to be deleted:"$'\n'"${out}"
-fail_on_out

 ebegin "Checking for obsolete functions"
 out=$(cd ${top_srcdir}; find src -name '*.[ch]' \
@@ -51,7 +89,6 @@ out=$(cd ${top_srcdir}; find src -name '*.[ch]' \
 	-exec grep -n -E '\<(malloc|memory|sys/(errno|fcntl|signal|stropts|termios|unistd))\.h\>' {} +)
 [ -z "${out}" ]
 eend $? "Avoid these obsolete functions:"$'\n'"${out}"
-fail_on_out

 ebegin "Checking for x* func usage"
 out=$(cd ${top_srcdir}; find src -name '*.[ch]' \
@@ -62,7 +99,6 @@ out=$(cd ${top_srcdir}; find src -name '*.[ch]' \
 		-e src/libeinfo/libeinfo.c)
 [ -z "${out}" ]
 eend $? "These need to be using the x* variant:"$'\n'"${out}"
-fail_on_out

 ebegin "Checking spacing style"
 out=$(cd ${top_srcdir}; find src -name '*.[ch]' \
@@ -77,7 +113,6 @@ out=$(cd ${top_srcdir}; find src -name '*.[ch]' \
 	{} +)
 [ -z "${out}" ]
 eend $? "These lines violate style rules:"$'\n'"${out}"
-fail_on_out

 einfo "Running unit tests"
 eindent
--- a/src/test/units/is_older_than
+++ b/src/test/units/is_older_than
--- a/supervise-daemon-guide.md
+++ b/supervise-daemon-guide.md
@@ -57,6 +57,15 @@ Several other variables affect the way services behave under
 supervise-daemon. They are documented on the  openrc-run man page, but I
 will list them here for convenience:

+``` sh
+pidfile=/pid/of/supervisor.pid
+```
+
+If you are using start-stop-daemon to monitor your scripts, the pidfile
+is the path to the pidfile the daemon creates. If, on the other hand,
+you are using supervise-daemon, this is the path to the pidfile the
+supervisor creates.
+
 ``` sh
 command_args_foreground="arguments"
 ```
--- a/test/skel.runtests.sh
+++ b/test/skel.runtests.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+# top_srcdir=${top_srcdir:-SET/THIS/PATH/OK!?}
+. ${top_srcdir}/test/setup_env.sh
+
--- a/zsh-completion/_rc-service
+++ b/zsh-completion/_rc-service
@@ -1,37 +1,27 @@
 #compdef rc-service

-_rc_services() {
-  if [[ -n "${opt_args[(i)-l|--list]}" ]]; then
-    _nothing
-  else
-    _values 'service' $(rc-service -l)
-  fi
-}
-
-_rc_actions() {
-  local service="${line[1]}"
-
-  if [[ -n "${opt_args[(i)-e|--exists|-r|--resolve]}" ]] || ! $(rc-service -e $service) ; then
-    _nothing
-  else
-    local -a actions=(${(f)"$(rc-service -C $service describe 2>&1)"})
-    shift actions
-    actions=(${actions# \* })
-    actions=(${actions/:*})
-    actions=(stop start restart describe zap ${actions[@]})
-    _describe -V 'action' actions
-  fi
-
-}
-
-_arguments -C -s \
-  '(-e --exists)'{-e,--exists}'[tests if the service exists or not]' \
-  '(-l --list)'{-l,--list}'[list all available services]' \
-  '(-r --resolve)'{-r,--resolve}'[resolve the service name to an init script]' \
-  '(-C --nocolor)'{-C,--nocolor}'[Disable color output]' \
-  '(-v --verbose)'{-v,--verbose}'[Run verbosely]' \
-  '(-q --quiet)'{-q,--quiet}'[Run quietly]' \
-  '1:service:_rc_services' \
-  '2:action:_rc_actions'
+if (( CURRENT == 2 )); then
+  _arguments -s \
+    '(-e --exists)'{-e,--exists}"[tests if the service exists or not]" \
+    '(-l --list)'{-l,--list}'[list all available services]' \
+    '(-r --resolve)'{-r,--resolve}'[resolve the service name to an init script]' \
+    '(-C --nocolor)'{-C,--nocolor}'[Disable color output]' \
+    '(-v --verbose)'{-v,--verbose}'[Run verbosely]' \
+    '(-q --quiet)'{-q,--quiet}'[Run quietly]'
+  _values "service" $(rc-service --list)
+else
+  case $words[2] in
+    -e|--exists|-r|--resolve)
+      (( CURRENT > 3 )) && return 0
+	  _values "service" $(rc-service --list)
+      ;;
+    -*)
+          return 0
+          ;;
+    *)
+      _values "action" stop start restart describe zap
+  ;;
+  esac
+fi

 # vim: set et sw=2 ts=2 ft=zsh:
Author	SHA1	Message	Date
William Hubbs	5027b84225	Update ChangeLog	2018-11-05 21:46:47 -06:00
William Hubbs	d725410277	supervise-daemon: reap zombies We need to make sure to reap zombies so that we can shut down successfully. Fixes #252. Possibly related to #250.	2018-11-05 21:43:24 -06:00
William Hubbs	d78cd5ce92	rc-service: fix help output	2018-11-05 21:43:24 -06:00
William Hubbs	2a9c1a220d	version 0.39.2	2018-11-05 21:40:07 -06:00
William Hubbs	81ce908e42	Update ChangeLog	2018-10-24 15:36:38 -05:00
William Hubbs	aa867fd7e3	openrc-shutdown: do not require a time for -w switch X-Gentoo-Bug: 669500 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=669500	2018-10-24 15:32:16 -05:00
William Hubbs	c921a8647b	version 0.39.1	2018-10-24 15:30:02 -05:00