update ChangeLog

sh/gendepends.sh.in: fix detection of service scripts
We do not need to care about the path on the shebang line of a service script as long as the shebang line ends with "openrc-run". This fixes #119 and #120.
2017-03-23 17:50:51 -05:00 · 2017-03-23 13:46:18 -05:00 · 2017-03-23 13:34:31 -05:00 · 2017-03-14 19:58:26 -05:00 · 2017-03-14 19:36:32 -05:00 · 2017-03-14 19:36:01 -05:00
138 changed files with 2492 additions and 5912 deletions
--- a/BUSYBOX.md
+++ b/BUSYBOX.md
@@ -1,5 +1,4 @@
-Using Busybox as your Default Shell with OpenRC
-===============================================
+# Using Busybox as your Default Shell with OpenRC

 If you have/bin/sh linked to busybox, you need to be aware of several
 incompatibilities between busybox's applets and the standalone
--- a/3027
+++ b/3027
--- a/FEATURE-REMOVAL-SCHEDULE.md
+++ b/FEATURE-REMOVAL-SCHEDULE.md
@@ -1,12 +1,11 @@
-Features Scheduled for Removal
-==============================
+# Features Scheduled for Removal

 The following is a list of files and features that are going to be removed in
 the source tree.  Every entry should contain what exactly is going away, why it
 is happening, and who is going to be doing the work.  When the feature is
 removed, it should also be removed from this file.

-# Service pause action
+## Service pause action

 When: 1.0

@@ -14,7 +13,7 @@ Why: The same affect can be obtained with the --nodeps option to stop.

 Who:

-# start-stop-daemon options --startas, --chuid , --oknodo
+## start-stop-daemon options --startas, --chuid , --oknodo

 When: 1.0

@@ -26,7 +25,7 @@ Why: Obsolete or replaced by other options.

 Who:

-# runscript and rc symbolic links
+## runscript and rc symbolic links

 When: 1.0

@@ -35,7 +34,7 @@ Why: Deprecated in favor of openrc-run and openrc due to naming

 Who:

-# support for the opts variable in service scripts
+## support for the opts variable in service scripts

 When: 1.0

@@ -44,7 +43,7 @@ Why: Deprecated in favor of extra_commands, extra_started_commands

 Who:

-# support for local_start and local_stop
+## support for local_start and local_stop

 When: 1.0

@@ -52,7 +51,7 @@ Why: Deprecated in favor of executable scripts in @SYSCONFDIR@/local.d

 Who:

-# the mtab service script
+## the mtab service script

 When: force /etc/mtab to link to /proc/self/mounts in 1.0, remove
 	  service in 2.0
@@ -62,13 +61,13 @@ Why: /etc/mtab should be a symbolic link to /proc/self/mounts on modern

 Who:

-# C API Functions in rc.h
+## C API Functions in rc.h

 If you have a c program that links to librc and uses functions from
 there, this section will list API functions which are deprecated and
 will be removed along with the reason they are being removed.

-## rc_getline()
+### rc_getline()

 When: 1.0

--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,4 @@
-OpenRC History
-==============
+# OpenRC History

 This history of OpenRC was written by Daniel Robbins, Roy Marples, William
 Hubbs and others.
--- a/12
+++ b/12
@@ -15,24 +15,12 @@ include ${TOP}/Makefile.inc

 SUBDIR=		conf.d etc init.d local.d man scripts sh src support sysctl.d

-# Build bash completion or not
-MKBASHCOMP?=	no
-ifeq (${MKBASHCOMP},yes)
-SUBDIR+=	bash-completion
-endif
-
 # Build pkgconfig or not
 MKPKGCONFIG?=	yes
 ifeq (${MKPKGCONFIG},yes)
 SUBDIR+=	pkgconfig
 endif

-# Build zsh completion or not
-MKZSHCOMP?=	no
-ifeq (${MKZSHCOMP},yes)
-SUBDIR+=	zsh-completion
-endif
-
 # We need to ensure that runlevels is done last
 SUBDIR+=	runlevels

--- a/Makefile.inc
+++ b/Makefile.inc
@@ -1,3 +1,3 @@
 NAME=		openrc
-VERSION=	0.35
+VERSION=	0.24.2
 PKG=		${NAME}-${VERSION}
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,77 +1,8 @@
-OpenRC NEWS
-===========
+# 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.35
-
-In this version, the cgroups mounting logic has been moved from the
-sysfs service to the cgroups service. This was done so cgroups can be
-mounted inside an lxc/lxd container without using the other parts of the
-sysfs service.
-
-?As a result of this change, if you are upgrading, you need to add
-cgroups to your sysinit runlevel by running the following command as
-root:
-
-```
-# rc-update add cgroups sysinit
-```
-
-For more information, see the following issue:
-
-https://github.com/openrc/openrc/issues/187
-
-Consider this your second notification with regard to /etc/mtab being a
-file instead of a symbolic link.
-
-In this version, the mtab service will complain loudly if you have
-mtab_is_file set to yes and recommend that you change this to no and
-restart the mtab service to migrate /etc/mtab to a symbolic link.
-
-If there is a valid technical reason to keep /etc/mtab as a flat file
-instead of a symbolic link to /proc/self/mounts, we are interested and
-we will keep the support in that case. Please open an issue and let us
-know however. Otherwise, consider this your final notice that the mtab
-service will be removed in the future.
-
-## OpenRC 0.33
-
-This version removes the "service" binary which was just a copy of
-"rc-service" provided for compatibility.
-
-If you still need the "service" binary, as opposed to "rc-service", it is
-recommended that you use something like Debian's init-system-helpers.
-Otherwise, just use "rc-service" in place of "service".
-
-## OpenRC 0.31
-
-This version adds support for Control Groups version 2, which is
-considered stable as of Linux-4.13. Please see /etc/rc.conf for
-documentation on how to configure control groups.
-
-## OpenRC-0.28
-
-This version mounts efivars read only due to concerns about changes in
-this file system making systems unbootable.  If you need to change something
-in this path, you will need to re-mount it read-write, make the change
-and re-mount it read-only.
-
-Also, you can override this behavior by adding a line for efivars to
-fstab if you want efivars mounted read-write.
-
-For more information on this issue, see the following url:
-
-https://github.com/openrc/openrc/issues/134
-
-## OpenRC-0.25
-
-This version contains an OpenRC-specific implementation of init for
-Linux which can be used in place of sysvinit or any other init process.
-For information on its usage, see the man pages for openrc-init (8) and
-openrc-shutdown (8).
-
 ## OpenRC-0.24.1

 This version starts cleaning up the dependencies so that rc_parallel
--- a/README.md
+++ b/README.md
@@ -1,5 +1,4 @@
-OpenRC README
-=============
+# OpenRC README

 OpenRC is a dependency-based init system that works with the
 system-provided init program, normally `/sbin/init`. Currently, it does
@@ -23,17 +22,14 @@ below arguments to the make command
 PROGLDFLAGS=-static
 LIBNAME=lib64
 DESTDIR=/tmp/openrc-image
-MKBASHCOMP=no
 MKNET=no
 MKPAM=pam
 MKPREFIX=yes
 MKPKGCONFIG=no
 MKSELINUX=yes
 MKSTATICLIBS=no
-MKSYSVINIT=yes
 MKTERMCAP=ncurses
 MKTERMCAP=termcap
-MKZSHCOMP=no
 PKG_PREFIX=/usr/pkg
 LOCAL_PREFIX=/usr/local
 PREFIX=/usr/local
--- a/STYLE-GUIDE.md
+++ b/STYLE-GUIDE.md
@@ -1,5 +1,4 @@
-OpenRC Coding Style Guide
-=========================
+# OpenRC Style Guide

 This is the openrc style manual.  It governs the coding style of all code
 in this repository.  Follow it.  Contact openrc@gentoo.org for any questions
--- a/agetty-guide.md
+++ b/agetty-guide.md
@@ -1,14 +1,14 @@
-Setting up the agetty service in OpenRC
-=================================xxxxxx
+# Setting up the agetty service in OpenRC

 The agetty service is an OpenRC specific way to monitor and respawn a
 getty, using agetty, on Linux. To use this method, make sure you aren't
 spawning a getty manager for this port some other way (such as through
 sysvinit/inittab), then run the following commands as root.

-Note that [port] refers to the port you are spawning the getty on, for
-example, tty1 or ttyS0. The full path to it, for example, /dev/tty1
-should not be used.
+Note that [port] refers to the port you are spawning the getty on, and
+not the full path to it. For example, tty0 or ttyS0instead of /dev/tty0
+or /dev/ttyS0.
+tty0 or ttyS0, not the full path to it (for example, tty0 or ttyS0 and

 ```
 # cd /etc/init.d
--- a/bash-completion/Makefile
+++ b/bash-completion/Makefile
@@ -1,11 +0,0 @@
-DIR=	${BASHCOMPDIR}
-CONF=	openrc \
-		openrc-service-script \
-		rc-service \
-		rc-status \
-		rc-update \
-
-MK=	../mk
-include ${MK}/os.mk
-
-include ${MK}/scripts.mk
--- a/bash-completion/openrc
+++ b/bash-completion/openrc
@@ -1,24 +0,0 @@
-# Copyright (c) 2017 The OpenRC Authors.
-# See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
-#
-# This file is part of OpenRC. It is subject to the license terms in
-# the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
-# This file may not be copied, modified, propagated, or distributed
-# except according to the terms contained in the LICENSE file.
-
-#
-# openrc completion command
-#
-_openrc()
-{
-	local cur
-	COMPREPLY=()
-	cur="${COMP_WORDS[COMP_CWORD]}"
-	if [[ ${#COMP_WORDS[*]} -le 2 ]]; then
-		COMPREPLY=($(compgen -W "$(rc-status --list)" -- $cur))
-	fi
-	return 0
-} &&
-complete -F _openrc openrc
--- a/bash-completion/openrc-service-script
+++ b/bash-completion/openrc-service-script
@@ -1,29 +0,0 @@
-# Copyright (c) 2017 The OpenRC Authors.
-# See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
-#
-# This file is part of OpenRC. It is subject to the license terms in
-# the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
-# This file may not be copied, modified, propagated, or distributed
-# except according to the terms contained in the LICENSE file.
-
-_openrc_service_script()
-{
-	local script="${COMP_WORDS[0]}"
-	local cur="${COMP_WORDS[$COMP_CWORD]}"
-
-	if [[ ( -f "${script}" || -h "${script}" ) && -r "${script}" ]] \
-	&& [[ "$(head -n 1 "${script}")" =~ \#\!.*/openrc-run ]]
-	then
-		[[ $COMP_CWORD -gt 1 ]] && return 1
-		COMPREPLY=($(opts="start stop status restart pause zap ineed needsme iuse usesme broken"; \
-			eval "$(grep '^opts=' "${script}")"; echo "${opts}"))
-		[[ -n "$COMPREPLY" ]] || COMPREPLY=(start stop restart zap)
-		COMPREPLY=($(compgen -W "${COMPREPLY[*]}" -- "${cur}"))
-	else
-		COMPREPLY=($(compgen -o default -- "${cur}"))
-	fi
-	return 0
-}
-complete -F _openrc_service_script */etc/init.d/*
--- a/bash-completion/rc-service
+++ b/bash-completion/rc-service
@@ -1,113 +0,0 @@
-# Copyright (c) 2017 The OpenRC Authors.
-# See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
-#
-# This file is part of OpenRC. It is subject to the license terms in
-# the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
-# This file may not be copied, modified, propagated, or distributed
-# except according to the terms contained in the LICENSE file.
-
-#
-# rc-service completion command
-#
-_rc_service()
-{
-	local cur prev numwords opts
-	local words i x filename
-	local action actionpos
-	COMPREPLY=()
-	cur="${COMP_WORDS[COMP_CWORD]}"
-	prev="${COMP_WORDS[COMP_CWORD-1]}"
-	numwords=${#COMP_WORDS[*]}
-
-	if [[ ${prev} == '>' || ${prev} == '<' ]] ; then
-		COMPREPLY=($(compgen -f -- ${cur}))
-		return 0
-	fi
-
-	# find action
-	for x in ${COMP_LINE} ; do
-		if [[ ${x} =~ --(list|exists|resolve) ]] || [[ ${x} =~ -(l|e|r) ]]
-		then
-			action=${x}
-			break
-		fi
-	done
-	if [[ -n ${action} ]]; then
-		for ((i = 0; i < ${numwords}; i++ )); do
-			if [[ ${COMP_WORDS[${i}]} == "${action}" ]]; then
-				actionpos=${i}
-				break
-			fi
-		done
-
-		for ((i = 1; i < ${numwords}; i++ )); do
-			if [[ ! ${COMP_WORDS[$i]} == -* ]]; then
-				break
-			fi
-		done
-	fi
-
-	if [[ ${COMP_CWORD} -eq 3 ]]; then
-		return 1
-	fi
-
-	# check if an option was typed
-	if [[ ${cur} == -* ]]; then
-		if [[ ${cur} == --* ]]; then
-			opts="--list --exists --resolve"
-			COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
-			return 0
-		elif [[ ${cur} == -* ]]; then
-			opts="-l -e -r"
-			COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
-			return 0
-		fi
-
-		# NOTE: This slows things down!
-		# (Adapted from bash_completion by Ian Macdonald <ian@caliban.org>)
-		# This removes any options from the list of completions that have
-		# already been specified on the command line.
-		COMPREPLY=($(echo "${COMP_WORDS[@]}" | \
-		(while read -d ' ' i; do
-			[[ -z ${i} ]] && continue
-			# flatten array with spaces on either side,
-			# otherwise we cannot grep on word boundaries of
-			# first and last word
-			COMPREPLY=" ${COMPREPLY[@]} "
-			# remove word from list of completions
-			COMPREPLY=(${COMPREPLY/ ${i%% *} / })
-		done
-		echo ${COMPREPLY[@]})))
-
-		return 0
-	else
-		# no option was typed
-		if [[ ${COMP_CWORD} -eq 1 ]]; then			  # if first word typed
-			words="$(rc-service --list | grep ^${cur})"		  # complete for init scripts
-			COMPREPLY=($(for i in ${words} ; do \
-			[[ ${i} == ${cur}* ]] && echo ${i} ; \
-			done))
-			return 0
-		elif [[ ${COMP_CWORD} -eq 2 ]] && [[ ${prev} != -* ]]; then # if second word typed and we didn't type in a function
-			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
-	fi
-	if [[ ${action} == '--exists' ]] || [[ ${action} == '-e' ]] || \
-		[[ ${action} == '--resolve' ]]  || [[ ${action} == '-r' ]]; then
-		words="$(rc-service --list | grep ^${cur})"
-		COMPREPLY=($(for i in ${words} ; do \
-			[[ ${i} == ${cur}* ]] && echo ${i} ; \
-		done))
-		return 0
-	fi
-	return 0
-} &&
-complete -F _rc_service rc-service
--- a/bash-completion/rc-status
+++ b/bash-completion/rc-status
@@ -1,31 +0,0 @@
-# Copyright (c) 2017 The OpenRC Authors.
-# See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
-#
-# This file is part of OpenRC. It is subject to the license terms in
-# the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
-# This file may not be copied, modified, propagated, or distributed
-# except according to the terms contained in the LICENSE file.
-
-#
-# rc-status completion command
-#
-_rcstatus()
-{
-	local cur
-	cur="${COMP_WORDS[COMP_CWORD]}"
-	if [[ $COMP_CWORD -eq 1 ]]; then
-		if [[ "${cur}" == --* ]]; then
-			COMPREPLY=($(compgen -W '--all --list --unused' -- ${cur}))
-		elif [[ "${cur}" == -* ]]; then
-			COMPREPLY=($(compgen -W '-a -l -u' -- ${cur}))
-		else
-			COMPREPLY=($(compgen -W "$(rc-status --list)" -- ${cur}))
-		fi
-	else
-		unset COMPREPLY
-	fi
-	return 0
-} &&
-complete -F _rcstatus rc-status
--- a/bash-completion/rc-update
+++ b/bash-completion/rc-update
@@ -1,42 +0,0 @@
-# Copyright (c) 2017 The OpenRC Authors.
-# See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
-#
-# This file is part of OpenRC. It is subject to the license terms in
-# the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
-# This file may not be copied, modified, propagated, or distributed
-# except according to the terms contained in the LICENSE file.
-
-#
-# rc-update completion command
-#
-_rc_update()
-{
-	local cur show
-	COMPREPLY=()
-	cur="${COMP_WORDS[COMP_CWORD]}"
-	if [[ $COMP_CWORD -eq 1 ]]; then
-		if [[ "${cur}" == -* ]]; then
-			COMPREPLY=($(compgen -W '-a -d -s' -- ${cur}))
-		else
-			COMPREPLY=($(compgen -W 'add del show' ${cur}))
-		fi
-	else
-		if [[ "${COMP_WORDS[1]}" == "show" ]] || [[ "${COMP_WORDS[1]}" == "-s" ]]; then
-			show="TRUE"
-		fi
-		if ([[ $COMP_CWORD -eq 3 ]] && [[ -z "$show" ]]) || \
-			([[ $COMP_CWORD -eq 2 ]] && [[ -n "$show" ]]); then
-		COMPREPLY=($(compgen -W "$(rc-status --list)" -- $cur))
-		elif [[ $COMP_CWORD -eq 2 ]]; then
-			COMPREPLY=($(compgen -W "$(rc-service --list)" $cur))
-		elif [[ ${#COMP_WORDS[*]} -gt 2 ]] ; then
-			COMPREPLY=($(compgen -W "$(rc-status --list)" -- $cur))
-		else
-			unset COMPREPLY
-		fi
-	fi
-	return 0
-} &&
-complete -F _rc_update rc-update
--- a/conf.d/agetty
+++ b/conf.d/agetty
@@ -1,11 +1,8 @@
-# make agetty quiet
-#quiet="yes"
-
 # Set the baud rate of the terminal line
 #baud=""

 # set the terminal type
-#term_type="linux"
+#termtype="linux"

 # extra options to pass to agetty for this port
 #agetty_options=""
--- a/conf.d/killprocs
+++ b/conf.d/killprocs
@@ -1,6 +1,3 @@
-# If you wish to pass any options to kill_all during shutdown,
+# If you wish to pass any options to killall5 during shutdown,
 # you should do so here.
-#
-# The setting is called killall5_opts because the options here are meant
-# to be identical to those you could pass to killall5.
 killall5_opts=""
--- a/conf.d/localmount
+++ b/conf.d/localmount
@@ -3,7 +3,7 @@
 #no_umounts="/dir1:/var/dir2"
 #
 # Mark certain mount points as critical.
-# This contains a space separated list of mount points which should be
+# This contains aspace separated list of mount points which should be
 # considered critical. If one of these mount points cannot be mounted,
 # localmount will fail.
 # By default, this is empty.
--- a/conf.d/mtab
+++ b/conf.d/mtab
@@ -1,13 +1,5 @@
-# As far as we are aware, there are no modern linux tools or use cases
-# which require /etc/mtab to be a separate file from /proc/self/mounts,
-# so this setting should be commented out.
-# If it is set to yes, please comment it out and run this command:
-# # rc-service mtab restart
-# In the future, the mtab service will be removed since we are not aware
-# of any need to manipulate /etc/mtab as a separate file from
-# /proc/self/mounts.
-# If you have a technical reason we should keep this support, please
-# open an issue at https://github.com/openrc/openrc/issues and let us
-# know about your situation.
 # This setting controls whether /etc/mtab is a file or symbolic link.
+# Most of the time, you shouldn't touch this. However, if the default
+# breaks your system in some way, please see the NEWS.md file that comes
+# with OpenRC for the actions to take.
 # mtab_is_file=no
--- a/etc/rc.conf
+++ b/etc/rc.conf
@@ -178,11 +178,6 @@
 # "xenU"           - XenU Domain (Linux and NetBSD)
 #rc_sys=""

-# if  you use openrc-init, which is currently only available on Linux,
-# this is the default runlevel to activate after "sysinit" and "boot"
-# when booting.
-#rc_default_runlevel="default"
-
 # on Linux and Hurd, this is the number of ttys allocated for logins
 # It is used in the consolefont, keymaps, numlock and termencoding
 # service scripts.
@@ -191,48 +186,13 @@ rc_tty_number=12
 ##############################################################################
 # LINUX CGROUPS RESOURCE MANAGEMENT

-# This sets the mode used to mount cgroups.
-# "hybrid" mounts cgroups version 2 on /sys/fs/cgroup/unified and
-# cgroups version 1 on /sys/fs/cgroup.
-# "legacy" mounts cgroups version 1 on /sys/fs/cgroup
-# "unified" mounts cgroups version 2 on /sys/fs/cgroup
-#rc_cgroup_mode="hybrid"
-
-# This is a list of controllers which should be enabled for cgroups version 2.
-# If hybrid mode is being used, controllers listed here will not be
-# available for cgroups version 1.
-# This is a global setting.
-#rc_cgroup_controllers=""
-
-# This variable contains the cgroups version 2 settings for your services.
-# If this is set in this file, the settings will apply to all services.
-# If you want different settings for each service, place the settings in
-# /etc/conf.d/foo for service foo.
-# The format is to specify the setting and value followed by a newline.
-# Multiple settings and values can be specified.
-# For example, you would use this to set the maximum memory and maximum
-# number of pids for a service.
-#rc_cgroup_settings="
-#memory.max 10485760
-#pids.max max
-#"
-#
-# For more information about the adjustments that can be made with
-# cgroups version 2, see Documentation/cgroups-v2.txt in the linux kernel
-# source tree.
-#rc_cgroup_settings=""
-
-# This switch controls whether or not cgroups version 1 controllers are
-# individually mounted under
-# /sys/fs/cgroup in hybrid or legacy mode.
+# If you have cgroups turned on in your kernel, this switch controls
+# whether or not a group for each controller is mounted under
+# /sys/fs/cgroup.
+# None of the other options in this section work if this is set to "NO".
 #rc_controller_cgroups="YES"

-# The following 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_cggroup_memory_use_hierarchy="NO"
-
-# The following settings allow you to set up values for the cgroups version 1
+# The following settings allow you to set up values for the cgroup
 # controllers for your services.
 # They can be set in this file;, however, if you do this, the settings
 # will apply to all of your services.
@@ -246,9 +206,8 @@ rc_tty_number=12
 # cpu.shares 512
 # "
 #
-# For more information about the adjustments that can be made with
-# cgroups version 1, see Documentation/cgroups-v1/* in the linux kernel
-# source tree.
+#For more information about the adjustments that can be made with
+#cgroups, see Documentation/cgroups/* in the linux kernel source tree.

 # Set the blkio controller settings for this service.
 #rc_cgroup_blkio=""
@@ -282,33 +241,10 @@ rc_tty_number=12

 # Set this to YES if you want all of the processes in a service's cgroup
 # killed when the service is stopped or restarted.
-# Be aware that setting this to yes means all of a service's
-# child processes will be killed. Keep this in mind if you set this to
-# yes here instead of for the individual services in
-# /etc/conf.d/<service>.
+# This should not be set globally because it kills all of the service's
+# child processes, and most of the time this is undesirable. Please set
+# it in /etc/conf.d/<service>.
 # To perform this cleanup manually for a stopped service, you can
 # execute cgroup_cleanup with /etc/init.d/<service> cgroup_cleanup or
 # rc-service <service> cgroup_cleanup.
-# The process followed in this cleanup is the following:
-# 1. send stopsig (sigterm if it isn't set) to all processes left in the
-# cgroup immediately followed by sigcont.
-# 2. Send sighup to all processes in the cgroup if rc_send_sighup is
-# yes.
-# 3. delay for rc_timeout_stopsec seconds.
-# 4. send sigkill to all processes in the cgroup unless disabled by
-# setting rc_send_sigkill to no.
 # rc_cgroup_cleanup="NO"
-
-# If this is yes, we will send sighup to the processes in the cgroup
-# immediately after stopsig and sigcont.
-#rc_send_sighup="NO"
-
-# This is the amount of time in seconds that we delay after sending sigcont
-# and optionally sighup, before we optionally send sigkill to all
-# processes in the # cgroup.
-# The default is 90 seconds.
-#rc_timeout_stopsec="90"
-
-# If this is set to no, we do not send sigkill to all processes in the
-# cgroup.
-#rc_send_sigkill="YES"
--- a/user-guide.md
+++ b/user-guide.md
@@ -1,6 +1,3 @@
-OpenRC Users Guide
-==================
-
 # Purpose and description

 OpenRC is an init system for Unixoid operating systems. It takes care of 
@@ -30,8 +27,8 @@ openrc scans the runlevels (default: `/etc/runlevels`) and builds a dependency
 graph, then starts the needed service scripts, either serialized (default) or in 
 parallel.

-When all the service scripts are started openrc terminates. There is no
-persistent daemon. (Integration with tools like monit, runit or s6 can be done)
+When all the init scripts are started openrc terminates. There is no persistent 
+daemon. (Integration with tools like monit, runit or s6 can be done)

 # Shutdown

@@ -56,6 +53,9 @@ Calling `openrc` without any arguments will try to reset all services so
 that the current runlevel is satisfied; if you manually started apache it will be 
 stopped, and if squid died but is in the current runlevel it'll be restarted.

+There is a `service` helper that emulates the syntax seen on e.g. older Redhat
+and Ubuntu (`service nginx start` etc.)
+
 # Runlevels

 OpenRC has a concept of runlevels, similar to what sysvinit historically 
@@ -66,7 +66,7 @@ own if needed. This allows, for example, to have a default runlevel with
 disabled.

 The `rc-status` helper will print all currently active runlevels and the state
-of services in them:
+of init scripts in them:

 ```
 # rc-status
@@ -77,7 +77,7 @@ Runlevel: default
 ```

 All runlevels are represented as folders in `/etc/runlevels/` with symlinks to 
-the actual service scripts.
+the actual init scripts.

 Calling openrc with an argument (`openrc default`) will switch to that
 runlevel; this will start and stop services as needed.
@@ -86,13 +86,122 @@ Managing runlevels is usually done through the `rc-update` helper, but could of
 course be done by hand if desired.
 e.g. `rc-update add nginx default` - add nginx to the default runlevel
 Note: This will not auto-start nginx! You'd still have to trigger `rc` or run 
-the service script by hand.
+the initscript by hand.

 FIXME: Document stacked runlevels

 The default startup uses the runlevels `boot`, `sysinit` and `default`, in that 
 order. Shutdown uses the `shutdown` runlevel.

+
+# Syntax of Service Scripts
+
+Service scripts are shell scripts. OpenRC aims at using only the standardized 
+POSIX sh subset for portability reasons. The default interpreter (build-time 
+toggle) is `/bin/sh`, so using for example mksh is not a problem.
+
+OpenRC has been tested with busybox sh, ash, dash, bash, mksh, zsh and possibly 
+others. Using busybox sh has been difficult as it replaces commands with 
+builtins that don't offer the expected features.
+
+The interpreter for initscripts is `#!/sbin/openrc-run`.
+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.
+Extra functions can be added easily:
+
+```
+extra_commands="checkconfig"
+checkconfig() {
+	doSomething
+}
+```
+
+This exports the checkconfig function so that `/etc/init.d/someservice 
+checkconfig` will be available, and it "just" runs this function.
+
+While commands defined in `extra_commands` are always available, commands
+defined in `extra_started_commands` will only work when the service is started
+and those defined in `extra_stopped_commands` will only work when the service is
+stopped. This can be used for implementing graceful reload and similar
+behaviour.
+
+Adding a restart function will not work, this is a design decision within 
+OpenRC. Since there may be dependencies involved (e.g. network -> apache) a 
+restart function is in general not going to work. 
+restart is internally mapped to `stop()` + `start()` (plus handling dependencies).
+If a service needs to behave differently when it is being restarted vs
+started or stopped, it should test the `$RC_CMD` variable, for example:
+
+```
+[ "$RC_CMD" = restart ] && do_something
+```
+
+# The Depend Function
+
+This function declares the dependencies for a service script. This
+determines the order the service scripts start.
+
+```
+depend() {
+	need net
+	use dns logger netmount
+	want coolservice
+}
+```
+
+`need` declares a hard dependency - net always needs to be started before this 
+	service does
+
+`use` is a soft dependency - if dns, logger or netmount is in this runlevel 
+	start it before, but we don't care if it's not in this runlevel.
+	`want` is between need and use - try to start coolservice if it is
+	installed on the system, regardless of whether it is in the
+	runlevel, but we don't care if it starts.
+
+`before` declares that we need to be started before another service
+
+`after` declares that we need to be started after another service, without 
+	creating a dependency (so on calling stop the two are independent)
+
+`provide` allows multiple implementations to provide one service type, e.g.:
+	`provide cron` is set in all cron-daemons, so any one of them started 
+	satisfies a cron dependency
+
+`keyword` allows platform-specific overrides, e.g. `keyword -lxc` makes this 
+	service script a noop in lxc containers. Useful for things like keymaps, 
+	module loading etc. that are either platform-specific or not available 
+	in containers/virtualization/...
+
+FIXME: Anything missing in this list?
+
+# The Default Functions
+
+All service scripts are assumed to have the following functions:
+
+```
+start()
+stop()
+status()
+```
+
+There are default implementations in `lib/rc/sh/openrc-run.sh` - this allows very 
+compact service scripts. These functions can be overridden per service script as 
+needed.
+
+The default functions assume the following variables to be set in the service 
+script:
+
+```
+command=
+command_args=
+pidfile=
+```
+
+Thus the 'smallest' service scripts can be half a dozen lines long
+
 # The Magic of `conf.d`

 Most service scripts need default values. It would be fragile to
@@ -111,7 +220,7 @@ start() {
 }
 ```

-The big advantage of this split is that most of the time editing of the service 
+The big advantage of this split is that most of the time editing of the init 
 script can be avoided.

 # Start-Stop-Daemon
@@ -132,40 +241,21 @@ messages to a file), and a few others.

 # ulimit and CGroups

-Setting `ulimit` and `nice` values per service can be done through the
-`rc_ulimit` variable.
+Setting `ulimit` and `nice` values per service can be done through the `rc_ulimit`
+variable.

-Under Linux, OpenRC can use cgroups for process management as well. Once
-the kernel is configured appropriately, the `rc_cgroup_mode` setting in
-/etc/rc.conf should be used to control whether cgroups version one,,
-two, or both are used. The default is to use both if they are available.
-
-By changing certain settings in the service's `conf.d` file limits can be
-enforced per service. These settings are documented in detail in the
-default /etc/rc.conf under `LINUX CGROUPS RESOURCE MANAGEMENT`.
-
-# Dealing with Orphaned Processes
-
-It is possible to get into a state where there are orphaned processes
-running which were part of a service. For example, if you are monitoring
-a service with supervise-daemon and supervise-daemon dies for an unknown
-reason. The way to deal with this will be different for each system.
-
-On Linux systems with cgroups enabled, the cgroup_cleanup command is
-added to all services. You can run it manually, when the service is
-stopped, by using:
-
-```
-# rc-service someservice cgroup_cleanup
-```
-
-The `rc_cgroup_cleanup` setting can be changed to yes to make this
-happen automatically when the service is stopped.
+Under Linux, OpenRC can optionally use CGroups for process management.
+By default each service script's processes are migrated to their own CGroup.

+By changing certain values in the `conf.d` file limits can be enforced per 
+service. It is easy to find orphan processes of a service that persist after 
+`stop()`, but by default these will NOT be terminated.
+To change this add `rc_cgroup_cleanup="yes"` in the `conf.d` files for services 
+where you desire this functionality.

 # Caching

-For performance reasons OpenRC keeps a cache of pre-parsed service metadata
+For performance reasons OpenRC keeps a cache of pre-parsed initscript metadata
 (e.g. `depend`). The default location for this is `/${RC_SVCDIR}/cache`.

 The cache uses `mtime` to check for file staleness. Should any service script
@@ -175,5 +265,5 @@ change it'll re-source the relevant files and update the cache

 OpenRC has wrappers for many common output tasks in libeinfo.
 This allows to print colour-coded status notices and other things.
-To make the output consistent the bundled service scripts all use ebegin/eend to 
+To make the output consistent the bundled initscripts all use ebegin/eend to 
 print nice messages.
--- a/init.d/.gitignore
+++ b/init.d/.gitignore
@@ -1,6 +1,4 @@
-agetty
 binfmt
-cgroups
 modules-load
 bootmisc
 fsck
--- a/init.d/Makefile
+++ b/init.d/Makefile
@@ -19,12 +19,11 @@ SRCS-FreeBSD=	hostid.in modules.in moused.in newsyslog.in pf.in rarpd.in \
 		rc-enabled.in rpcbind.in savecore.in syslogd.in
 # These are FreeBSD specific
 SRCS-FreeBSD+=	adjkerntz.in devd.in dumpon.in encswap.in ipfw.in \
-		modules-load.in mixer.in nscd.in powerd.in syscons.in
+		modules.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 modules-load.in \
-	mount-ro.in mtab.in numlock.in procfs.in net-online.in sysfs.in \
-termencoding.in
+SRCS-Linux=	agetty.in binfmt.in devfs.in dmesg.in hwclock.in consolefont.in \
+	keymaps.in killprocs.in modules.in modules-load.in mount-ro.in mtab.in \
+	numlock.in procfs.in net-online.in sysfs.in termencoding.in

 # Generic BSD scripts
 SRCS-NetBSD=	hostid.in moused.in newsyslog.in pf.in rarpd.in rc-enabled.in \
--- a/init.d/adjkerntz.in
+++ b/init.d/adjkerntz.in
@@ -23,7 +23,6 @@ fi

 depend()
 {
-	after swclock
 	provide clock
 	# BSD adjkerntz needs to be able to write to /etc
 	if [ "$clock" = "UTC" -a -e /etc/wall_cmos_clock ] ||
--- a/init.d/agetty.in
+++ b/init.d/agetty.in
@@ -14,13 +14,11 @@ supervisor=supervise-daemon
 port="${RC_SVCNAME#*.}"
 term_type="${term_type:-linux}"
 command=/sbin/agetty
-command_args_foreground="${agetty_options} ${port} ${baud} ${term_type}"
+command_args_foreground="${agetty_options} ${port} ${baud} ${termtype}"
 pidfile="/run/${RC_SVCNAME}.pid"
-export EINFO_QUIET="${quiet:-yes}"

 depend() {
 	after local
-	keyword -prefix
 }

 start_pre() {
--- a/init.d/binfmt.in
+++ b/init.d/binfmt.in
@@ -13,7 +13,7 @@ description="Register misc binary format handlers"

 depend()
 {
-	after clock procfs
+	after procfs
 	use modules devfs
 	keyword -docker -lxc -openvz -prefix -systemd-nspawn -vserver
 }
--- a/init.d/bootmisc.in
+++ b/init.d/bootmisc.in
@@ -71,8 +71,7 @@ cleanup_var_run_dir()
 	ebegin "Cleaning /var/run"
 	for x in $(find /var/run ! -type d ! -name utmp \
 		! -name random-seed ! -name dev.db \
-		! -name ld-elf.so.hints ! -name ld-elf32.so.hints \
-		! -name ld.so.hints);
+		! -name ld-elf.so.hints ! -name ld.so.hints);
 	do
 		# Clean stale sockets
 		if [ -S "$x" ]; then
@@ -241,7 +240,7 @@ stop()
 {
 	# Write a halt record if we're shutting down
 	if [ "$RC_RUNLEVEL" = shutdown ]; then
-		[ "$RC_UNAME" = Linux ] && openrc-shutdown -w
+		[ "$RC_UNAME" = Linux ] && halt -w
 		if [ "$RC_SYS" = OPENVZ ]; then
 			yesno $RC_REBOOT && printf "" >/reboot
 		fi
--- a/init.d/cgroups.in
+++ b/init.d/cgroups.in
@@ -1,149 +0,0 @@
-#!@SBINDIR@/openrc-run
-# Copyright (c) 2017 The OpenRC Authors.
-# See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
-#
-# This file is part of OpenRC. It is subject to the license terms in
-# the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
-# This file may not be copied, modified, propagated, or distributed
-# except according to the terms contained in the LICENSE file.
-
-description="Mount the control groups."
-
-cgroup_opts=nodev,noexec,nosuid
-
-depend()
-{
-	keyword -docker -prefix -systemd-nspawn -vserver
-	after sysfs
-}
-
-cgroup1_base()
-{
-	grep -qw cgroup /proc/filesystems || return 0
-	if ! mountinfo -q /sys/fs/cgroup; then
-		ebegin "Mounting cgroup filesystem"
-		local opts="${cgroup_opts},mode=755,size=${rc_cgroupsize:-10m}"
-		mount -n -t tmpfs -o "${opts}" cgroup_root /sys/fs/cgroup
-		eend $?
-	fi
-
-	if ! mountinfo -q /sys/fs/cgroup/openrc; then
-		local agent="${RC_LIBEXECDIR}/sh/cgroup-release-agent.sh"
-		mkdir /sys/fs/cgroup/openrc
-		mount -n -t cgroup \
-			-o none,${cgroup_opts},name=openrc,release_agent="$agent" \
-			openrc /sys/fs/cgroup/openrc
-		printf 1 > /sys/fs/cgroup/openrc/notify_on_release
-	fi
-	return 0
-}
-
-cgroup1_controllers()
-{
-	yesno "${rc_controller_cgroups:-YES}" && [ -e /proc/cgroups ]  &&
-	grep -qw cgroup /proc/filesystems || return 0
-	while read -r name _ _ enabled _; do
-		case "${enabled}" in
-			1)	mountinfo -q "/sys/fs/cgroup/${name}" && continue
-				local x
-				for x in $rc_cgroup_controllers; do
-				[ "${name}" = "blkio" ] && [ "${x}" = "io" ] &&
-					continue 2
-				[ "${name}" = "${x}" ] &&
-				continue 2
-				done
-				mkdir "/sys/fs/cgroup/${name}"
-				mount -n -t cgroup -o "${cgroup_opts},${name}" \
-					"${name}" "/sys/fs/cgroup/${name}"
-				yesno "${rc_cgroup_memory_use_hierarchy:-no}" &&
-					[ "${name}" = memory ] &&
-					echo 1 > /sys/fs/cgroup/memory/memory.use_hierarchy
-				;;
-		esac
-	done < /proc/cgroups
-	return 0
-}
-
-cgroup2_base()
-{
-	grep -qw cgroup2 /proc/filesystems || return 0
-	local base
-	base="$(cgroup2_find_path)"
-	mkdir -p "${base}"
-	mount -t cgroup2 none -o "${cgroup_opts},nsdelegate" "${base}" 2> /dev/null ||
-		mount -t cgroup2 none -o "${cgroup_opts}" "${base}"
-	return 0
-}
-
-cgroup2_controllers()
-{
-	grep -qw cgroup2 /proc/filesystems || return 0
-	local active cgroup_path x y
-	cgroup_path="$(cgroup2_find_path)"
-	[ -z "${cgroup_path}" ] && return 0
-	[ -e "${cgroup_path}/cgroup.controllers" ] &&
-	read -r active < "${cgroup_path}/cgroup.controllers"
-	for x in ${rc_cgroup_controllers}; do
-		for y in ${active}; do
-		[ "$x" = "$y" ] &&
-			[ -e "${cgroup_path}/cgroup.subtree_control" ]&&
-			echo "+${x}"  > "${cgroup_path}/cgroup.subtree_control"
-		done
-	done
-	return 0
-}
-
-cgroups_hybrid()
-{
-	cgroup1_base
-	cgroup2_base
-	cgroup2_controllers
-	cgroup1_controllers
-	return 0
-}
-
-cgroups_legacy()
-{
-	cgroup1_base
-	cgroup1_controllers
-	return 0
-}
-
-cgroups_unified()
-{
-	cgroup2_base
-	cgroup2_controllers
-	return 0
-}
-
-mount_cgroups()
-{
-	case "${rc_cgroup_mode:-hybrid}" in
-	hybrid) cgroups_hybrid ;;
-	legacy) cgroups_legacy ;;
-	unified) cgroups_unified ;;
-	esac
-	return 0
-}
-
-restorecon_cgroups()
-{
-	if [ -x /sbin/restorecon ]; then
-		ebegin "Restoring SELinux contexts in /sys/fs/cgroup"
-		restorecon -rF /sys/fs/cgroup >/dev/null 2>&1
-		eend $?
-	fi
-	return 0
-}
-
-start()
-{
-	# set up kernel support for cgroups
-	if [ -d /sys/fs/cgroup ]; then
-		mount_cgroups
-		restorecon_cgroups
-	fi
-	return 0
-}
--- a/init.d/devdb.in
+++ b/init.d/devdb.in
@@ -13,7 +13,6 @@ description="Creates the dev database"

 depend()
 {
-	after clock
 	need localmount
 }

--- a/init.d/devfs.in
+++ b/init.d/devfs.in
@@ -20,12 +20,9 @@ depend()

 mount_dev()
 {
-	local action conf_d_dir devfstype msg mountopts
-	action=--mount
-	conf_d_dir="${RC_SERVICE%/*/*}/conf.d"
-	msg=Mounting
+	local action=--mount devfstype msg=Mounting
 	# Some devices require exec, Bug #92921
-	mountopts="exec,nosuid,mode=0755"
+	local mountopts="exec,nosuid,mode=0755"
 	if yesno ${skip_mount_dev:-no} ; then
 		einfo "/dev will not be mounted due to user request"
 		return 0
@@ -36,7 +33,7 @@ mount_dev()
 		msg=Remounting
 	fi
 	if fstabinfo -q /dev; then
-		ebegin "$msg /dev according to fstab"
+		ebegin "$msg /dev according to @SYSCONFDIR@/fstab"
 		fstabinfo -q $action /dev
 		eend $?
 		return 0
@@ -57,7 +54,7 @@ mount_dev()
 		ewarn "is no entry for /dev in fstab."
 		ewarn "This means /dev will not be mounted."
 		ewarn "To avoid this message, set CONFIG_DEVTMPFS or CONFIG_TMPFS to y"
-		ewarn "in your kernel configuration or see ${conf_d_dir}/${RC_SVCNAME}"
+		ewarn "in your kernel configuration or see @SYSCONFDIR@/conf.d/devfs"
 	fi
 	return 0
 }
--- a/init.d/dumpon.in
+++ b/init.d/dumpon.in
@@ -12,7 +12,6 @@
 description="Configures a specific kernel dump device."

 depend() {
-	after clock
 	need swap
 	keyword -jail -prefix
 }
--- a/init.d/fsck.in
+++ b/init.d/fsck.in
@@ -15,7 +15,6 @@ _IFS="

 depend()
 {
-	after clock
 	use dev clock modules
 	keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn -timeout -vserver -uml
 }
--- a/init.d/hostid.in
+++ b/init.d/hostid.in
@@ -15,7 +15,6 @@ extra_commands="reset"
 depend()
 {
 	use root
-	after clock
 	before devd net
 	keyword -jail -prefix
 }
--- a/init.d/hostname.in
+++ b/init.d/hostname.in
@@ -11,22 +11,20 @@

 description="Sets the hostname of the machine."

-depend()
-{
-	after clock
+depend() {
 	keyword -docker -lxc -prefix -systemd-nspawn
 }

 start()
 {
 	local h source x
-	if [ -s /etc/hostname ] && [ -r /etc/hostname ]; then
-		read h x </etc/hostname
-		source="from /etc/hostname"
+	if [ -s @SYSCONFDIR@/hostname ] && [ -r @SYSCONFDIR@/hostname ]; then
+	read h x <@SYSCONFDIR@/hostname
+	source=" from @SYSCONFDIR@/hostname"
 	else
 		# HOSTNAME variable used to be defined in caps in conf.d/hostname.
 		# It is also a magic variable in bash.
-		h=${hostname:-${HOSTNAME}} # checkbashisms: false positive (HOSTNAME var)
+		h=${hostname-${HOSTNAME}} # checkbashisms: false positive
 	fi
 	if [ -z "$h" ]; then
 		einfo "Using default system hostname"
--- a/init.d/hwclock.in
+++ b/init.d/hwclock.in
@@ -33,6 +33,9 @@ depend()
 	want modules
 	if yesno $clock_adjfile; then
 		use root
+	else
+		before binfmt bootmisc fsck hostname keymaps localmount loopback mtab
+		before procfs root swap sysctl termencoding urandom
 	fi
 	keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu
 }
@@ -105,7 +108,7 @@ start()
 			done
 			[ -n "$modname" ] &&
 				ewarn "The $modname module needs to be configured in" \
-					"${RC_SERVICE%/*/*}/conf.d/modules or built in."
+					"@SYSCONFDIR@/conf.d/modules or built in."
 		fi
 	fi

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

--- a/init.d/killprocs.in
+++ b/init.d/killprocs.in
@@ -19,9 +19,9 @@ depend()
 start()
 {
 	ebegin "Terminating remaining processes"
-	kill_all 15 ${killall5_opts}
+	killall5 -15 ${killall5_opts}
 	eend 0
 	ebegin "Killing remaining processes"
-	kill_all 9 ${killall5_opts}
+	killall5 -9 ${killall5_opts}
 	eend 0
 }
--- a/init.d/local.in
+++ b/init.d/local.in
@@ -9,10 +9,7 @@
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.

-conf_d_dir="${RC_SERVICE%/*/*}/conf.d"
-local_d_dir="${RC_SERVICE%/*/*}/local.d"
-
-description="Executes user programs in ${local_d_dir}"
+description="Executes user programs in @SYSCONFDIR@/local.d"

 depend()
 {
@@ -22,12 +19,12 @@ depend()

 start()
 {
-	local file has_errors redirect retval
-	has_errors=0
-	yesno $rc_verbose || redirect='> /dev/null 2>&1'
 	ebegin "Starting local"
+
+	local file has_errors=0 redirect retval
+	yesno $rc_verbose || redirect='> /dev/null 2>&1'
 	eindent
-	for file in "${local_d_dir}"/*.start; do
+	for file in @SYSCONFDIR@/local.d/*.start; do
 		if [ -x "${file}" ]; then
 			vebegin "Executing \"${file}\""
 			eval "${file}" $redirect
@@ -41,32 +38,32 @@ start()
 	eoutdent

 	if command -v local_start >/dev/null 2>&1; then
-		ewarn "\"${conf_d_dir}/local\" should be removed."
+		ewarn "\"@SYSCONFDIR@/conf.d/local\" should be removed."
 		ewarn "Please move the code from the local_start function"
 		ewarn "to executable scripts with an .start extension"
-		ewarn "in \"${local_d_dir}\""
+		ewarn "in \"@SYSCONFDIR@/local.d\""
 		local_start
 	fi

 	eend ${has_errors}

 	# We have to end with a zero exit code, because a failed execution
-	# of an executable ${local_d_dir}/*.start file shouldn't result in
+	# of an executable @SYSCONFDIR@/local.d/*.start file shouldn't result in
 	# marking the local service as failed. Otherwise we are unable to
-	# execute any executable ${local_d_dir}/*.stop file, because a failed
+	# execute any executable @SYSCONFDIR@/local.d/*.stop file, because a failed
 	# marked service cannot be stopped (and the stop function would
-	# actually call the executable ${local_d_dir}/*.stop file(s)).
+	# actually call the executable @SYSCONFDIR@/local.d/*.stop file(s)).
 	return 0
 }

 stop()
 {
-	local file has_errors redirect retval
-	has_errors=0
-	yesno $rc_verbose || redirect='> /dev/null 2>&1'
 	ebegin "Stopping local"
+
+	local file has_errors=0 redirect retval
+	yesno $rc_verbose || redirect='> /dev/null 2>&1'
 	eindent
-	for file in "${local_d_dir}"/*.stop; do
+	for file in @SYSCONFDIR@/local.d/*.stop; do
 		if [ -x "${file}" ]; then
 			vebegin "Executing \"${file}\""
 			eval "${file}" $redirect
@@ -80,16 +77,16 @@ stop()
 	eoutdent

 	if command -v local_stop >/dev/null 2>&1; then
-		ewarn "\"${conf_d_dir}/local\" should be removed."
+		ewarn "\"@SYSCONFDIR@/conf.d/local\" should be removed."
 		ewarn "Please move the code from the local_stop function"
 		ewarn "to executable scripts with an .stop extension"
-		ewarn "in \"${local_d_dir}\""
+		ewarn "in \"@SYSCONFDIR@/local.d\""
 		local_stop
 	fi

 	eend ${has_errors}

-	# An executable ${local_d_dir}/*.stop file which failed with a
+	# An executable @SYSCONFDIR@/local.d/*.stop file which failed with a
 	# non-zero exit status is not a reason to mark this service
 	# as failed, therefore we have to end with a zero exit code.
 	return 0
--- a/init.d/localmount.in
+++ b/init.d/localmount.in
@@ -14,8 +14,8 @@ description="Mounts disks and swap according to /etc/fstab."
 depend()
 {
 	need fsck
-	use lvm modules root
-	after clock lvm modules root
+	use lvm modules mtab root
+	after lvm modules root
 	keyword -docker -jail -lxc -prefix -systemd-nspawn -vserver
 }

--- a/init.d/loopback.in
+++ b/init.d/loopback.in
@@ -13,7 +13,6 @@ description="Configures the loopback interface."

 depend()
 {
-	after clock
 	keyword -jail -prefix -systemd-nspawn -vserver
 }

--- a/init.d/mount-ro.in
+++ b/init.d/mount-ro.in
@@ -13,7 +13,7 @@ description="Re-mount filesytems read-only for a clean reboot."

 depend()
 {
-	after killprocs savecache
+	need killprocs savecache
 	keyword -docker -lxc -openvz -prefix -systemd-nspawn -vserver
 }

--- a/init.d/mtab.in
+++ b/init.d/mtab.in
@@ -13,8 +13,6 @@ description="Update /etc/mtab to match what the kernel knows about"

 depend()
 {
-	after clock
-	before localmount
 	need root
 	keyword -prefix -systemd-nspawn
 }
@@ -31,10 +29,6 @@ start()
 		einfo "Creating mtab symbolic link"
 		ln -snf /proc/self/mounts /etc/mtab
 	else
-		ewarn "The ${RC_SVCNAME} service will be removed in the future."
-		ewarn "Please change the mtab_is_file setting to no and run"
-		ewarn "# rc-service mtab restart"
-		ewarn "to create the mtab symbolic link."
 		[ -L /etc/mtab ] && ewarn "Removing /etc/mtab symbolic link"
 		rm -f /etc/mtab
 		einfo "Creating mtab file"
--- a/init.d/net-online.in
+++ b/init.d/net-online.in
@@ -23,7 +23,6 @@ get_interfaces()
 {
 	local ifname iftype
 	for ifname in /sys/class/net/*; do
-		[ -h "${ifname}" ] && continue
 		read iftype < ${ifname}/type
 		[ "$iftype" = "1" ] && printf "%s " ${ifname##*/}
 	done
@@ -32,7 +31,7 @@ get_interfaces()
 start ()
 {
 	local carriers configured dev gateway ifcount infinite
-	local carrier operstate rc
+	local rc state x

 	ebegin "Checking to see if the network is online"
 	rc=0
@@ -45,12 +44,10 @@ start ()
 	ifcount=0
 	for dev in ${interfaces}; do
 		: $((ifcount += 1))
-		read carrier < /sys/class/net/$dev/carrier 2> /dev/null ||
-			carrier=
-		[ "$carrier" = 1 ] && : $((carriers += 1))
-		read operstate < /sys/class/net/$dev/operstate 2> /dev/null ||
-			operstate=
-		[ "$operstate" = up ] && : $((configured += 1))
+		read x < /sys/class/net/$dev/carrier
+		[ $x -eq 1 ] && : $((carriers += 1))
+		read x < /sys/class/net/$dev/operstate
+		[ "$x" = up ] && : $((configured += 1))
 	done
 	[ $configured -eq $ifcount ] && [ $carriers -ge 1 ] && break
 	sleep 1
@@ -64,12 +61,8 @@ start ()
 if [ $rc -eq 0 ] && yesno ${include_ping_test:-no}; then
 	ping_test_host="${ping_test_host:-google.com}"
 	if [ -n "$ping_test_host" ]; then
-		while $infinite || [ $timeout -gt 0 ]; do
-			ping -c 1 $ping_test_host > /dev/null 2>&1
-			rc=$?
-			[ $rc -eq 0 ] && break
-			: $((timeout -= 1))
-		done
+		ping -c 1 $ping_test_host > /dev/null 2>&1
+		rc=$?
 	fi
 fi
 eend $rc "The network is offline"
--- a/init.d/network.in
+++ b/init.d/network.in
@@ -18,7 +18,7 @@ __nl="
 depend()
 {
 	need localmount
-	after bootmisc clock
+	after bootmisc
 	if [ -n "$(interfaces)" ]; then
 		provide net
 	fi
@@ -76,7 +76,7 @@ tentative()

 	case "$RC_UNAME" in
 	Linux)
-		[ -n "$(command -v ip)" ] || return 1
+		[ -x /sbin/ip ] || [ -x /bin/ip ] || return 1
 		[ -n "$(ip -f inet6 addr show tentative)" ]
 		;;
 	*)
@@ -174,7 +174,7 @@ runip()
 routeflush()
 {
 	if [ "$RC_UNAME" = Linux ]; then
-		if [ -n "$(command -v ip)"  ]; then
+		if [ -x /sbin/ip ] || [ -x /bin/ip ]; then
 			ip route flush scope global
 			ip route delete default 2>/dev/null
 		else
@@ -346,7 +346,7 @@ stop()
 		then
 			veinfo "$int"
 			runargs /etc/ifdown."$int" "$downcmd"
-			if [ -n "$(command -v ip)" ]; then
+			if [ -x /sbin/ip ] || [ -x /bin/ip ]; then
 				# We need to do this, otherwise we may
 				# fail to add things correctly on restart
 				ip address flush dev "$int" 2>/dev/null
--- a/init.d/newsyslog.in
+++ b/init.d/newsyslog.in
@@ -13,7 +13,6 @@ required_files="/etc/newsyslog.conf"

 depend()
 {
-	after clock
 	need localmount
 	keyword -prefix
 }
--- a/init.d/procfs.in
+++ b/init.d/procfs.in
@@ -13,7 +13,6 @@ description="Mounts misc filesystems in /proc."

 depend()
 {
-	after clock
 	use devfs
 	want modules
 	need localmount
@@ -27,8 +26,8 @@ start()
 		[ ! -e /proc/sys/fs/binfmt_misc/register ]; then
 		if ! grep -qs binfmt_misc /proc/filesystems &&
 			modprobe -q binfmt-misc; then
-			ewarn "The binfmt-misc module needs to be loaded by" \
-				"the modules service or built in."
+			ewarn "The binfmt-misc module needs to be configured in" \
+				"@SYSCONFDIR@/conf.d/modules or built in."
 		fi
 		if grep -qs binfmt_misc /proc/filesystems; then
 			ebegin "Mounting misc binary format filesystem"
--- a/init.d/root.in
+++ b/init.d/root.in
@@ -13,7 +13,6 @@ description="Mount the root fs read/write"

 depend()
 {
-	after clock
 	need fsck
 	keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn -vserver
 }
--- a/init.d/savecore.in
+++ b/init.d/savecore.in
@@ -14,7 +14,6 @@ description="Saves a kernel dump."
 depend()
 {
 	need dumpon localmount
-	after clock
 	before encswap
 	keyword -jail -prefix
 }
--- a/init.d/staticroute.in
+++ b/init.d/staticroute.in
@@ -14,9 +14,9 @@
 description="Configures static routes."
 __nl="
 "
+
 depend()
 {
-	after clock
 	provide net
 	use network
 	keyword -jail -prefix -vserver
--- a/init.d/swap-blk.in
+++ b/init.d/swap-blk.in
@@ -11,7 +11,6 @@

 depend()
 {
-	after clock
 	before fsck
 	keyword -jail -prefix
 }
--- a/init.d/swap.in
+++ b/init.d/swap.in
@@ -11,7 +11,6 @@

 depend()
 {
-	after clock
 	before localmount
 	keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn -vserver
 }
--- a/init.d/swclock.in
+++ b/init.d/swclock.in
@@ -13,6 +13,10 @@ description="Sets the local clock to the mtime of a given file."

 depend()
 {
+	before adjkerntz binfmt bootmisc devdb dumpon fsck hostid hostname keymaps
+	before localmount loopback modules mtab network newsyslog procfs root
+	before savecore staticroute swap swap-blk syscons sysctl syslogd
+	before termencoding ttys urandom wscons
 	provide clock
 	keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu
 }
--- a/init.d/syscons.in
+++ b/init.d/syscons.in
@@ -10,7 +10,6 @@
 # except according to the terms contained in the LICENSE file.

 depend() {
-	after clock
 	need localmount
 	keyword -jail -prefix
 }
--- a/init.d/sysctl.in
+++ b/init.d/sysctl.in
@@ -11,7 +11,6 @@

 depend()
 {
-	after clock
 	before bootmisc logger
 	keyword -prefix -systemd-nspawn -vserver
 }
@@ -21,7 +20,7 @@ BSD_sysctl()
 	[ -e /etc/sysctl.conf ] || return 0
 	local retval=0 var= comments= conf=
 	eindent
-	for conf in /etc/sysctl.conf /etc/sysctl.d/*.conf; do
+	for conf in @SYSCONFDIR@/sysctl.conf @SYSCONFDIR@/sysctl.d/*.conf; do
 		if [ -r "$conf" ]; then
 			vebegin "applying $conf"
 			while read var comments; do
--- a/init.d/sysfs.in
+++ b/init.d/sysfs.in
@@ -101,17 +101,53 @@ mount_misc()
 	if [ -d /sys/firmware/efi/efivars ] &&
 		! mountinfo -q /sys/firmware/efi/efivars; then
 		ebegin "Mounting efivarfs filesystem"
-		mount -n -t efivarfs -o ro \
+		mount -n -t efivarfs -o ${sysfs_opts} \
 			efivarfs /sys/firmware/efi/efivars 2> /dev/null
 		eend 0
 	fi
 }

+mount_cgroups()
+{
+	# set up kernel support for cgroups
+	if [ -d /sys/fs/cgroup ] && ! mountinfo -q /sys/fs/cgroup; then
+		if grep -qs cgroup /proc/filesystems; then
+			ebegin "Mounting cgroup filesystem"
+			local opts="${sysfs_opts},mode=755,size=${rc_cgroupsize:-10m}"
+			mount -n -t tmpfs -o ${opts} cgroup_root /sys/fs/cgroup
+			eend $?
+		fi
+	fi
+
+	mountinfo -q /sys/fs/cgroup || return 0
+
+	if ! mountinfo -q /sys/fs/cgroup/openrc; then
+		local agent="@LIBEXECDIR@/sh/cgroup-release-agent.sh"
+		mkdir /sys/fs/cgroup/openrc
+		mount -n -t cgroup \
+			-o none,${sysfs_opts},name=openrc,release_agent="$agent" \
+			openrc /sys/fs/cgroup/openrc
+		printf 1 > /sys/fs/cgroup/openrc/notify_on_release
+	fi
+
+	yesno ${rc_controller_cgroups:-YES} && [ -e /proc/cgroups ] || return 0
+	while read name hier groups enabled rest; do
+		case "${enabled}" in
+			1)	mountinfo -q /sys/fs/cgroup/${name} && continue
+				mkdir /sys/fs/cgroup/${name}
+				mount -n -t cgroup -o ${sysfs_opts},${name} \
+					${name} /sys/fs/cgroup/${name}
+				;;
+		esac
+	done < /proc/cgroups
+}
+
 restorecon_sys()
 {
 	if [ -x /sbin/restorecon ]; then
 		ebegin "Restoring SELinux contexts in /sys"
 		restorecon -F /sys/devices/system/cpu/online >/dev/null 2>&1
+		restorecon -rF /sys/fs/cgroup >/dev/null 2>&1
 		eend $?
 	fi
 }
@@ -120,6 +156,7 @@ start()
 {
 	mount_sys
 	mount_misc
+	mount_cgroups
 	restorecon_sys
 	return 0
 }
--- a/init.d/syslogd.in
+++ b/init.d/syslogd.in
@@ -22,6 +22,6 @@ depend()
 	provide logger
 	use net newsyslog
 	need localmount
-	after bootmisc clock
+	after bootmisc
 	keyword -prefix
 }
--- a/init.d/termencoding.in
+++ b/init.d/termencoding.in
@@ -18,7 +18,7 @@ depend()
 {
 	keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu
 	use root
-	after bootmisc clock
+	after bootmisc
 }

 start()
--- a/init.d/ttys.in
+++ b/init.d/ttys.in
@@ -11,7 +11,7 @@

 depend()
 {
-	after clock fsck
+	after fsck
 	keyword -prefix
 }

--- a/init.d/urandom.in
+++ b/init.d/urandom.in
@@ -14,7 +14,6 @@ description="Initializes the random number generator."

 depend()
 {
-	after clock
 	need localmount
 	keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn
 }
--- a/init.d/wscons.in
+++ b/init.d/wscons.in
@@ -11,7 +11,6 @@

 depend()
 {
-	after clock
 	need localmount
 	keyword -prefix
 }
--- a/man/Makefile
+++ b/man/Makefile
@@ -6,10 +6,10 @@ MAN3=		einfo.3 \
 		rc_config.3 rc_deptree.3 rc_find_pids.3 rc_plugin_hook.3 \
 		rc_runlevel.3 rc_service.3 rc_stringlist.3
 MAN8=		rc-service.8 rc-status.8 rc-update.8 openrc.8 openrc-run.8 \
-		start-stop-daemon.8 supervise-daemon.8
+		service.8 start-stop-daemon.8 supervise-daemon.8

 ifeq (${OS},Linux)
-MAN8 += rc-sstat.8 openrc-init.8 openrc-shutdown.8
+MAN8 += rc-sstat.8
 endif

 # Handy macro to create symlinks
--- a/man/openrc-init.8
+++ b/man/openrc-init.8
@@ -1,46 +0,0 @@
-.\" Copyright (c) 2017 The OpenRC Authors.
-.\" See the Authors file at the top-level directory of this distribution and
-.\" https://github.com/OpenRC/openrc/blob/master/AUTHORS
-.\"
-.\" This file is part of OpenRC. It is subject to the license terms in
-.\" the LICENSE file found in the top-level directory of this
-.\" distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
-.\" This file may not be copied, modified, propagated, or distributed
-.\"    except according to the terms contained in the LICENSE file.
-.\"
-.Dd April 6, 2017
-.Dt openrc-init 8 SMM
-.Os OpenRC
-.Sh NAME
-.Nm openrc-init
-.Nd the parent of all processes
-.Sh SYNOPSIS
-.Nm
-.Sh DESCRIPTION
-.Nm
-is an init process which can be an alternative to sysvinit or any other
-init process.
-.Pp
-To use
-.Nm
-configure your boot loader to invoke it or symlink it to /sbin/init.
-Also, you will need to use
-.Xr openrc-shutdown 8 ,
-to halt, reboot or poweroff the system.
-.Pp
-The default runlevel is read from the init command line, the
-rc_default_runlevel setting in rc.conf, the kernel command line, or it is
-assumed to be "default" if it is not set in any of these places.
-.Pp
-.Nm
-doesn't manage getty's directly, so you will need to manage them another
-way. For example, you can use the agetty service script as described in
-agetty-guide.md in this distribution.
-.Sh BUGS
-This was first released as part of OpenRC 0.25.
-I do not know of any specific issues. However, since this is the first
-release of openrc-init, please test and report any issues you find.
-.Sh SEE ALSO
-.Xr openrc-shutdown 8 ,
-.Sh AUTHORS
-.An William Hubbs <w.d.hubbs@gmail.com>
--- a/man/openrc-run.8
+++ b/man/openrc-run.8
@@ -8,7 +8,7 @@
 .\" This file may not be copied, modified, propagated, or distributed
 .\"    except according to the terms contained in the LICENSE file.
 .\"
-.Dd November 30, 2017
+.Dd December 31, 2011
 .Dt openrc-run 8 SMM
 .Os OpenRC
 .Sh NAME
@@ -111,12 +111,9 @@ The path to the s6 service directory if you are monitoring this service
 with S6. The default is /var/svc.d/${RC_SVCNAME}.
 .It Ar s6_svwait_options_start
 The options to pass to s6-svwait when starting the service via s6.
-.It Ar s6_force_kill
-Should we force-kill this service if s6_service_timeout_stop expires
-but the service doesn't go down during shutdown? The default is yes.
 .It Ar s6_service_timeout_stop
 The amount of time, in milliseconds, s6-svc should wait for the service
-to go down when stopping the service. The default is 60000.
+to go down when stopping the service. The default is 10000.
 .It Ar start_stop_daemon_args
 List of arguments passed to start-stop-daemon when starting the daemon.
 .It Ar command
@@ -142,39 +139,21 @@ List of arguments to pass to the daemon when starting via
 .Nm supervise-daemon .
 to force the daemon to stay in the foreground
 .It Ar command_background
-Set this to "true", "yes" or "1" (case-insensitive) if you want
+Set this to "true", "yes" or "1" (case-insensitive) if you want 
 .Xr start-stop-daemon 8
 to force the daemon into the background. This forces the
 "--make-pidfile" and "--pidfile" options, so the pidfile variable must be set.
 .It Ar command_progress
-Set this to "true", "yes" or "1" (case-insensitive) if you want
+Set this to "true", "yes" or "1" (case-insensitive) if you want 
 .Xr start-stop-daemon 8
 to display a progress meter when waiting for a daemon to stop.
 .It Ar command_user
 If the daemon does not support changing to a different user id, you can
-use this to change the user id, and optionally group id,  before
+use this to change the user id before
 .Xr start-stop-daemon 8
 or
 .Xr supervise-daemon 8
-launches the daemon.
-.It Ar output_log
-This is the path to a file or named pipe where the standard output from
-the service will be redirected. 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 path will be inside the chroot if the
-.Pa chroot
-variable is set.
-.It Ar error_log
-The same thing as
-.Pa output_log
-but for the standard error output.
-.It Ar directory
-.Xr start-stop-daemon 8
-and
-.Xr supervise-daemon 8
-will chdir to this directory before starting the daemon.
+launches the daemon
 .It Ar chroot
 .Xr start-stop-daemon 8
 and
@@ -188,24 +167,6 @@ Display name used for the above defined command.
 Process name to match when signaling the daemon.
 .It Ar stopsig
 Signal to send when stopping the daemon.
-.It Ar respawn_delay
-Respawn delay
-.Xr supervise-daemon 8
-will use for this daemon.  See
-.Xr supervise-daemon 8
-for more information about this setting.
-.It Ar respawn_max
-Respawn max
-.Xr supervise-daemon 8
-will use for this daemon.  See
-.Xr supervise-daemon 8
-for more information about this setting.
-.It Ar respawn_period
-Respawn period
-.Xr supervise-daemon 8
-will use for this daemon.  See
-.Xr supervise-daemon 8
-for more information about this setting.
 .It Ar retry
 Retry schedule to use when stopping the daemon. It can either be a
 timeout in seconds or multiple signal/timeout pairs (like SIGTERM/5).
@@ -219,8 +180,6 @@ used along with in_background_fake to support re-entrant services.
 .It Ar in_background_fake
 Space separated list of commands which should always succeed when
 in_background is yes.
-.It Ar umask
-Set the umask of the daemon.
 .Pp
 Keep in mind that eval is used to process chroot, command, command_args_*,
 command_user, pidfile and procname. This may affect how they are
@@ -240,10 +199,8 @@ that dependency type to the function, or prefix the names with ! to
 remove them from the dependencies.
 .Bl -tag -width "RC_DEFAULTLEVEL"
 .It Ic need
-The service will attempt to start any services it needs regardless of
-whether they have been added to the runlevel. It will refuse to start
-until all services it needs have started, and it will refuse to stop until all
-services that need it have stopped.
+The service will refuse to start until needed services have started and it
+will refuse to stop until any services that need it have stopped.
 .It Ic use
 The service will attempt to start any services it uses that have been added
 to the runlevel.
@@ -309,18 +266,6 @@ system.
 To see how to influence dependencies in configuration files, see the
 .Sx FILES
 section below.
-.Sh _pre AND _post FUNCTIONS
-Any command defined in extra_commands, extra_started_commands or
-extra_stopped_commands can have _pre and _post functions in the service
-script. If the command function is called foo, the_pre and _post
-functions for it should be called foo_pre and foo_post.
-.Pp
-These functions should be used to perform preparation before the
-command is run and cleanup after the command completes. In order for
-.Nm
-to record the command as being run successfully, the _pre
-function, command function itself and the _post function should all exit
-with a zero return code.
 .Sh BUILTINS
 .Nm
 defines some builtin functions that you can use inside your service scripts:
@@ -449,65 +394,27 @@ If -d, -f or -p is specified, checkpath checks to see if the path
 exists, is the right type and has the correct owner and access modes. If
 any of these tests fail, the path is created and set up as specified. If
 more than one of -d, -f or -p are specified, the last one will be used.
-.Pp
+
 The argument to -m is a three or four digit octal number. If this option
 is not provided, the value defaults to 0644 for files and 0775 for
 directories.
-.Pp
+
 The argument to -o is a representation of the user and/or group which
 should own the path. The user and group can be represented numerically
 or with names, and are separated by a colon.
-.Pp
+
 The truncate options (-D and -F) cause the directory or file to be
 cleared of all contents.
-.Pp
+
 If -W is specified, checkpath checks to see if the first path given on
 the command line is writable.  This is different from how the test
 command in the shell works, because it also checks to make sure the file
 system is not read only.
-.Pp
+
 Also, the -d, -f or -p options should not be specified along with this option.
-.Pp
+
 The -q option suppresses all informational output. If it is specified
 twice, all error messages are suppressed as well.
-.It Xo
-.Ic fstabinfo
-.Op Fl M , -mount
-.Op Fl R , -remount
-.Op Fl b , -blockdevice
-.Op Fl m , -mountargs
-.Op Fl o , -options
-.Op Fl p , -passno Ar passno
-.Op Fl t , -type Ar fstype
-.Ar path
-.Xc
-If -b, -m, -o, -p or -t is specified,the appropriate information is
-extracted from fstab. If -M or -R are given, file systems are mounted or
-remounted.
-.Pp
-The -q option suppresses all informational output. If it is specified
-twice, all error messages are suppressed as well.
-.It Xo
-.Ic mountinfo
-.Op Fl f, -fstype-regex Ar regex
-.Op Fl F, -skip-fstype-regex Ar regex
-.Op Fl n, -node-regex Ar regex
-.Op Fl N, -skip-node-regex Ar regex
-.Op Fl o, -options-regex Ar regex
-.Op Fl O, -skip-options-regex Ar regex
-.Op Fl p, -point-regex Ar regex
-.Op Fl P, -skip-point-regex Ar regex
-.Op Fl e, -netdev
-.Op Fl E, -nonetdev
-.Op Fl i, -options
-.Op Fl s, -fstype
-.Op Fl t, -node
-.Ar mount1 mount2 ...
-.Xc
-The f, F, n, N, o, O, p, P, e and E options specify what you want to
-search for or skip in the mounted file systems. The i, s and t options
-specify what you want to display. If no mount points are given, all
-mount points will be considered.
 .It Ic yesno Ar value
 If
 .Ar value
@@ -733,8 +640,6 @@ Users are encouraged to use the is_newer_than function which returns correctly.
 .Xr rc_plugin_hook 3 ,
 .Xr sh 1p ,
 .Xr start-stop-daemon 8 ,
-.Xr supervise-daemon 8 ,
 .Xr uname 1
 .Sh AUTHORS
 .An Roy Marples <roy@marples.name>
-.An William Hubbs <w.d.hubbs@gmail.com>
--- a/man/openrc-shutdown.8
+++ b/man/openrc-shutdown.8
@@ -1,62 +0,0 @@
-.\" Copyright (c) 2017 The OpenRC Authors.
-.\" See the Authors file at the top-level directory of this distribution and
-.\" https://github.com/OpenRC/openrc/blob/master/AUTHORS
-.\"
-.\" This file is part of OpenRC. It is subject to the license terms in
-.\" the LICENSE file found in the top-level directory of this
-.\" distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
-.\" This file may not be copied, modified, propagated, or distributed
-.\"    except according to the terms contained in the LICENSE file.
-.\"
-.Dd May 22, 2017
-.Dt openrc-shutdown 8 SMM
-.Os OpenRC
-.Sh NAME
-.Nm openrc-shutdown
-.Nd bring the system down
-.Sh SYNOPSIS
-.Nm
-.Op Fl d , -no-write
-.Op Fl D , -dry-run
-.Op Fl H , -halt
-.Op Fl k , -kexec
-.Op Fl p , -poweroff
-.Op Fl R , -reexec
-.Op Fl r , -reboot
-.Op Fl s , -single
-.Op Fl w , -write-only
-.Sh DESCRIPTION
-.Nm
-is the utility that communicates with
-.Xr openrc-init 8
-to bring down the system or instruct openrc-init to re-execute itself.
-It supports the following options:
-.Bl -tag -width "poweroff"
-.It Fl d , -no-write
-Do not write the wtmp boot record.
-.It Fl D , -dry-run
-Print the action that would be taken without executing it. This is to
-allow testing.
-.It Fl H , -halt
-Stop all services, kill all remaining processes and halt the system.
-.It Fl k , -kexec
-Stop all services, kill all processes and boot directly into a new
-kernel loaded via
-.Xr kexec 8 .
-.It Fl p , -poweroff
-Stop all services, kill all processes and power off the system.
-.It Fl R , -reexec
-instruct openrc-init to re-exec itself. This should be used after an
-upgrade of OpenRC if you are using openrc-init as your init process.
-.It Fl r , -reboot
-Stop all services, kill all processes and reboot the system.
-.It Fl s , -single
-Stop all services, kill all processes and move to single user mode.
-.It Fl w , -write-only
-Stop all services, kill all processes and move to single user mode.
-.El
-.Sh SEE ALSO
-.Xr openrc-init 8 ,
-.Xr kexec 8 ,
-.Sh AUTHORS
-.An William Hubbs <w.d.hubbs@gmail.com>
--- a/man/rc-service.8
+++ b/man/rc-service.8
@@ -16,10 +16,6 @@
 .Nd locate and run an OpenRC service with the given arguments
 .Sh SYNOPSIS
 .Nm
-.Op Fl c , -ifcrashed
-.Ar service cmd
-.Op Ar ...
-.Nm
 .Op Fl i , -ifexists
 .Ar service cmd
 .Op Ar ...
--- a/man/rc-status.8
+++ b/man/rc-status.8
@@ -25,12 +25,6 @@ in different runlevels.  The default behavior is to show information
 about the current runlevel and any unassigned services that are not stopped,
 but any runlevel can be quickly examined.
 .Pp
-If an active service is being supervised by
-.Xr supervise-daemon 8, 
-the amount of time the daemon has been active along with the number of
-times it has been respawned in the current respawn period will be
-displayed.
-.Pp
 The options are as follows:
 .Bl -tag -width ".Fl test , test string"
 .It Fl a , -all
@@ -63,6 +57,5 @@ dependency order if the dependency tree is available.
 .Sh SEE ALSO
 .Xr openrc 8 ,
 .Xr rc-update 8
-.Xr supervise-daemon 8
 .Sh AUTHORS
 .An Roy Marples <roy@marples.name>
--- a/man/service.8
+++ b/man/service.8
@@ -0,0 +1 @@
+.so rc-service.8
--- a/man/supervise-daemon.8
+++ b/man/supervise-daemon.8
@@ -16,8 +16,6 @@
 .Nd starts a daemon and restarts it if it crashes
 .Sh SYNOPSIS
 .Nm
-.Fl D , -respawn-delay
-.Ar seconds
 .Fl d , -chdir
 .Ar path
 .Fl e , -env
@@ -28,20 +26,14 @@
 .Ar arg
 .Fl k , -umask
 .Ar value
-.Fl m , -respawn-max
-.Ar count
 .Fl N , -nicelevel
 .Ar level
 .Fl p , -pidfile
 .Ar pidfile
-.Fl P , -respawn-period
-.Ar seconds
-.Fl R , -retry
-.Ar arg
-.Fl r , -chroot
-.Ar chrootpath
 .Fl u , -user
 .Ar user
+.Fl r , -chroot
+.Ar chrootpath
 .Fl 1 , -stdout
 .Ar logfile
 .Fl 2 , -stderr
@@ -90,9 +82,6 @@ Print the action(s) that are taken just before doing them.
 .Pp
 The options are as follows:
 .Bl -tag -width indent
-.It Fl D , -respawn-delay Ar seconds
-wait this number of seconds before restarting a daemon after it crashes.
-The default is 0.
 .It Fl d , -chdir Ar path
 chdir to this directory before starting the daemon.
 .It Fl e , -env Ar VAR=VALUE
@@ -105,21 +94,8 @@ Class can be 0 for none, 1 for real time, 2 for best effort and 3 for idle.
 Data can be from 0 to 7 inclusive.
 .It Fl k , -umask Ar mode
 Set the umask of the daemon.
-.It Fl m , -respawn-max Ar count
-Sets the maximum number of times a daemon will be respawned during a
-respawn period. If a daemon dies more than this number of times during a
-respawn period,
-.Nm
-will give up trying to respawn it and exit. The default is 10, and 0
-means unlimited.
 .It Fl N , -nicelevel Ar level
 Modifies the scheduling priority of the daemon.
-.It Fl P , -respawn-period Ar seconds
-Sets the length of a respawn period. The default is 10 seconds. See the
-description of --respawn-max for more information.
-.It Fl R , -retry Ar timeout | Ar signal Ns / Ns Ar timeout
-The retry specification can be either a timeout in seconds or multiple
-signal/timeout pairs (like SIGTERM/5).
 .It Fl r , -chroot Ar path
 chroot to this directory before starting the daemon. All other paths, such
 as the path to the daemon, chdir and pidfile, should be relative to the chroot.
@@ -135,7 +111,6 @@ 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
@@ -148,15 +123,6 @@ to parse its options, which allows it to accept the `--' option which will
 cause it to stop processing options at that point. Any subsequent arguments
 are passed as arguments to the daemon to start and used when finding a daemon
 to stop or signal.
-.Sh NOTE
-If respawn-delay, respawn-max and respawn-period are not set correctly,
-it is possible to trigger a situation in which the supervisor will
-infinitely try to respawn a daemon. To avoid this, if you change the
-values of --respawn-delay, --respawn-max or --respawn-period, always
-make sure the settings mmake sense. For example, a respawn period of 5
-seconds with a respawn max of 10 and a respawn delay of 1 second leads
-to infinite respawning since there can never be 10 respawns within 5
-seconds.
 .Sh SEE ALSO
 .Xr chdir 2 ,
 .Xr chroot 2 ,
--- a/mk/cc.mk
+++ b/mk/cc.mk
@@ -26,8 +26,7 @@ _CCFLAGS=	-Wall -Wextra -Wimplicit -Wshadow -Wformat=2 \
 		-Wnested-externs \
 		-Winline -Wwrite-strings -Wcast-align -Wcast-qual \
 		-Wpointer-arith \
-		-Wdeclaration-after-statement -Wsequence-point \
-		-Werror=implicit-function-declaration
+		-Wdeclaration-after-statement -Wsequence-point

 # We should be using -Wredundant-decls, but our library hidden proto stuff
 # gives loads of warnings. I don't fully understand it (the hidden proto,
--- a/mk/sys.mk
+++ b/mk/sys.mk
@@ -34,7 +34,6 @@ PICFLAG?=		-fPIC
 SYSCONFDIR?=		${PREFIX}/etc
 INITDIR?=		${SYSCONFDIR}/init.d
 CONFDIR?=		${SYSCONFDIR}/conf.d
-CONFMODE?=		0644
 LOCALDIR?=		${SYSCONFDIR}/local.d
 SYSCTLDIR?=		${SYSCONFDIR}/sysctl.d

@@ -60,12 +59,10 @@ MANPREFIX?=		${UPREFIX}/share
 MANDIR?=		${MANPREFIX}/man
 MANMODE?=		0444

-BASHCOMPDIR?=		${UPREFIX}/share/bash-completion/completions
-
 DATADIR?=		${UPREFIX}/share/openrc
 DATAMODE?=		0644

 DOCDIR?=		${UPREFIX}/share/doc
 DOCMODE?=		0644

-ZSHCOMPDIR?=		${UPREFIX}/share/zsh/site-functions
+CONFMODE?=		0644
--- a/runit-guide.md
+++ b/runit-guide.md
@@ -1,5 +1,4 @@
-Using runit with OpenRC
-=======================
+# Using runit with OpenRC

 Beginning with OpenRC-0.21, we support using runit [1] in place of
 start-stop-daemon for monitoring and restarting daemons.
--- a/runlevels/Makefile
+++ b/runlevels/Makefile
@@ -38,7 +38,7 @@ BOOT-FreeBSD+=	adjkerntz dumpon syscons

 BOOT-Linux+=	binfmt hwclock keymaps modules mtab procfs termencoding
 SHUTDOWN-Linux=	killprocs mount-ro
-SYSINIT-Linux=	devfs cgroups dmesg sysfs
+SYSINIT-Linux=	devfs dmesg sysfs

 # Generic BSD stuff
 BOOT-NetBSD+=	hostid newsyslog savecore syslogd
--- a/s6-guide.md
+++ b/s6-guide.md
@@ -1,5 +1,4 @@
-Using S6 with OpenRC
-====================
+# Using S6 with OpenRC

 Beginning with OpenRC-0.16, we support using the s6 supervision suite
 from Skarnet Software in place of start-stop-daemon for monitoring
@@ -40,10 +39,6 @@ s6_service_path - the path to the s6 service directory. The default is
 s6_svwait_options_start - the options to pass to s6-svwait when starting
 the service. If this is not set, s6-svwait will not be called.

-s6_force_kill - Should we try to force kill this service if the
-s6_service_timeout_stop timeout expires when shutting down this service?
-The default is yes.
-
 s6_service_timeout_stop - the amount of time, in milliseconds, s6-svc
 should wait for a service to go down when stopping.

--- a/scripts/.gitignore
+++ b/scripts/.gitignore
@@ -1,5 +1 @@
-halt
-poweroff
 rc-sstat
-reboot
-shutdown
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -8,23 +8,12 @@ INSTALLAFTER = _installafter
 ifeq (${OS},Linux)
 SRCS+= rc-sstat.in
 BIN+=	rc-sstat
-ifeq (${MKSYSVINIT},yes)
-SRCS+= halt.in poweroff.in reboot.in shutdown.in
-BIN+=	halt poweroff reboot shutdown
-	endif
 endif

 _installafter:
 ifeq (${OS},Linux)
 	${INSTALL} -d ${DESTDIR}${SBINDIR}
 	ln -sf ${DIR}/rc-sstat ${DESTDIR}/${SBINDIR}/rc-sstat
-ifeq (${MKSYSVINIT},yes)
-	ln -sf	${DIR}/halt ${DESTDIR}/${SBINDIR}/halt
-	ln -sf	${DIR}/poweroff ${DESTDIR}/${SBINDIR}/poweroff
-	ln -sf	${DIR}/reboot ${DESTDIR}/${SBINDIR}/reboot
-	ln -sf	${DIR}/shutdown ${DESTDIR}/${SBINDIR}/shutdown
-	ln -sf	openrc-init ${DESTDIR}/${SBINDIR}/init
-endif
 endif

 include ${MK}/scripts.mk
--- a/scripts/halt.in
+++ b/scripts/halt.in
@@ -1,24 +0,0 @@
-#!@SHELL@
-
-option_arg=
-poweroff_arg=
-while getopts :nwdfiph opt; do
-	case "$opt" in
-		n) ;;
-		w) poweroff_arg=--write-only ;;
-		d) option_arg=--no-write ;;
-		f) ;;
-		i) ;;
-		p) poweroff_arg=--poweroff ;;
-		[?]) printf "%s\n" "${0##*/}: invalid command line option" >&2
-		exit 1
-		;;
-	esac
-done
-shift $((OPTIND-1))
-
-if [ -z "${poweroff_arg}" ]; then
-	poweroff_arg=--poweroff
-fi
-
-exec @SBINDIR@/openrc-shutdown ${option_arg} ${poweroff_arg} "$@"
--- a/scripts/poweroff.in
+++ b/scripts/poweroff.in
@@ -1,23 +0,0 @@
-#!@SHELL@
-
-option_arg=
-poweroff_arg=
-while getopts :nwdfiph opt; do
-	case "$opt" in
-		n) ;;
-		w) poweroff_arg=--write-only ;;
-		d) option_arg=--no-write ;;
-		f) ;;
-		i) ;;
-		[?]) printf "%s\n" "${0##*/}: invalid command line option" >&2
-		exit 1
-		;;
-	esac
-done
-shift $((OPTIND-1))
-
-if [ -z "${poweroff_arg}" ]; then
-	poweroff_arg=--poweroff
-fi
-
-exec @SBINDIR@/openrc-shutdown ${option_arg} ${poweroff_arg} "$@"
--- a/scripts/reboot.in
+++ b/scripts/reboot.in
@@ -1,25 +0,0 @@
-#!@SHELL@
-
-option_arg=
-poweroff_arg=
-while getopts :nwdfhik opt; do
-	case "$opt" in
-		n) ;;
-		w) poweroff_arg=--write-only ;;
-		d) option_arg=--no-write ;;
-		f) ;;
-		h) ;;
-		i) ;;
-		k) poweroff_arg=--kexec ;;
-		[?]) printf "%s\n" "${0##*/}: invalid command line option" >&2
-		exit 1
-		;;
-	esac
-done
-shift $((OPTIND-1))
-
-if [ -z "${poweroff_arg}" ]; then
-	poweroff_arg=--reboot
-fi
-
-exec @SBINDIR@/openrc-shutdown ${option_arg} ${poweroff_arg} "$@"
--- a/scripts/shutdown.in
+++ b/scripts/shutdown.in
@@ -1,29 +0,0 @@
-#!@SHELL@
-
-shutdown_arg=
-while getopts :akrhPHfFnct: opt; do
-	case "$opt" in
-		a) ;;
-		k) ;;
-		r) shutdown_arg=--reboot ;;
-		h) shutdown_arg=--halt ;;
-		P) shutdown_arg=--poweroff ;;
-		H) shutdown_arg=--halt ;;
-		f) ;;
-		F) ;;
-		n) ;;
-		c) ;;
-		t) ;;
-		[?]) printf "%s\n" "${0##*/}: invalid command line option" >&2
-		exit 1
-		;;
-	esac
-done
-shift $((OPTIND-1))
-
-if [ -z "${shutdown_arg}" ]; then
-	shutdown_arg=--single
-fi
-
-echo @SBINDIR@/openrc-shutdown ${shutdown_arg} "$@"
-exec @SBINDIR@/openrc-shutdown ${shutdown_arg} "$@"
--- a/service-script-guide.md
+++ b/service-script-guide.md
@@ -1,493 +0,0 @@
-OpenRC Service Script Writing Guide
-===================================
-
-This document is aimed at developers or packagers who
-write OpenRC service scripts, either for their own projects, or for
-the packages they maintain. It contains advice, suggestions, tips,
-tricks, hints, and counsel; cautions, warnings, heads-ups,
-admonitions, proscriptions, enjoinders, and reprimands.
-
-It is intended to prevent common mistakes that are found "in the wild"
-by pointing out those mistakes and suggesting alternatives.  Each
-good/bad thing that you should/not do has a section devoted to it. We
-don't consider anything exotic, and assume that you will use
-start-stop-daemon to manage a fairly typical long-running UNIX
-process.
-
-# Syntax of Service Scripts
-
-Service scripts are shell scripts. OpenRC aims at using only the standardized 
-POSIX sh subset for portability reasons. The default interpreter (build-time 
-toggle) is `/bin/sh`, so using for example mksh is not a problem.
-
-OpenRC has been tested with busybox sh, ash, dash, bash, mksh, zsh and possibly 
-others. Using busybox sh has been difficult as it replaces commands with 
-builtins that don't offer the expected features.
-
-The interpreter for service scripts is `#!/sbin/openrc-run`.
-Not using this interpreter will break the use of dependencies and is not 
-supported. (iow: if you insist on using `#!/bin/sh` you're on your own)
-
-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.
-
-Extra functions can be added easily:
-
-```
-extra_commands="checkconfig"
-checkconfig() {
-	doSomething
-}
-```
-
-This exports the checkconfig function so that `/etc/init.d/someservice 
-checkconfig` will be available, and it "just" runs this function.
-
-While commands defined in `extra_commands` are always available, commands
-defined in `extra_started_commands` will only work when the service is started
-and those defined in `extra_stopped_commands` will only work when the service is
-stopped. This can be used for implementing graceful reload and similar
-behaviour.
-
-Adding a restart function will not work, this is a design decision within 
-OpenRC. Since there may be dependencies involved (e.g. network -> apache) a 
-restart function is in general not going to work. 
-restart is internally mapped to `stop()` + `start()` (plus handling dependencies).
-If a service needs to behave differently when it is being restarted vs
-started or stopped, it should test the `$RC_CMD` variable, for example:
-
-```
-[ "$RC_CMD" = restart ] && do_something
-```
-
-# The Depend Function
-
-This function declares the dependencies for a service script. This
-determines the order the service scripts start.
-
-```
-depend() {
-	need net
-	use dns logger netmount
-	want coolservice
-}
-```
-
-`need` declares a hard dependency - net always needs to be started before this 
-	service does
-
-`use` is a soft dependency - if dns, logger or netmount is in this runlevel 
-	start it before, but we don't care if it's not in this runlevel.
-	`want` is between need and use - try to start coolservice if it is
-	installed on the system, regardless of whether it is in the
-	runlevel, but we don't care if it starts.
-
-`before` declares that we need to be started before another service
-
-`after` declares that we need to be started after another service, without 
-	creating a dependency (so on calling stop the two are independent)
-
-`provide` allows multiple implementations to provide one service type, e.g.:
-	`provide cron` is set in all cron-daemons, so any one of them started 
-	satisfies a cron dependency
-
-`keyword` allows platform-specific overrides, e.g. `keyword -lxc` makes this 
-	service script a noop in lxc containers. Useful for things like keymaps, 
-	module loading etc. that are either platform-specific or not available 
-	in containers/virtualization/...
-
-FIXME: Anything missing in this list?
-
-# The Default Functions
-
-All service scripts are assumed to have the following functions:
-
-```
-start()
-stop()
-status()
-```
-
-There are default implementations in `lib/rc/sh/openrc-run.sh` - this allows very 
-compact service scripts. These functions can be overridden per service script as 
-needed.
-
-The default functions assume the following variables to be set in the service 
-script:
-
-```
-command=
-command_args=
-pidfile=
-```
-
-Thus the 'smallest' service scripts can be half a dozen lines long
-
-## Don't write your own start/stop functions
-
-OpenRC is capable of stopping and starting most daemons based on the
-information that you give it. For a well-behaved daemon that
-backgrounds itself and writes its own PID file by default, the
-following OpenRC variables are likely all that you'll need:
-
-  * command
-  * command_args
-  * pidfile
-
-Given those three pieces of information, OpenRC will be able to start
-and stop the daemon on its own. The following is taken from an
-[OpenNTPD](http://www.openntpd.org/) service script:
-
-```sh
-command="/usr/sbin/ntpd"
-
-# The special RC_SVCNAME variable contains the name of this service.
-pidfile="/run/${RC_SVCNAME}.pid"
-command_args="-p ${pidfile}"
-```
-
-If the daemon runs in the foreground by default but has options to
-background itself and to create a pidfile, then you'll also need
-
-  * command_args_background
-
-That variable should contain the flags needed to background your
-daemon, and to make it write a PID file. Take for example the
-following snippet of an
-[NRPE](https://github.com/NagiosEnterprises/nrpe) service script:
-
-```sh
-command="/usr/bin/nrpe"
-command_args="--config=/etc/nagios/nrpe.cfg"
-command_args_background="--daemon"
-pidfile="/run/${RC_SVCNAME}.pid"
-```
-
-Since NRPE runs as *root* by default, it needs no special permissions
-to write to `/run/nrpe.pid`. OpenRC takes care of starting and
-stopping the daemon with the appropriate arguments, even passing the
-`--daemon` flag during startup to force NRPE into the background (NRPE
-knows how to write its own PID file).
-
-But what if the daemon isn't so well behaved? What if it doesn't know
-how to background itself or create a pidfile? If it can do neither,
-then use,
-
-  * command_background=true
-
-which will additionally pass `--make-pidfile` to start-stop-daemon,
-causing it to create the `$pidfile` for you (rather than the daemon
-itself being responsible for creating the PID file).
-
-If your daemon doesn't know how to change its own user or group, then
-you can tell start-stop-daemon to launch it as an unprivileged user
-with
-
-  * command_user="user:group"
-
-Finally, if your daemon always forks into the background but fails to
-create a PID file, then your only option is to use
-
-  * procname
-
-With `procname`, OpenRC will try to find the running daemon by
-matching the name of its process. That's not so reliable, but daemons
-shouldn't background themselves without creating a PID file in the
-first place. The next example is part of the [CA NetConsole
-Daemon](https://oss.oracle.com/projects/cancd/) service script:
-
-```sh
-command="/usr/sbin/cancd"
-command_args="-p ${CANCD_PORT}
-              -l ${CANCD_LOG_DIR}
-              -o ${CANCD_LOG_FORMAT}"
-command_user="cancd"
-
-# cancd daemonizes itself, but doesn't write a PID file and doesn't
-# have an option to run in the foreground. So, the best we can do
-# is try to match the process name when stopping it.
-procname="cancd"
-```
-
-To recap, in order of preference:
-
-  1. If the daemon backgrounds itself and creates its own PID file, use
-     `pidfile`.
-  2. If the daemon does not background itself (or has an option to run
-     in the foreground) and does not create a PID file, then use
-     `command_background=true` and `pidfile`.
-  3. If the daemon backgrounds itself and does not create a PID file,
-     use `procname` instead of `pidfile`. But, if your daemon has the
-     option to run in the foreground, then you should do that instead
-     (that would be the case in the previous item).
-  4. The last case, where the daemon does not background itself but
-     does create a PID file, doesn't make much sense. If there's a way
-     to disable the daemon's PID file (or, to write it straight into the
-     garbage), then do that, and use `command_background=true`.
-
-## Reloading your daemon's configuration
-
-Many daemons will reload their configuration files in response to a
-signal. Suppose your daemon will reload its configuration in response
-to a `SIGHUP`. It's possible to add a new "reload" command to your
-service script that performs this action. First, tell the service
-script about the new command.
-
-```sh
-extra_started_commands="reload"
-```
-
-We use `extra_started_commands` as opposed to `extra_commands` because
-the "reload" action is only valid while the daemon is running (that
-is, started). Now, start-stop-daemon can be used to send the signal to
-the appropriate process (assuming you've defined the `pidfile`
-variable elsewhere):
-
-```sh
-reload() {
-  ebegin "Reloading ${RC_SVCNAME}"
-  start-stop-daemon --signal HUP --pidfile "${pidfile}"
-  eend $?
-}
-```
-
-## Don't restart/reload with a broken config
-
-Often, users will start a daemon, make some configuration change, and
-then attempt to restart the daemon. If the recent configuration change
-contains a mistake, the result will be that the daemon is stopped but
-then cannot be started again (due to the configuration error). It's
-possible to prevent that situation with a function that checks for
-configuration errors, and a combination of the `start_pre` and
-`stop_pre` hooks.
-
-```sh
-checkconfig() {
-  # However you want to check this...
-}
-
-start_pre() {
-  # If this isn't a restart, make sure that the user's config isn't
-  # busted before we try to start the daemon (this will produce
-  # better error messages than if we just try to start it blindly).
-  #
-  # If, on the other hand, this *is* a restart, then the stop_pre
-  # action will have ensured that the config is usable and we don't
-  # need to do that again.
-  if [ "${RC_CMD}" != "restart" ] ; then
-    checkconfig || return $?
-  fi
-}
-
-stop_pre() {
-  # If this is a restart, check to make sure the user's config
-  # isn't busted before we stop the running daemon.
-  if [ "${RC_CMD}" = "restart" ] ; then
-      checkconfig || return $?
-  fi
-}
-```
-
-To prevent a *reload* with a broken config, keep it simple:
-
-```sh
-reload() {
-  checkconfig || return $?
-  ebegin "Reloading ${RC_SVCNAME}"
-  start-stop-daemon --signal HUP --pidfile "${pidfile}"
-  eend $?
-}
-```
-
-## PID files should be writable only by root
-
-PID files must be writable only by *root*, which means additionally
-that they must live in a *root*-owned directory. This directory is
-normally /run under Linux and /var/run under other operating systems.
-
-Some daemons run as an unprivileged user account, and create their PID
-files (as the unprivileged user) in a path like
-`/var/run/foo/foo.pid`. That can usually be exploited by the unprivileged
-user to kill *root* processes, since when a service is stopped, *root*
-usually sends a SIGTERM to the contents of the PID file (which are
-controlled by the unprivileged user). The main warning sign for that
-problem is using `checkpath` to set ownership on the directory
-containing the PID file. For example,
-
-```sh
-# BAD BAD BAD BAD BAD BAD BAD BAD
-start_pre() {
-  # Ensure that the pidfile directory is writable by the foo user/group.
-  checkpath --directory --mode 0700 --owner foo:foo "/var/run/foo"
-}
-# BAD BAD BAD BAD BAD BAD BAD BAD
-```
-
-If the *foo* user owns `/var/run/foo`, then he can put whatever he wants
-in the `/var/run/foo/foo.pid` file. Even if *root* owns the PID file, the
-*foo* user can delete it and replace it with his own. To avoid
-security concerns, the PID file must be created as *root* and live in
-a *root*-owned directory. If your daemon is responsible for forking
-and writing its own PID file but the PID file is still owned by the
-unprivileged runtime user, then you may have an upstream issue.
-
-Once the PID file is being created as *root* (before dropping
-privileges), it can be written directly to a *root*-owned
-directory.  For example, the *foo* daemon might write
-`/var/run/foo.pid`. No calls to checkpath are needed. Note: there is
-nothing technically wrong with using a directory structure like
-`/var/run/foo/foo.pid`, so long as *root* owns the PID file and the
-directory containing it.
-
-Ideally (see "Upstream your service scripts"), your service script
-will be integrated upstream and the build system will determine the
-appropriate directory for the pid file. For example,
-
-```sh
-pidfile="@piddir@/${RC_SVCNAME}.pid"
-```
-
-A decent example of this is the [Nagios core service
-script](https://github.com/NagiosEnterprises/nagioscore/blob/master/openrc-init.in),
-where the full path to the PID file is specified at build-time.
-
-## Don't let the user control the PID file location
-
-It's usually a mistake to let the end user control the PID file
-location through a conf.d variable, for a few reasons:
-
-  1. When the PID file path is controlled by the user, you need to
-     ensure that its parent directory exists and is writable. This
-     adds unnecessary code to the service script.
-
-  2. If the PID file path changes while the service is running, then
-     you'll find yourself unable to stop the service.
-
-  3. The directory that should contain the PID file is best determined
-     by the upstream build system (see "Upstream your service scripts").
-     On Linux, the preferred location these days is `/run`. Other systems
-     still use `/var/run`, though, and a `./configure` script is the
-     best place to decide which one you want.
-
-  4. Nobody cares where the PID file is located, anyway.
-
-Since OpenRC service names must be unique, a value of
-
-```sh
-pidfile="/var/run/${RC_SVCNAME}.pid"
-```
-
-guarantees that your PID file has a unique name.
-
-## Upstream your service scripts (for packagers)
-
-The ideal place for an OpenRC service script is **upstream**. Much like
-systemd services, a well-crafted OpenRC service script should be
-distribution-agnostic, and the best place for it is upstream. Why? For
-two reasons. First, having it upstream means that there's a single
-authoritative source for improvements. Second, a few paths in every
-service script are dependent upon flags passed to the build system. For
-example,
-
-```sh
-command=/usr/bin/foo
-```
-
-in an autotools-based build system should really be
-
-```sh
-command=@bindir@/foo
-```
-
-so that the user's value of `--bindir` is respected. If you keep the
-service script in your own distribution's repository, then you have to
-keep the command path and package synchronized yourself, and that's no
-fun.
-
-## Be wary of "need net" dependencies
-
-There are two things you need to know about "need net" dependencies:
-
-  1. They are not satisfied by the loopback interface, so "need net"
-     requires some *other* interface to be up.
-
-  2. Depending on the value of `rc_depend_strict` in `rc.conf`, the
-     "need net" will be satisfied when either *any* non-loopback
-     interface is up, or when *all* non-loopback interfaces are up.
-
-The first item means that "need net" is wrong for daemons that are
-happy with `0.0.0.0`, and the second point means that "need net" is
-wrong for daemons that need a particular (for example, the WAN)
-interface. We'll consider the two most common users of "need net";
-network clients who access some network resource, and network servers
-who provide them.
-
-### Network clients
-
-Network clients typically want the WAN interface to be up. That may
-tempt you to depend on the WAN interface; but first, you should ask
-yourself a question: does anything bad happen if the WAN interface is
-not available? In other words, if the administrator wants to disable
-the WAN, should the service be stopped? Usually the answer to that
-question is "no," and in that case, you should forego the "net"
-dependency entirely.
-
-Suppose, for example, that your service retrieves virus signature
-updates from the internet. In order to do its job correctly, it needs
-a (working) internet connection. However, the service itself does not
-require the WAN interface to be up: if it is, great; otherwise, the
-worst that will happen is that a "server unavailable" warning will be
-logged. The signature update service will not crash, and—perhaps more
-importantly—you don't want it to terminate if the administrator turns
-off the WAN interface for a second.
-
-### Network servers
-
-Network servers are generally easier to handle than their client
-counterparts. Most server daemons listen on `0.0.0.0` (all addresses)
-by default, and are therefore satisfied to have the loopback interface
-present and operational. OpenRC ships with the loopback service in the
-*boot* runlevel, and therefore most server daemons require no further
-network dependencies.
-
-The exceptions to this rule are those daemons who produce negative
-side-effects when the WAN is unavailable. For example, the Nagios
-server daemon will generate "the sky is falling" alerts for as long as
-your monitored hosts are unreachable. So in that case, you should
-require some other interface (often the WAN) to be up. A "need"
-dependency would be appropriate, because you want Nagios to be
-stopped before the network is taken down.
-
-If your daemon can optionally be configured to listen on a particular
-interface, then please see the "Depending on a particular interface"
-section.
-
-### Depending on a particular interface
-
-If you need to depend on one particular interface, usually it's not
-easy to determine programmatically what that interface is. For
-example, if your *sshd* daemon listens on `192.168.1.100` (rather than
-`0.0.0.0`), then you have two problems:
-
-  1. Parsing `sshd_config` to figure that out; and
-
-  2. Determining which network service name corresponds to the
-     interface for `192.168.1.100`.
-
-It's generally a bad idea to parse config files in your service
-scripts, but the second problem is the harder one. Instead, the most
-robust (i.e. the laziest) approach is to make the user specify the
-dependency when he makes a change to sshd_config. Include something
-like the following in the service configuration file,
-
-```sh
-# Specify the network service that corresponds to the "bind" setting
-# in your configuration file. For example, if you bind to 127.0.0.1,
-# this should be set to "loopback" which provides the loopback interface.
-rc_need="loopback"
-```
-
-This is a sensible default for daemons that are happy with `0.0.0.0`,
-but lets the user specify something else, like `rc_need="net.wan"` if
-he needs it. The burden is on the user to determine the appropriate
-service whenever he changes the daemon's configuration file.
--- a/sh/init-early.sh.Linux.in
+++ b/sh/init-early.sh.Linux.in
@@ -33,9 +33,6 @@ else
 	kmode="-a"
 fi

-# Set the SELinux label on console before everything so we dont lose output
-[ -x /sbin/restorecon ] && /sbin/restorecon -F /dev/console
-
 # Try and set a font and as early as we can
 if service_present "$RC_DEFAULTLEVEL" consolefont ||
   service_present "$RC_BOOTLEVEL" consolefont; then
--- a/sh/init.sh.Linux.in
+++ b/sh/init.sh.Linux.in
@@ -83,7 +83,6 @@ elif ! mountinfo -q /run; then
 	fi
 fi

-[ -x /sbin/restorecon ] && /sbin/restorecon -rF /run
 checkpath -d $RC_SVCDIR
 checkpath -d -m 0775 -o root:uucp /run/lock

--- a/sh/openrc-run.sh.in
+++ b/sh/openrc-run.sh.in
@@ -243,9 +243,6 @@ sourcex "@LIBEXECDIR@/sh/s6.sh"
 sourcex "@LIBEXECDIR@/sh/start-stop-daemon.sh"
 sourcex "@LIBEXECDIR@/sh/supervise-daemon.sh"

-# Load our script
-sourcex "$RC_SERVICE"
-
 # Set verbose mode
 if yesno "${rc_verbose:-$RC_VERBOSE}"; then
 	EINFO_VERBOSE=yes
@@ -258,26 +255,26 @@ for _cmd; do
 		[ -n "${rc_ulimit:-$RC_ULIMIT}" ] && \
 			ulimit ${rc_ulimit:-$RC_ULIMIT}
 		# Apply cgroups settings if defined
-		if [ "$(command -v cgroup_add_service)" = "cgroup_add_service" ]
+		if [ "$(command -v cgroup_add_service)" = \
+		    "cgroup_add_service" ]
 		then
-			if grep -qs /sys/fs/cgroup /proc/1/mountinfo
-			then
-				if [ -d /sys/fs/cgroup -a ! -w /sys/fs/cgroup ]; then
-					eerror "No permission to apply cgroup settings"
-					break
-				fi
+			if [ -d /sys/fs/cgroup -a ! -w /sys/fs/cgroup ]; then
+				eerror "No permission to apply cgroup settings"
+				break
 			fi
-			cgroup_add_service
+			cgroup_add_service /sys/fs/cgroup/openrc
+			cgroup_add_service /sys/fs/cgroup/systemd/system
 		fi
-		[ "$(command -v cgroup_set_limits)" = "cgroup_set_limits" ] &&
-			cgroup_set_limits
-		[ "$(command -v cgroup2_set_limits)" = "cgroup2_set_limits" ] &&
-			[ "$_cmd" = start ] &&
-			cgroup2_set_limits
+		[ "$(command -v cgroup_set_limits)" = \
+		    "cgroup_set_limits" ] && \
+		    cgroup_set_limits
 		break
 	fi
 done

+# Load our script
+sourcex "$RC_SERVICE"
+
 eval "printf '%s\n' $required_dirs" | while read _d; do
 	if [ -n "$_d" ] && [ ! -d "$_d" ]; then
 		eerror "$RC_SVCNAME: \`$_d' is not a directory"
@@ -367,14 +364,10 @@ while [ -n "$1" ]; do
 				then
 					"$1"_post || exit $?
 				fi
-				[ "$(command -v cgroup_cleanup)" = "cgroup_cleanup" ] &&
-					[ "$1" = "stop" ] &&
-					yesno "${rc_cgroup_cleanup}" && \
+				[ "$(command -v cgroup_cleanup)" = "cgroup_cleanup" -a \
+				"$1" = "stop" ] && \
+				yesno "${rc_cgroup_cleanup}" && \
 					cgroup_cleanup
-				if [ "$(command -v cgroup2_remove)" = "cgroup2_remove" ]; then
-					[ "$1" = stop ] || [ -z "${command}" ] &&
-					cgroup2_remove
-				fi
 				shift
 				continue 2
 			else
--- a/sh/rc-cgroup.sh.in
+++ b/sh/rc-cgroup.sh.in
@@ -14,56 +14,46 @@ description_cgroup_cleanup="Kill all processes in the cgroup"

 cgroup_find_path()
 {
-	local OIFS name dir result
+	local OIFS n name dir result
 	[ -n "$1" ] || return 0
 	OIFS="$IFS"
 	IFS=":"
-	while read -r _ name dir; do
+	while read n name dir; do
 		[ "$name" = "$1" ] && result="$dir"
 	done < /proc/1/cgroup
 	IFS="$OIFS"
-	printf "%s" "${result}"
+	echo $result
 }

 cgroup_get_pids()
 {
-	local cgroup_procs p pids
-	cgroup_procs="$(cgroup2_find_path)"
-	[ -n "${cgroup_procs}" ] &&
-		cgroup_procs="${cgroup_procs}/${RC_SVCNAME}/cgroup.procs" ||
-		cgroup_procs="/sys/fs/cgroup/openrc/${RC_SVCNAME}/tasks"
-	[ -f "${cgroup_procs}" ] || return 0
-	while read -r p; do
-		[ "$p" -eq $$ ] || pids="${pids} ${p}"
-	done < "${cgroup_procs}"
-	printf "%s" "${pids}"
-	return 0
+	local p
+	pids=
+	while read p; do
+		[ $p -eq $$ ] || pids="${pids} ${p}"
+	done < /sys/fs/cgroup/openrc/${RC_SVCNAME}/tasks
+	[ -n "$pids" ]
 }

 cgroup_running()
 {
-	[ -d "/sys/fs/cgroup/unified/${RC_SVCNAME}" ] ||
-			[ -d "/sys/fs/cgroup/${RC_SVCNAME}" ] ||
-			[ -d "/sys/fs/cgroup/openrc/${RC_SVCNAME}" ]
+	[ -d "/sys/fs/cgroup/openrc/${RC_SVCNAME}" ]
 }

 cgroup_set_values()
 {
-	[ -n "$1" ] && [ -n "$2" ] && [ -d "/sys/fs/cgroup/$1" ] || return 0
+	[ -n "$1" -a -n "$2" -a -d "/sys/fs/cgroup/$1" ] || return 0

-	local controller h
-	controller="$1"
-	h=$(cgroup_find_path "$1")
+	local controller="$1" h=$(cgroup_find_path "$1")
 	cgroup="/sys/fs/cgroup/${1}${h}openrc_${RC_SVCNAME}"
 	[ -d "$cgroup" ] || mkdir -p "$cgroup"

 	set -- $2
 	local name val
-	while [ -n "$1" ] && [ "$controller" != "cpuacct" ]; do
+	while [ -n "$1" -a "$controller" != "cpuacct" ]; do
 		case "$1" in
 			$controller.*)
-				if [ -n "${name}" ] && [ -w "${cgroup}/${name}" ] && 
-					[ -n "${val}" ]; then
+				if [ -n "$name" -a -w "$cgroup/$name" -a -n "$val" ]; then
 					veinfo "$RC_SVCNAME: Setting $cgroup/$name to $val"
 					printf "%s" "$val" > "$cgroup/$name"
 				fi
@@ -78,7 +68,7 @@ cgroup_set_values()
 		esac
 		shift
 	done
-	if [ -n "${name}" ] && [ -w "${cgroup}/${name}" ] && [ -n "${val}" ]; then
+	if [ -n "$name" -a -w "$cgroup/$name" -a -n "$val" ]; then
 		veinfo "$RC_SVCNAME: Setting $cgroup/$name to $val"
 		printf "%s" "$val" > "$cgroup/$name"
 	fi
@@ -144,84 +134,21 @@ cgroup_set_limits()
 	return 0
 }

-cgroup2_find_path()
-{
-	if grep -qw cgroup2 /proc/filesystems; then
-		case "${rc_cgroup_mode:-hybrid}" in
-			hybrid) printf "/sys/fs/cgroup/unified" ;;
-			unified) printf "/sys/fs/cgroup" ;;
-		esac
-	fi
-		return 0
-}
-
-cgroup2_remove()
-{
-	local cgroup_path rc_cgroup_path
-	cgroup_path="$(cgroup2_find_path)"
-	[ -z "${cgroup_path}" ] && return 0
-	rc_cgroup_path="${cgroup_path}/${RC_SVCNAME}"
-	[ ! -d "${rc_cgroup_path}" ] ||
-		[ ! -e "${rc_cgroup_path}"/cgroup.events ] &&
-		return 0
-	grep -qx "$$" "${rc_cgroup_path}/cgroup.procs" &&
-		printf "%d" 0 > "${cgroup_path}/cgroup.procs"
-	local key populated vvalue
-	while read -r key value; do
-		case "${key}" in
-			populated) populated=${value} ;;
-			*) ;;
-		esac
-	done < "${rc_cgroup_path}/cgroup.events"
-	[ "${populated}" = 1 ] && return 0
-	rmdir "${rc_cgroup_path}"
-	return 0
-}
-
-cgroup2_set_limits()
-{
-	local cgroup_path
-	cgroup_path="$(cgroup2_find_path)"
-	[ -d "${cgroup_path}" ] || return 0
-	rc_cgroup_path="${cgroup_path}/${RC_SVCNAME}"
-	local OIFS="$IFS"
-	IFS="
-"
-	[ ! -d "${rc_cgroup_path}" ] && mkdir "${rc_cgroup_path}"
-	printf "%d" 0 > "${rc_cgroup_path}/cgroup.procs"
-	echo "${rc_cgroup_settings}" | while IFS="$OIFS" read -r key value; do
-		[ -z "${key}" ] || [ -z "${value}" ] && continue
-		[ ! -e "${rc_cgroup_path}/${key}" ] && continue
-		veinfo "${RC_SVCNAME}: cgroups: ${key} ${value}"
-		printf "%s" "${value}" > "${rc_cgroup_path}/${key}"
-	done
-	IFS="$OIFS"
-	return 0
-}
-
 cgroup_cleanup()
 {
 	cgroup_running || return 0
 	ebegin "starting cgroups cleanup"
-	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 ${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
-		done
-		pids="$(cgroup_get_pids)"
-		[ -n "${pids}" ] && yesno "${rc_send_sigkill:-yes}" &&
-			kill -s KILL ${pids} 2> /dev/null
-	fi
-	cgroup2_remove
-	[ -z "$(cgroup_get_pids)" ]
-	eend $? "Unable to stop all processes"
-	return 0
+	for sig in TERM QUIT INT; do
+		cgroup_get_pids || { eend 0 "finished" ; return 0 ; }
+		for i in 0 1; do
+			kill -s $sig $pids
+			for j in 0 1 2; do
+				cgroup_get_pids || { eend 0 "finished" ; return 0 ; }
+				sleep 1
+			done
+		done 2>/dev/null
+	done
+	cgroup_get_pids || { eend 0 "finished" ; return 0; }
+	kill -9 $pids
+	eend $(cgroup_running && echo 1 || echo 0) "fail to stop all processes"
 }
--- a/sh/rc-functions.sh.in
+++ b/sh/rc-functions.sh.in
@@ -119,13 +119,6 @@ get_bootparam_value()
 	echo $result
 }

-need_if_exists()
-{
-	for x; do
-		rc-service --exists "${x}" && need "${x}"
-	done
-}
-
 # Called from openrc-run.sh or gendepends.sh
 _get_containers() {
 	local c
--- a/sh/s6.sh
+++ b/sh/s6.sh
@@ -12,20 +12,6 @@

 [ -z "${s6_service_path}" ] && s6_service_path="/var/svc.d/${RC_SVCNAME}"

-_s6_force_kill() {
-	local pid
-	s6_service_link="${RC_SVCDIR}/s6-scan/${s6_service_path##*/}"
-	pid="${3%)}"
-	[ -z "${pid}" ] && return 0
-	if kill -0 "${pid}" 2> /dev/null; then
-		ewarn "Sending DOWN & KILL for ${RC_SVCNAME}"
-		s6-svc -dk "${s6_service_link}"
-		sleep 1
-		kill -0 "${pid}" 2>/dev/null && return 1
-	fi
-	return 0
-}
-
 s6_start()
 {
 	if [ ! -d "${s6_service_path}" ]; then
@@ -55,11 +41,7 @@ s6_stop()
 fi
 	s6_service_link="${RC_SVCDIR}/s6-scan/${s6_service_path##*/}"
 	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" ] && 
-		yesno "${s6_force_kill:-yes}" &&
-			_s6_force_kill "$@"
+	s6-svc -wD -d -T ${s6_service_timeout_stop:-10000} "${s6_service_link}"
 	set -- $(s6-svstat "${s6_service_link}")
 	[ "$1" = "down" ]
 	eend $? "Failed to stop ${name:-$RC_SVCNAME}"
--- a/sh/start-stop-daemon.sh
+++ b/sh/start-stop-daemon.sh
@@ -44,13 +44,9 @@ ssd_start()
 	eval start-stop-daemon --start \
 		--exec $command \
 		${chroot:+--chroot} $chroot \
-		${directory:+--chdir} $directory \
-		${output_log+--stdout} $output_log \
-		${error_log+--stderr} $error_log \
 		${procname:+--name} $procname \
 		${pidfile:+--pidfile} $pidfile \
 		${command_user+--user} $command_user \
-		${umask+--umask} $umask \
 		$_background $start_stop_daemon_args \
 		-- $command_args $command_args_background
 	if eend $? "Failed to start ${name:-$RC_SVCNAME}"; then
--- a/sh/supervise-daemon.sh
+++ b/sh/supervise-daemon.sh
@@ -22,18 +22,10 @@ supervise_start()
 	# The eval call is necessary for cases like:
 	# command_args="this \"is a\" test"
 	# to work properly.
-	eval supervise-daemon "${RC_SVCNAME}" --start \
-		${retry:+--retry} $retry \
-		${directory:+--chdir} $directory  \
+	eval supervise-daemon --start \
 		${chroot:+--chroot} $chroot \
-		${output_log+--stdout} ${output_log} \
-		${error_log+--stderr} $error_log \
 		${pidfile:+--pidfile} $pidfile \
-		${respawn_delay:+--respawn-delay} $respawn_delay \
-		${respawn_max:+--respawn-max} $respawn_max \
-		${respawn_period:+--respawn-period} $respawn_period \
 		${command_user+--user} $command_user \
-		${umask+--umask} $umask \
 		$supervise_daemon_args \
 		$command \
 		-- $command_args $command_args_foreground
@@ -53,48 +45,14 @@ supervise_stop()
 	pidfile="${startpidfile:-$pidfile}"
 	[ -n "$pidfile" ] || return 0
 	ebegin "Stopping ${name:-$RC_SVCNAME}"
-	supervise-daemon "${RC_SVCNAME}" --stop \
+	supervise-daemon --stop \
 		${pidfile:+--pidfile} $chroot$pidfile \
 		${stopsig:+--signal} $stopsig

 	eend $? "Failed to stop ${name:-$RC_SVCNAME}"
 }

-_check_supervised()
-{
-	local child_pid start_time
-	child_pid="$(service_get_value "child_pid")"
-	start_time="$(service_get_value "start_time")"
-	if [ -n "${child_pid}" ] && [ -n "${start_time}" ]; then
-		return 1
-	fi
-	return 0
-}
-
 supervise_status()
 {
-	if service_stopping; then
-		ewarn "status: stopping"
-		return 4
-	elif service_starting; then
-		ewarn "status: starting"
-		return 8
-	elif service_inactive; then
-		ewarn "status: inactive"
-		return 16
-	elif service_started; then
-		if service_crashed; then
-			if ! _check_supervised; then
-				eerror "status: unsupervised"
-				return 64
-			fi
-			eerror "status: crashed"
-			return 32
-		fi
-		einfo "status: started"
-		return 0
-	else
-		einfo "status: stopped"
-		return 3
-	fi
+	_status
 }
--- a/src/includes/helpers.h
+++ b/src/includes/helpers.h
@@ -28,11 +28,9 @@
 #if __GNUC__ > 2 || defined(__INTEL_COMPILER)
 # define _dead __attribute__((__noreturn__))
 # define _unused __attribute__((__unused__))
-# define _xasprintf(a, b)  __attribute__((__format__(__printf__, a, b)))
 #else
 # define _dead
 # define _unused
-# define _xasprintf(a, b)
 #endif

 #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
@@ -55,7 +53,6 @@
 	} while (/* CONSTCOND */ 0)
 #endif

-#include <stdarg.h>
 #include <stdbool.h>
 #include <sys/stat.h>

@@ -99,10 +96,8 @@ _unused static char *xstrdup(const char *str)

 #undef ERRX

-/*
- * basename_c never modifies the argument. As such, if there is a trailing
- * slash then an empty string is returned.
- */
+/* basename_c never modifies the argument. As such, if there is a trailing
+ * slash then an empty string is returned. */
 _unused static const char *basename_c(const char *path)
 {
 	const char *slash = strrchr(path, '/');
@@ -126,49 +121,4 @@ _unused static bool existss(const char *pathname)
 	return (stat(pathname, &buf) == 0 && buf.st_size != 0);
 }

-/*
- * This is an OpenRC specific version of the asprintf() function.
- * We do this to avoid defining the _GNU_SOURCE feature test macro on
- * glibc systems and to insure that we have a consistent function across
- * platforms. This also allows us to call our xmalloc and xrealloc
- * functions to handle memory allocation.
- * this function was originally written by Mike Frysinger.
- */
-_unused _xasprintf(2,3) static int xasprintf(char **strp, const char *fmt, ...)
-{
-	va_list ap;
-	int len;
-	int memlen;
-	char *ret;
-
-	/*
-	 * Start with a buffer size that should cover the vast majority of uses
-	 * (path construction).
-	 */
-	memlen = 4096;
-	ret = xmalloc(memlen);
-
-	va_start(ap, fmt);
-	len = vsnprintf(ret, memlen, fmt, ap);
-	va_end(ap);
-	if (len >= memlen) {
-		/*
-		 * Output was truncated, so increase buffer to exactly what we need.
-		 */
-		memlen = len + 1;
-		ret = xrealloc(ret, memlen);
-		va_start(ap, fmt);
-		len = vsnprintf(ret, len + 1, fmt, ap);
-		va_end(ap);
-	}
-	if (len < 0 || len >= memlen) {
-		/* Give up! */
-		fprintf(stderr, "xasprintf: unable to format a buffer\n");
-		free(ret);
-		exit(1);
-	}
-	*strp = ret;
-	return len;
-}
-
 #endif
--- a/src/includes/rc-misc.h
+++ b/src/includes/rc-misc.h
@@ -23,7 +23,6 @@
 #include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
-#include <time.h>
 #include <unistd.h>

 #include "helpers.h"
@@ -47,7 +46,6 @@ bool rc_conf_yesno(const char *var);
 void env_filter(void);
 void env_config(void);
 int signal_setup(int sig, void (*handler)(int));
-int signal_setup_restart(int sig, void (*handler)(int));
 int svc_lock(const char *);
 int svc_unlock(const char *, int);
 pid_t exec_service(const char *, const char *);
@@ -70,8 +68,5 @@ RC_DEPTREE *_rc_deptree_load (int, int *);
 bool _rc_can_find_pids(void);

 RC_SERVICE lookup_service_state(const char *service);
-void from_time_t(char *time_string, time_t tv);
-time_t to_time_t(char *timestring);
-pid_t get_pid(const char *applet, const char *pidfile);

 #endif
--- a/src/includes/rc-wtmp.h
+++ b/src/includes/rc-wtmp.h
@@ -1,26 +0,0 @@
-/*
- * rc-wtmp.h
- * This is private to us and not for user consumption
-*/
-
-/*
- * Copyright (c) 2017 The OpenRC Authors.
- * See the Authors file at the top-level directory of this distribution and
- * https://github.com/OpenRC/openrc/blob/master/AUTHORS
- *
- * This file is part of OpenRC. It is subject to the license terms in
- * the LICENSE file found in the top-level directory of this
- * distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
- * This file may not be copied, modified, propagated, or distributed
- *    except according to the terms contained in the LICENSE file.
- */
-
-#ifndef __RC_WTMP_H__
-#define __RC_WTMP_H__
-
-#include <utmp.h>
-
-void log_wtmp(const char *user, const char *id, pid_t pid, int type,
-		const char *line);
-
-#endif
--- a/src/librc/librc-daemon.c
+++ b/src/librc/librc-daemon.c
@@ -80,12 +80,9 @@ rc_find_pids(const char *exec, const char *const *argv, uid_t uid, pid_t pid)
 	DIR *procdir;
 	struct dirent *entry;
 	FILE *fp;
-	int rc;
 	bool container_pid = false;
 	bool openvz_host = false;
 	char *line = NULL;
-	char my_ns[30];
-	char proc_ns[30];
 	size_t len = 0;
 	pid_t p;
 	char buffer[PATH_MAX];
@@ -134,14 +131,6 @@ 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));
-		if (rc <= 0)
-			my_ns[0] = '\0';
-	}
-
 	while ((entry = readdir(procdir)) != NULL) {
 		if (sscanf(entry->d_name, "%d", &p) != 1)
 			continue;
@@ -149,14 +138,6 @@ rc_find_pids(const char *exec, const char *const *argv, uid_t uid, pid_t pid)
 			continue;
 		if (pid != 0 && pid != p)
 			continue;
-		snprintf(buffer, sizeof(buffer), "/proc/%d/ns/pid", p);
-		if (exists(buffer)) {
-			rc = readlink(buffer, proc_ns, sizeof(proc_ns));
-			if (rc <= 0)
-				proc_ns[0] = '\0';
-		}
-		if (strlen(my_ns) && strlen (proc_ns) && strcmp(my_ns, proc_ns))
-			continue;
 		if (uid) {
 			snprintf(buffer, sizeof(buffer), "/proc/%d", p);
 			if (stat(buffer, &sb) != 0 || sb.st_uid != uid)
--- a/src/librc/librc-depend.c
+++ b/src/librc/librc-depend.c
@@ -542,41 +542,52 @@ rc_deptree_order(const RC_DEPTREE *deptree, const char *runlevel, int options)
 }
 librc_hidden_def(rc_deptree_order)

-
-/* Given a time, recurse the target path to find out if there are
-   any older (or newer) files.   If false, sets the time to the
-   oldest (or newest) found.
-*/
 static bool
-deep_mtime_check(const char *target, bool newer,
+mtime_check(const char *source, const char *target, bool newer,
 	    time_t *rel, char *file)
 {
 	struct stat buf;
+	time_t mtime;
 	bool retval = true;
 	DIR *dp;
 	struct dirent *d;
 	char path[PATH_MAX];
 	int serrno = errno;

+	/* We have to exist */
+	if (stat(source, &buf) != 0)
+		return false;
+	mtime = buf.st_mtime;
+
 	/* If target does not exist, return true to mimic shell test */
 	if (stat(target, &buf) != 0)
 		return true;

 	if (newer) {
-		if (*rel < buf.st_mtime) {
+		if (mtime < buf.st_mtime) {
+			if (rel == NULL)
+				return false;
 			retval = false;
-
-			if (file)
-				strlcpy(file, target, PATH_MAX);
-			*rel = buf.st_mtime;
+		}
+		if (rel != NULL) {
+			if (*rel < buf.st_mtime) {
+				if (file)
+					strlcpy(file, target, PATH_MAX);
+				*rel = buf.st_mtime;
+			}
 		}
 	} else {
-		if (*rel > buf.st_mtime) {
+		if (mtime > buf.st_mtime) {
+			if (rel == NULL)
+				return false;
 			retval = false;
-
-			if (file)
-				strlcpy(file, target, PATH_MAX);
-			*rel = buf.st_mtime;
+		}
+		if (rel != NULL) {
+			if (*rel > buf.st_mtime) {
+				if (file)
+					strlcpy(file, target, PATH_MAX);
+				*rel = buf.st_mtime;
+			}
 		}
 	}

@@ -591,38 +602,16 @@ deep_mtime_check(const char *target, bool newer,
 		if (d->d_name[0] == '.')
 			continue;
 		snprintf(path, sizeof(path), "%s/%s", target, d->d_name);
-		if (!deep_mtime_check(path, newer, rel, file)) {
+		if (!mtime_check(source, path, newer, rel, file)) {
 			retval = false;
+			if (rel == NULL)
+				break;
 		}
 	}
 	closedir(dp);
 	return retval;
 }

-/* Recursively check if target is older/newer than source.
- * If false, return the filename and most different time (if
- * the return value arguments are non-null).
- */
-static bool
-mtime_check(const char *source, const char *target, bool newer,
-	    time_t *rel, char *file)
-{
-	struct stat buf;
-	time_t mtime;
-	bool retval = true;
-
-	/* We have to exist */
-	if (stat(source, &buf) != 0)
-		return false;
-	mtime = buf.st_mtime;
-
-    retval = deep_mtime_check(target,newer,&mtime,file);
-    if (rel) {
-        *rel = mtime;
-    }
-    return retval;
-}
-
 bool
 rc_newer_than(const char *source, const char *target,
 	      time_t *newest, char *file)
@@ -681,8 +670,6 @@ rc_deptree_update_needed(time_t *newest, char *file)
 	RC_STRINGLIST *config;
 	RC_STRING *s;
 	int i;
-	struct stat buf;
-	time_t mtime;

 	/* Create base directories if needed */
 	for (i = 0; depdirs[i]; i++)
@@ -690,48 +677,42 @@ rc_deptree_update_needed(time_t *newest, char *file)
 			fprintf(stderr, "mkdir `%s': %s\n", depdirs[i], strerror(errno));

 	/* Quick test to see if anything we use has changed and we have
-	 * data in our deptree. */
-
-	if (stat(RC_DEPTREE_CACHE, &buf) == 0) {
-		mtime = buf.st_mtime;
-	} else {
-		/* No previous cache found.
-		 * We still run the scan, in case of clock skew; we still need to return
-		 * the newest time.
-		 */
-		newer = true;
-		mtime = time(NULL);
-	}
-
-	newer |= !deep_mtime_check(RC_INITDIR,true,&mtime,file);
-	newer |= !deep_mtime_check(RC_CONFDIR,true,&mtime,file);
+	 * data in our deptree */
+	if (!existss(RC_DEPTREE_CACHE))
+		return true;
+	if (!rc_newer_than(RC_DEPTREE_CACHE, RC_INITDIR, newest, file))
+		return true;
+	if (!rc_newer_than(RC_DEPTREE_CACHE, RC_CONFDIR, newest, file))
+		return true;
 #ifdef RC_PKG_INITDIR
-    newer |= !deep_mtime_check(RC_PKG_INITDIR,true,&mtime,file);
+	if (!rc_newer_than(RC_DEPTREE_CACHE, RC_PKG_INITDIR, newest, file))
+		return true;
 #endif
 #ifdef RC_PKG_CONFDIR
-    newer |= !deep_mtime_check(RC_PKG_CONFDIR,true,&mtime,file);
+	if (!rc_newer_than(RC_DEPTREE_CACHE, RC_PKG_CONFDIR, newest, file))
+		return true;
 #endif
-#ifdef RC_LOCAL_INITDIRs
-    newer |= !deep_mtime_check(RC_LOCAL_INITDIR,true,&mtime,file);
+#ifdef RC_LOCAL_INITDIR
+	if (!rc_newer_than(RC_DEPTREE_CACHE, RC_LOCAL_INITDIR, newest, file))
+		return true;
 #endif
 #ifdef RC_LOCAL_CONFDIR
-    newer |= !deep_mtime_check(RC_LOCAL_CONFDIR,true,&mtime,file);
+	if (!rc_newer_than(RC_DEPTREE_CACHE, RC_LOCAL_CONFDIR, newest, file))
+		return true;
 #endif
-    newer |= !deep_mtime_check(RC_CONF,true,&mtime,file);
+	if (!rc_newer_than(RC_DEPTREE_CACHE, RC_CONF, newest, file))
+		return true;

 	/* Some init scripts dependencies change depending on config files
 	 * outside of baselayout, like syslog-ng, so we check those too. */
 	config = rc_config_list(RC_DEPCONFIG);
 	TAILQ_FOREACH(s, config, entries) {
-		newer |= !deep_mtime_check(s->value, true, &mtime, file);
+		if (!rc_newer_than(RC_DEPTREE_CACHE, s->value, newest, file)) {
+			newer = true;
+			break;
+		}
 	}
 	rc_stringlist_free(config);
-
-	/* Return newest file time, if requested */
-	if ((newer) && (newest != NULL)) {
-	    *newest = mtime;
-	}
-
 	return newer;
 }
 librc_hidden_def(rc_deptree_update_needed)
--- a/src/librc/librc.c
+++ b/src/librc/librc.c
@@ -894,15 +894,12 @@ rc_service_value_set(const char *service, const char *option,
 		return false;

 	snprintf(p, sizeof(file) - (p - file), "/%s", option);
-	if (value) {
-		if (!(fp = fopen(file, "w")))
-			return false;
+	if (!(fp = fopen(file, "w")))
+		return false;
+	if (value)
 		fprintf(fp, "%s", value);
-		fclose(fp);
-	} else {
-		unlink(file);
-	}
-		return true;
+	fclose(fp);
+	return true;
 }
 librc_hidden_def(rc_service_value_set)

--- a/src/librc/rc.h.in
+++ b/src/librc/rc.h.in
@@ -39,7 +39,6 @@ extern "C" {
 #define RC_CONFDIR              RC_SYSCONFDIR "/conf.d"
 #define RC_PLUGINDIR            RC_LIBDIR "/plugins"

-#define RC_INIT_FIFO RC_SVCDIR"/init.ctl"
 #define RC_PROFILE_ENV     RC_SYSCONFDIR "/profile.env"
 #define RC_SYS_WHITELIST   RC_LIBEXECDIR "/conf.d/env_whitelist"
 #define RC_USR_WHITELIST   RC_SYSCONFDIR "/conf.d/env_whitelist"
--- a/src/rc/.gitignore
+++ b/src/rc/.gitignore
@@ -59,7 +59,4 @@ mark_service_failed
 rc-abort
 rc
 openrc
-openrc-init
 openrc-run
-openrc-shutdown
-kill_all
--- a/src/rc/Makefile
+++ b/src/rc/Makefile
@@ -1,7 +1,3 @@
-include ../../Makefile.inc
-MK=		../../mk
-include ${MK}/os.mk
-
 SRCS=	checkpath.c do_e.c do_mark_service.c do_service.c \
 		do_value.c fstabinfo.c is_newer_than.c is_older_than.c \
 		mountinfo.c openrc-run.c rc-abort.c rc.c \
@@ -13,10 +9,6 @@ ifeq (${MKSELINUX},yes)
 SRCS+=		rc-selinux.c
 endif

-ifeq (${OS},Linux)
-SRCS+=		kill_all.c openrc-init.c openrc-shutdown.c rc-wtmp.c
-endif
-
 CLEANFILES=	version.h rc-selinux.o

 BINDIR=		${PREFIX}/bin
@@ -24,7 +16,7 @@ SBINDIR=	${PREFIX}/sbin
 LINKDIR=	${LIBEXECDIR}

 BINPROGS=	rc-status
-SBINPROGS = openrc openrc-run rc rc-service rc-update runscript \
+SBINPROGS = openrc openrc-run rc rc-service rc-update runscript service \
 			start-stop-daemon supervise-daemon
 RC_BINPROGS=	einfon einfo ewarnn ewarn eerrorn eerror ebegin eend ewend \
 				eindent eoutdent esyslog eval_ecolors ewaitfile \
@@ -42,12 +34,6 @@ RC_SBINPROGS=	mark_service_starting mark_service_started \
 		mark_service_inactive mark_service_wasinactive \
 		mark_service_hotplugged mark_service_failed \
 		rc-abort swclock
-
-ifeq (${OS},Linux)
-RC_BINPROGS+= kill_all
-SBINPROGS+= openrc-init openrc-shutdown
-endif
-
 ALL_PROGS=	${BINPROGS} ${SBINPROGS} ${RC_BINPROGS} ${RC_SBINPROGS}
 CLEANFILES+=	${ALL_PROGS}

@@ -55,6 +41,8 @@ LOCAL_CPPFLAGS=-I../includes -I../librc -I../libeinfo
 LOCAL_LDFLAGS=-L../librc -L../libeinfo
 LDADD+=		-lutil -lrc -leinfo

+include ../../Makefile.inc
+MK=		../../mk
 include ${MK}/prog.mk
 include ${MK}/gitver.mk
 include ${MK}/cc.mk
@@ -100,9 +88,6 @@ checkpath: rc-selinux.o
 endif
 	${CC} ${LOCAL_CFLAGS} ${LOCAL_LDFLAGS} ${CFLAGS} ${LDFLAGS} -o $@ $^ ${LDADD}

-kill_all: kill_all.o _usage.o
-	${CC} ${LOCAL_CFLAGS} ${LOCAL_LDFLAGS} ${CFLAGS} ${LDFLAGS} -o $@ $^ ${LDADD}
-
 einfon einfo ewarnn ewarn eerrorn eerror ebegin eend ewend \
 eindent eoutdent esyslog eval_ecolors ewaitfile \
 veinfo vewarn vebegin veend vewend veindent veoutdent: do_e.o rc-misc.o
@@ -111,9 +96,6 @@ veinfo vewarn vebegin veend vewend veindent veoutdent: do_e.o rc-misc.o
 fstabinfo: fstabinfo.o _usage.o rc-misc.o
 	${CC} ${LOCAL_CFLAGS} ${LOCAL_LDFLAGS} ${CFLAGS} ${LDFLAGS} -o $@ $^ ${LDADD}

-openrc-init: openrc-init.o rc-wtmp.o
-	${CC} ${LOCAL_CFLAGS} ${LOCAL_LDFLAGS} ${CFLAGS} ${LDFLAGS} -o $@ $^ ${LDADD}
-
 is_newer_than: is_newer_than.o rc-misc.o
 	${CC} ${LOCAL_CFLAGS} ${LOCAL_LDFLAGS} ${CFLAGS} ${LDFLAGS} -o $@ $^ ${LDADD}

@@ -132,9 +114,6 @@ mountinfo: mountinfo.o _usage.o rc-misc.o
 openrc rc: rc.o rc-logger.o rc-misc.o rc-plugin.o _usage.o
 	${CC} ${LOCAL_CFLAGS} ${LOCAL_LDFLAGS} ${CFLAGS} ${LDFLAGS} -o $@ $^ ${LDADD}

-openrc-shutdown: openrc-shutdown.o _usage.o rc-wtmp.o
-	${CC} ${LOCAL_CFLAGS} ${LOCAL_LDFLAGS} ${CFLAGS} ${LDFLAGS} -o $@ $^ ${LDADD}
-
 openrc-run runscript: openrc-run.o _usage.o rc-misc.o rc-plugin.o
 ifeq (${MKSELINUX},yes)
 openrc-run runscript: rc-selinux.o
@@ -150,16 +129,16 @@ rc-depend: rc-depend.o _usage.o rc-misc.o
 rc-status: rc-status.o _usage.o rc-misc.o
 	${CC} ${LOCAL_CFLAGS} ${LOCAL_LDFLAGS} ${CFLAGS} ${LDFLAGS} -o $@ $^ ${LDADD}

-rc-service: rc-service.o _usage.o rc-misc.o
+rc-service service: rc-service.o _usage.o rc-misc.o
 	${CC} ${LOCAL_CFLAGS} ${LOCAL_LDFLAGS} ${CFLAGS} ${LDFLAGS} -o $@ $^ ${LDADD}

 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-schedules.o
+start-stop-daemon: start-stop-daemon.o _usage.o rc-misc.o
 	${CC} ${LOCAL_CFLAGS} ${LOCAL_LDFLAGS} ${CFLAGS} ${LDFLAGS} -o $@ $^ ${LDADD}

-supervise-daemon: supervise-daemon.o _usage.o rc-misc.o rc-schedules.o
+supervise-daemon: supervise-daemon.o _usage.o rc-misc.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
--- a/src/rc/checkpath.c
+++ b/src/rc/checkpath.c
@@ -73,32 +73,25 @@ static int do_check(char *path, uid_t uid, gid_t gid, mode_t mode,
 	inode_t type, bool trunc, bool chowner, bool selinux_on)
 {
 	struct stat st;
-	int fd;
-	int flags;
+	int fd, flags;
 	int r;
-	int readfd;
-	int readflags;
 	int u;

 	memset(&st, 0, sizeof(st));
-	flags = O_CREAT|O_NDELAY|O_WRONLY|O_NOCTTY;
-	readflags = O_NDELAY|O_NOCTTY|O_RDONLY;
-#ifdef O_CLOEXEC
-	flags |= O_CLOEXEC;
-	readflags |= O_CLOEXEC;
-#endif
-#ifdef O_NOFOLLOW
-	flags |= O_NOFOLLOW;
-	readflags |= O_NOFOLLOW;
-#endif
-	if (trunc)
-		flags |= O_TRUNC;
-	readfd = open(path, readflags);
-	if (readfd == -1 || (type == inode_file && trunc)) {
+	if (lstat(path, &st) || trunc) {
 		if (type == inode_file) {
 			einfo("%s: creating file", path);
 			if (!mode) /* 664 */
 				mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH;
+			flags = O_CREAT|O_NDELAY|O_WRONLY|O_NOCTTY;
+#ifdef O_CLOEXEC
+			flags |= O_CLOEXEC;
+#endif
+#ifdef O_NOFOLLOW
+			flags |= O_NOFOLLOW;
+#endif
+			if (trunc)
+				flags |= O_TRUNC;
 			u = umask(0);
 			fd = open(path, flags, mode);
 			umask(u);
@@ -106,9 +99,7 @@ static int do_check(char *path, uid_t uid, gid_t gid, mode_t mode,
 				eerror("%s: open: %s", applet, strerror(errno));
 				return -1;
 			}
-			if (readfd != -1 && trunc)
-				close(readfd);
-			readfd = fd;
+			close (fd);
 		} else if (type == inode_dir) {
 			einfo("%s: creating directory", path);
 			if (!mode) /* 775 */
@@ -122,12 +113,7 @@ static int do_check(char *path, uid_t uid, gid_t gid, mode_t mode,
 				    strerror (errno));
 				return -1;
 			}
-			readfd = open(path, readflags);
-			if (readfd == -1) {
-				eerror("%s: unable to open directory: %s", applet,
-						strerror(errno));
-				return -1;
-			}
+			mode = 0;
 		} else if (type == inode_fifo) {
 			einfo("%s: creating fifo", path);
 			if (!mode) /* 600 */
@@ -140,76 +126,56 @@ static int do_check(char *path, uid_t uid, gid_t gid, mode_t mode,
 				    strerror (errno));
 				return -1;
 			}
-			readfd = open(path, readflags);
-			if (readfd == -1) {
-				eerror("%s: unable to open fifo: %s", applet,
-						strerror(errno));
-				return -1;
-			}
 		}
-	}
-	if (fstat(readfd, &st) != -1) {
+	} else {
 		if (type != inode_dir && S_ISDIR(st.st_mode)) {
 			eerror("%s: is a directory", path);
-			close(readfd);
 			return 1;
 		}
 		if (type != inode_file && S_ISREG(st.st_mode)) {
 			eerror("%s: is a file", path);
-			close(readfd);
 			return 1;
 		}
 		if (type != inode_fifo && S_ISFIFO(st.st_mode)) {
 			eerror("%s: is a fifo", path);
-			close(readfd);
 			return -1;
 		}
-
-		if (mode && (st.st_mode & 0777) != mode) {
-			if ((type != inode_dir) && (st.st_nlink > 1)) {
-				eerror("%s: chmod: %s %s", applet, "Too many hard links to", path);
-				close(readfd);
-				return -1;
-			}
-			if (S_ISLNK(st.st_mode)) {
-				eerror("%s: chmod: %s %s", applet, path, " is a symbolic link");
-				close(readfd);
-				return -1;
-			}
-			einfo("%s: correcting mode", path);
-			if (fchmod(readfd, mode)) {
-				eerror("%s: chmod: %s", applet, strerror(errno));
-				close(readfd);
-				return -1;
-			}
-		}
-
-		if (chowner && (st.st_uid != uid || st.st_gid != gid)) {
-			if ((type != inode_dir) && (st.st_nlink > 1)) {
-				eerror("%s: chown: %s %s", applet, "Too many hard links to", path);
-				close(readfd);
-				return -1;
-			}
-			if (S_ISLNK(st.st_mode)) {
-				eerror("%s: chown: %s %s", applet, path, " is a symbolic link");
-				close(readfd);
-				return -1;
-			}
-			einfo("%s: correcting owner", path);
-			if (fchown(readfd, uid, gid)) {
-				eerror("%s: chown: %s", applet, strerror(errno));
-				close(readfd);
-				return -1;
-			}
-		}
-		if (selinux_on)
-			selinux_util_label(path);
-	} else {
-		eerror("fstat: %s: %s", path, strerror(errno));
-		close(readfd);
-		return -1;
 	}
-	close(readfd);
+
+	if (mode && (st.st_mode & 0777) != mode) {
+		if ((type != inode_dir) && (st.st_nlink > 1)) {
+			eerror("%s: chmod: %s %s", applet, "Too many hard links to", path);
+			return -1;
+		}
+		if (S_ISLNK(st.st_mode)) {
+			eerror("%s: chmod: %s %s", applet, path, " is a symbolic link");
+			return -1;
+		}
+		einfo("%s: correcting mode", path);
+		if (chmod(path, mode)) {
+			eerror("%s: chmod: %s", applet, strerror(errno));
+			return -1;
+		}
+	}
+
+	if (chowner && (st.st_uid != uid || st.st_gid != gid)) {
+		if ((type != inode_dir) && (st.st_nlink > 1)) {
+			eerror("%s: chown: %s %s", applet, "Too many hard links to", path);
+			return -1;
+		}
+		if (S_ISLNK(st.st_mode)) {
+			eerror("%s: chown: %s %s", applet, path, " is a symbolic link");
+			return -1;
+		}
+		einfo("%s: correcting owner", path);
+		if (chown(path, uid, gid)) {
+			eerror("%s: chown: %s", applet, strerror(errno));
+			return -1;
+		}
+	}
+
+	if (selinux_on)
+		selinux_util_label(path);

 	return 0;
 }
--- a/src/rc/fstabinfo.c
+++ b/src/rc/fstabinfo.c
@@ -35,11 +35,11 @@
 #  define GET_ENT getmntent (fp)
 #  define GET_ENT_FILE(_name) getmntfile (_name)
 #  define END_ENT endmntent (fp)
-#  define ENT_BLOCKDEVICE(_ent) (_ent)->mnt_fsname
-#  define ENT_FILE(_ent) (_ent)->mnt_dir
-#  define ENT_TYPE(_ent) (_ent)->mnt_type
-#  define ENT_OPTS(_ent) (_ent)->mnt_opts
-#  define ENT_PASS(_ent) (_ent)->mnt_passno
+#  define ENT_BLOCKDEVICE(_ent) ent->mnt_fsname
+#  define ENT_FILE(_ent) ent->mnt_dir
+#  define ENT_TYPE(_ent) ent->mnt_type
+#  define ENT_OPTS(_ent) ent->mnt_opts
+#  define ENT_PASS(_ent) ent->mnt_passno
 #else
 #  define HAVE_GETFSENT
 #  include <fstab.h>
@@ -48,11 +48,11 @@
 #  define GET_ENT getfsent ()
 #  define GET_ENT_FILE(_name) getfsfile (_name)
 #  define END_ENT endfsent ()
-#  define ENT_BLOCKDEVICE(_ent) (_ent)->fs_spec
-#  define ENT_TYPE(_ent) (_ent)->fs_vfstype
-#  define ENT_FILE(_ent) (_ent)->fs_file
-#  define ENT_OPTS(_ent) (_ent)->fs_mntops
-#  define ENT_PASS(_ent) (_ent)->fs_passno
+#  define ENT_BLOCKDEVICE(_ent) ent->fs_spec
+#  define ENT_TYPE(_ent) ent->fs_vfstype
+#  define ENT_FILE(_ent) ent->fs_file
+#  define ENT_OPTS(_ent) ent->fs_mntops
+#  define ENT_PASS(_ent) ent->fs_passno
 #endif

 #include "einfo.h"
@@ -114,24 +114,24 @@ do_mount(struct ENT *ent, bool remount)

 	argv[0] = UNCONST("mount");
 	argv[1] = UNCONST("-o");
-	argv[2] = ENT_OPTS(ent);
+	argv[2] = ENT_OPTS(*ent);
 	argv[3] = UNCONST("-t");
-	argv[4] = ENT_TYPE(ent);
+	argv[4] = ENT_TYPE(*ent);
 	if (!remount) {
-		argv[5] = ENT_BLOCKDEVICE(ent);
-		argv[6] = ENT_FILE(ent);
+		argv[5] = ENT_BLOCKDEVICE(*ent);
+		argv[6] = ENT_FILE(*ent);
 		argv[7] = NULL;
 	} else {
 #ifdef __linux__
 		argv[5] = UNCONST("-o");
 		argv[6] = UNCONST("remount");
-		argv[7] = ENT_BLOCKDEVICE(ent);
-		argv[8] = ENT_FILE(ent);
+		argv[7] = ENT_BLOCKDEVICE(*ent);
+		argv[8] = ENT_FILE(*ent);
 		argv[9] = NULL;
 #else
 		argv[5] = UNCONST("-u");
-		argv[6] = ENT_BLOCKDEVICE(ent);
-		argv[7] = ENT_FILE(ent);
+		argv[6] = ENT_BLOCKDEVICE(*ent);
+		argv[7] = ENT_FILE(*ent);
 		argv[8] = NULL;
 #endif
 	}
@@ -141,7 +141,7 @@ do_mount(struct ENT *ent, bool remount)
 		/* NOTREACHED */
 	case 0:
 		execvp(argv[0], argv);
-		eerror("%s: execvp: %s", applet, strerror(errno));
+		eerror("%s: execv: %s", applet, strerror(errno));
 		_exit(EXIT_FAILURE);
 		/* NOTREACHED */
 	default:
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
William Hubbs	5534b22c63	update ChangeLog	2017-03-23 17:50:51 -05:00
William Hubbs	477e3dd8c1	sh/gendepends.sh.in: fix detection of service scripts We do not need to care about the path on the shebang line of a service script as long as the shebang line ends with "openrc-run". This fixes #119 and #120.	2017-03-23 13:46:18 -05:00
William Hubbs	678e7adeb2	version 0.24.2	2017-03-23 13:34:31 -05:00
William Hubbs	b087a751de	update ChangeLog	2017-03-14 19:58:26 -05:00
William Hubbs	bc05fb7551	update news file	2017-03-14 19:36:32 -05:00
William Hubbs	e5c2a378f3	Remove all occurances of 'before *' from dependencies Using wildcards in dependencies causes issues when rc_parallel is set to yes because it can lead to deadlocks. All dependencies need to be explicit rather than implicit. This is the first stage of moving this direction.	2017-03-14 19:36:01 -05:00
William Hubbs	3c1a71bd9d	init.d/sysfs.in: efivarfs tweaks Since we check for /sys/firmware/efi/efivars, we do not need to check for /sys/firmware/efi Since Failing to mount efivarfs is not critical, we silence the error message from mount.	2017-03-14 19:35:51 -05:00
William Hubbs	fcb826a451	version 0.24.1	2017-03-14 19:35:35 -05:00