update ChangeLog

.cirrus.yml

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

.travis.yml

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

AUTHORS

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

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

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
 

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.

Makefile

@@ -15,27 +15,14 @@ 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
+# We need to ensure that runlevels is done last
-MKZSHCOMP?=	no
-ifeq (${MKZSHCOMP},yes)
-SUBDIR+=	zsh-completion
-endif
-
-# We need to ensure that runlevels is done last other than test
 SUBDIR+=	runlevels
-SUBDIR+=	test
 
 INSTALLAFTER=	_installafter
 

Makefile.inc

@@ -1,3 +1,3 @@
 NAME=		openrc
-VERSION=	0.42
+VERSION=	0.26.2
 PKG=		${NAME}-${VERSION}

NEWS.md

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

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,22 +22,18 @@ 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
 BRANDING=\"Gentoo/$(uname -s)\"
-SH=/bin/sh
 ```
 
 ## Notes

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

agetty-guide.md

@@ -1,5 +1,4 @@
-Setting up the agetty service in OpenRC
+# Setting up the agetty service in OpenRC
-=================================xxxxxx
 
 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

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

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

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/*

bash-completion/rc-service

@@ -1,116 +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
-			rc-service --exists "$prev" || return
-			shopt -s extglob
-			while read -r _ line; do
-				if [[ $line == +([[:alnum:]_]):* ]]; then
-					opts+="${line%%:*} "
-				fi
-			done < <(rc-service "$prev" describe 2>&1)
-			shopt -u extglob
-			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

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

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

ci/cirrus.sh

@@ -1,21 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2007-2018 The OpenRC Authors.
-# See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
-#
-# This file is part of OpenRC. It is subject to the license terms in
-# the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
-# This file may not be copied, modified, propagated, or distributed
-# except according to the terms contained in the LICENSE file.
-
-set -e
-set -u
-set -x
-
-# These are steps to run on Cirrus CI under a jailed FreeBSD system.
-# See $TOP/.cirrus.yml for more info about the Cirrus CI setup.
-
-cpus=$(getconf NPROCESSORS_CONF || echo 1)
-gmake -j"${cpus}" -O
-gmake test

ci/travis.sh

@@ -1,23 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2007-2018 The OpenRC Authors.
-# See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
-#
-# This file is part of OpenRC. It is subject to the license terms in
-# the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
-# This file may not be copied, modified, propagated, or distributed
-# except according to the terms contained in the LICENSE file.
-
-set -e
-set -u
-set -x
-
-# These are steps to run on TravisCI under a containerized Ubuntu system.
-# See $TOP/.travis.yml for more info about the TravisCI setup.
-
-cpus=$(getconf _NPROCESSORS_CONF || echo 1)
-# make on TravisCI doesn't support -O yet
-make -j"${cpus}"
-
-make test

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=""

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=""

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.

conf.d/modules

@@ -8,6 +8,11 @@
 #modules_2="ipv6"
 #modules="ohci1394"
 
+# Linux users can give modules a different name when they load - the new name
+# will also be used to pick arguments below.
+# This is not supported on FreeBSD.
+#modules="dummy:dummy1"
+
 # Linux users can give the modules some arguments if needed, per version
 # if necessary.
 # Again, the most specific versioned variable will take precedence.

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

etc/rc.conf

@@ -191,48 +191,13 @@ rc_tty_number=12
 ##############################################################################
 # LINUX CGROUPS RESOURCE MANAGEMENT
 
-# This sets the mode used to mount cgroups.
+# If you have cgroups turned on in your kernel, this switch controls
-# "hybrid" mounts cgroups version 2 on /sys/fs/cgroup/unified and
+# whether or not a group for each controller is mounted under
-# cgroups version 1 on /sys/fs/cgroup.
+# /sys/fs/cgroup.
-# "legacy" mounts cgroups version 1 on /sys/fs/cgroup
+# None of the other options in this section work if this is set to "NO".
-# "unified" mounts cgroups version 2 on /sys/fs/cgroup
-#rc_cgroup_mode="hybrid"
-
-# This is a list of controllers which should be enabled for cgroups version 2.
-# If hybrid mode is being used, controllers listed here will not be
-# available for cgroups version 1.
-# This is a global setting.
-#rc_cgroup_controllers=""
-
-# This variable contains the cgroups version 2 settings for your services.
-# If this is set in this file, the settings will apply to all services.
-# If you want different settings for each service, place the settings in
-# /etc/conf.d/foo for service foo.
-# The format is to specify the setting and value followed by a newline.
-# Multiple settings and values can be specified.
-# For example, you would use this to set the maximum memory and maximum
-# number of pids for a service.
-#rc_cgroup_settings="
-#memory.max 10485760
-#pids.max max
-#"
-#
-# For more information about the adjustments that can be made with
-# cgroups version 2, see Documentation/cgroups-v2.txt in the linux kernel
-# source tree.
-#rc_cgroup_settings=""
-
-# This switch controls whether or not cgroups version 1 controllers are
-# individually mounted under
-# /sys/fs/cgroup in hybrid or legacy mode.
 #rc_controller_cgroups="YES"
 
-# The following setting turns on the memory.use_hierarchy setting in the
+# The following settings allow you to set up values for the cgroup
-# root memory cgroup for cgroups v1.
-# It must be set to yes in this file if you want this functionality.
-#rc_cgroup_memory_use_hierarchy="NO"
-
-# The following settings allow you to set up values for the cgroups version 1
 # controllers for your services.
 # They can be set in this file;, however, if you do this, the settings
 # will apply to all of your services.
@@ -246,9 +211,8 @@ rc_tty_number=12
 # cpu.shares 512
 # "
 #
-# For more information about the adjustments that can be made with
+#For more information about the adjustments that can be made with
-# cgroups version 1, see Documentation/cgroups-v1/* in the linux kernel
+#cgroups, see Documentation/cgroups/* in the linux kernel source tree.
-# source tree.
 
 # Set the blkio controller settings for this service.
 #rc_cgroup_blkio=""
@@ -282,33 +246,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
+# This should not be set globally because it kills all of the service's
-# child processes will be killed. Keep this in mind if you set this to
+# child processes, and most of the time this is undesirable. Please set
-# yes here instead of for the individual services in
+# it in /etc/conf.d/<service>.
-# /etc/conf.d/<service>.
 # To perform this cleanup manually for a stopped service, you can
 # execute cgroup_cleanup with /etc/init.d/<service> cgroup_cleanup or
 # rc-service <service> cgroup_cleanup.
-# The process followed in this cleanup is the following:
-# 1. send stopsig (sigterm if it isn't set) to all processes left in the
-# cgroup immediately followed by sigcont.
-# 2. Send sighup to all processes in the cgroup if rc_send_sighup is
-# yes.
-# 3. delay for rc_timeout_stopsec seconds.
-# 4. send sigkill to all processes in the cgroup unless disabled by
-# setting rc_send_sigkill to no.
 # rc_cgroup_cleanup="NO"
-
-# If this is yes, we will send sighup to the processes in the cgroup
-# immediately after stopsig and sigcont.
-#rc_send_sighup="NO"
-
-# This is the amount of time in seconds that we delay after sending sigcont
-# and optionally sighup, before we optionally send sigkill to all
-# processes in the # cgroup.
-# The default is 90 seconds.
-#rc_timeout_stopsec="90"
-
-# If this is set to no, we do not send sigkill to all processes in the
-# cgroup.
-#rc_send_sigkill="YES"

etc/rc.in

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!@SHELL@
 # Copyright (c) 2007-2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
 # https://github.com/OpenRC/openrc/blob/master/AUTHORS

etc/rc.shutdown.in

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!@SHELL@
 # Copyright (c) 2007-2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
 # https://github.com/OpenRC/openrc/blob/master/AUTHORS

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
+When all the init scripts are started openrc terminates. There is no persistent 
-persistent daemon. (Integration with tools like monit, runit or s6 can be done)
+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,12 +86,121 @@ 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 `sysinit`, `boot`, and `default`,
+The default startup uses the runlevels `boot`, `sysinit` and `default`, in that 
-in that order. Shutdown uses the `shutdown` runlevel.
+order. Shutdown uses the `shutdown` runlevel.
+
+
+# Syntax of Service Scripts
+
+Service scripts are shell scripts. OpenRC aims at using only the standardized 
+POSIX sh subset for portability reasons. The default interpreter (build-time 
+toggle) is `/bin/sh`, so using for example mksh is not a problem.
+
+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`
 
@@ -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,39 +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
+Setting `ulimit` and `nice` values per service can be done through the `rc_ulimit`
-`rc_ulimit` variable.
+variable.
 
-Under Linux, OpenRC can use cgroups for process management as well. Once
+Under Linux, OpenRC can optionally use CGroups for process management.
-the kernel is configured appropriately, the `rc_cgroup_mode` setting in
+By default each service script's processes are migrated to their own CGroup.
-/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
+By changing certain values in the `conf.d` file limits can be enforced per 
-enforced per service. These settings are documented in detail in the
+service. It is easy to find orphan processes of a service that persist after 
-default /etc/rc.conf under `LINUX CGROUPS RESOURCE MANAGEMENT`.
+`stop()`, but by default these will NOT be terminated.
-
+To change this add `rc_cgroup_cleanup="yes"` in the `conf.d` files for services 
-# Dealing with Orphaned Processes
+where you desire this functionality.
-
-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.
 
 # 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
@@ -174,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.

init-guide.md

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

init.d/.gitignore

@@ -1,6 +1,5 @@
 agetty
 binfmt
-cgroups
 modules-load
 bootmisc
 fsck
@@ -41,8 +40,6 @@ rc-enabled
 rpcbind
 runsvdir
 savecore
-save-keymaps
-save-termencoding
 swap-blk
 swclock
 syslogd

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 \
-		mixer.in nscd.in powerd.in syscons.in
+		modules-load.in mixer.in nscd.in powerd.in syscons.in
 
-SRCS-Linux=	agetty.in binfmt.in devfs.in cgroups.in dmesg.in hwclock.in \
+SRCS-Linux=	agetty.in binfmt.in devfs.in dmesg.in hwclock.in consolefont.in \
-	consolefont.in keymaps.in killprocs.in modules.in \
+	keymaps.in killprocs.in modules.in modules-load.in mount-ro.in mtab.in \
-	mount-ro.in mtab.in numlock.in procfs.in net-online.in save-keymaps.in \
+	numlock.in procfs.in net-online.in sysfs.in termencoding.in
-	save-termencoding.in sysfs.in termencoding.in
 
 # Generic BSD scripts
 SRCS-NetBSD=	hostid.in moused.in newsyslog.in pf.in rarpd.in rc-enabled.in \

init.d/agetty.in

@@ -12,16 +12,14 @@
 description="start agetty on a terminal line"
 supervisor=supervise-daemon
 port="${RC_SVCNAME#*.}"
-respawn_period="${respawn_period:-60}"
 term_type="${term_type:-linux}"
 command=/sbin/agetty
-command_args_foreground="${agetty_options} ${port} ${baud} ${term_type}"
+command_args_foreground="${agetty_options} ${port} ${baud} ${termtype}"
 pidfile="/run/${RC_SVCNAME}.pid"
 
 depend() {
 	after local
 	keyword -prefix
-	provide getty
 }
 
 start_pre() {
@@ -30,12 +28,5 @@ start_pre() {
 		eerror "symbolic links to it for the ports you want to start"
 		eerror "agetty on and add those to the appropriate runlevels."
 		return 1
-	else
-		export EINFO_QUIET="${quiet:-yes}"
 	fi
 }
-
-stop_pre()
-{
-	export EINFO_QUIET="${quiet:-yes}"
-}

init.d/bootmisc.in

@@ -241,7 +241,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

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
-}

init.d/consolefont.in

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

init.d/devfs.in

@@ -20,12 +20,9 @@ depend()
 
 mount_dev()
 {
-	local action conf_d_dir devfstype msg mountopts
+	local action=--mount devfstype msg=Mounting
-	action=--mount
-	conf_d_dir="${RC_SERVICE%/*/*}/conf.d"
-	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
 }

init.d/hostname.in

@@ -11,8 +11,7 @@
 
 description="Sets the hostname of the machine."
 
-depend()
+depend() {
-{
 	after clock
 	keyword -docker -lxc -prefix -systemd-nspawn
 }
@@ -20,13 +19,13 @@ depend()
 start()
 {
 	local h source x
-	if [ -s /etc/hostname ] && [ -r /etc/hostname ]; then
+	if [ -s @SYSCONFDIR@/hostname ] && [ -r @SYSCONFDIR@/hostname ]; then
-		read h x </etc/hostname
+	read h x <@SYSCONFDIR@/hostname
-		source="from /etc/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"

init.d/hwclock.in

@@ -105,7 +105,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
 

init.d/keymaps.in

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

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
 }

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"
+description="Executes user programs in @SYSCONFDIR@/local.d"
-local_d_dir="${RC_SERVICE%/*/*}/local.d"
-
-description="Executes user programs in ${local_d_dir}"
 
 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

init.d/localmount.in

@@ -14,7 +14,7 @@ description="Mounts disks and swap according to /etc/fstab."
 depend()
 {
 	need fsck
-	use lvm modules root
+	use lvm modules mtab root
 	after clock lvm modules root
 	keyword -docker -jail -lxc -prefix -systemd-nspawn -vserver
 }

init.d/modules-load.in

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

init.d/modules.in

@@ -14,66 +14,10 @@ description="Loads a user defined list of kernel modules."
 depend()
 {
 	use isapnp
-	provide modules-load
+	want modules-load
 	keyword -docker -lxc -openvz -prefix -systemd-nspawn -vserver
 }
 
-find_modfiles()
-{
-	local dirs="/usr/lib/modules-load.d /run/modules-load.d /etc/modules-load.d"
-	local basenames files fn x y
-	for x in $dirs; do
-		[ ! -d $x ] && continue
-		for y in $x/*.conf; do
-			[ -f $y ] && basenames="${basenames}\n${y##*/}"
-		done
-	done
-	basenames=$(printf "$basenames" | sort -u)
-	for x in $basenames; do
-		for y in $dirs; do
-			[ -r $y/$x ] &&
-				fn=$y/$x
-		done
-		files="$files $fn"
-	done
-	echo $files
-}
-
-load_modules()
-{
-	local file m modules rc x
-	file=$1
-	[ -z "$file" ] && return 0
-	while read m x; do
-		case $m in
-			\;*) continue ;;
-			\#*) continue ;;
-			*) modules="$modules $m"
-			;;
-		esac
-	done < $file
-	for x in $modules; do
-		ebegin "Loading module $x"
-		case "$RC_UNAME" in
-			FreeBSD) kldload "$x"; rc=$? ;;
-			Linux) modprobe --first-time -q --use-blacklist "$x"; rc=$? ;;
-			*) ;;
-		esac
-		eend $rc "Failed to load $x"
-	done
-	return 0
-}
-
-modules_load_d()
-{
-	local x
-	files=$(find_modfiles)
-	for x in $files; do
-		load_modules $x
-	done
-	return 0
-}
-
 FreeBSD_modules()
 {
 	local cnt=0 x
@@ -104,7 +48,7 @@ Linux_modules()
 		x=${x%.*}
 	done
 
-	local list= x= xx= y= args=
+	local list= x= xx= y= args= mpargs= a=
 	for x in $kv_variant_list ; do
 		eval list=\$modules_$(shell_var "$x")
 		[ -n "$list" ] && break
@@ -113,13 +57,24 @@ Linux_modules()
 
 	[ -n "$list" ] && ebegin "Loading kernel modules"
 	for x in $list; do
+		a=${x#*:}
+		if [ "$a" = "$x" ]; then
+			unset mpargs
+		else
+			x=${x%%:*}
+			mpargs="-o $a"
+		fi
+		aa=$(shell_var "$a")
 		xx=$(shell_var "$x")
 		for y in $kv_variant_list ; do
+			eval args=\$module_${aa}_args_$(shell_var "$y")
+			[ -n "${args}" ] && break
 			eval args=\$module_${xx}_args_$(shell_var "$y")
 			[ -n "${args}" ] && break
 		done
+		[ -z "$args" ] && eval args=\$module_${aa}_args
 		[ -z "$args" ] && eval args=\$module_${xx}_args
-		eval modprobe --first-time --use-blacklist --verbose "$x" "$args"
+		eval modprobe --use-blacklist --verbose "$mpargs" "$x" "$args"
 	done
 	[ -n "$list" ] && eend
 }
@@ -127,10 +82,7 @@ Linux_modules()
 start()
 {
 	case "$RC_UNAME" in
-		FreeBSD|Linux)
+		FreeBSD|Linux) ${RC_UNAME}_modules ;;
-			modules_load_d
-			${RC_UNAME}_modules
-			;;
 		*) ;;
 	esac
 	return 0

init.d/mtab.in

@@ -14,7 +14,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 +30,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"

init.d/net-online.in

@@ -13,7 +13,7 @@ description="Delays until the network is online or a specific timeout"
 
 depend()
 {
-	after modules net
+	after modules
 	need sysfs
 	provide network-online
 	keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn -uml -vserver
@@ -23,7 +23,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 ||
+		read x < /sys/class/net/$dev/carrier
-			carrier=
+		[ $x -eq 1 ] && : $((carriers += 1))
-		[ "$carrier" = 1 ] && : $((carriers += 1))
+		read x < /sys/class/net/$dev/operstate
-		read operstate < /sys/class/net/$dev/operstate 2> /dev/null ||
+		[ "$x" = up ] && : $((configured += 1))
-			operstate=
-		[ "$operstate" = 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
-			ping -c 1 $ping_test_host > /dev/null 2>&1
+		rc=$?
-			rc=$?
-			[ $rc -eq 0 ] && break
-			: $((timeout -= 1))
-		done
 	fi
  fi
  eend $rc "The network is offline"

init.d/network.in

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

init.d/numlock.in

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

init.d/procfs.in

@@ -16,6 +16,7 @@ depend()
 	after clock
 	use devfs
 	want modules
+	need localmount
 	keyword -docker -lxc -openvz -prefix -systemd-nspawn -vserver
 }
 
@@ -26,8 +27,8 @@ start()
 		[ ! -e /proc/sys/fs/binfmt_misc/register ]; then
 		if ! grep -qs binfmt_misc /proc/filesystems &&
 			modprobe -q binfmt-misc; then
-			ewarn "The binfmt-misc module needs to be loaded by" \
+			ewarn "The binfmt-misc module needs to be configured in" \
-				"the modules service or built in."
+				"@SYSCONFDIR@/conf.d/modules or built in."
 		fi
 		if grep -qs binfmt_misc /proc/filesystems; then
 			ebegin "Mounting misc binary format filesystem"

init.d/save-keymaps.in

@@ -1,28 +0,0 @@
-#!@SBINDIR@/openrc-run
-# Copyright (c) 2018 Sony Interactive Entertainment, Inc.
-#
-# This file is part of OpenRC. It is subject to the license terms in
-# the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
-# This file may not be copied, modified, propagated, or distributed
-# except according to the terms contained in the LICENSE file.
-
-description="Save the keymap for use as early as possible"
-
-depend()
-{
-	need termencoding
-	after bootmisc clock keymaps
-	keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu
-}
-
-start()
-{
-	# Save the keymapping for use immediately at boot
-	ebegin "Saving key mapping"
-	if checkpath -W "$RC_LIBEXECDIR"; then
-		mkdir -p "$RC_LIBEXECDIR"/console
-		dumpkeys >"$RC_LIBEXECDIR"/console/keymap
-	fi
-	eend $? "Unable to save keymapping"
-}

init.d/save-termencoding.in

@@ -1,35 +0,0 @@
-#!@SBINDIR@/openrc-run
-# Copyright (c) 2018 Sony Interactive Entertainment, Inc.
-#
-# This file is part of OpenRC. It is subject to the license terms in
-# the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
-# This file may not be copied, modified, propagated, or distributed
-# except according to the terms contained in the LICENSE file.
-
-description="Configures terminal encoding."
-
-ttyn=${rc_tty_number:-${RC_TTY_NUMBER:-12}}
-: ${unicode:=${UNICODE}}
-
-depend()
-{
-	keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu
-	use root
-	after bootmisc clock termencoding
-}
-
-start()
-{
-	ebegin "Saving terminal encoding"
-	# Save the encoding for use immediately at boot
-	if checkpath -W "$RC_LIBEXECDIR"; then
-		mkdir -p "$RC_LIBEXECDIR"/console
-		if yesno ${unicode:-${UNICODE}}; then
-			echo "" > "$RC_LIBEXECDIR"/console/unicode
-		else
-			rm -f "$RC_LIBEXECDIR"/console/unicode
-		fi
-	fi
-	eend 0
-}

init.d/savecache.in

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

init.d/staticroute.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+S#!@BINDIR@/openrc-run
 # Copyright (c) 2009-2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
 # https://github.com/OpenRC/openrc/blob/master/AUTHORS

init.d/swap.in

@@ -11,7 +11,7 @@
 
 depend()
 {
-	after clock root
+	after clock
 	before localmount
 	keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn -vserver
 }

init.d/sysctl.in

@@ -21,7 +21,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

init.d/sysfs.in

@@ -107,11 +107,47 @@ mount_misc()
 	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
 }

init.d/termencoding.in

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

man/Makefile

@@ -6,7 +6,7 @@ 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

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,17 +111,11 @@ 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 supervise_daemon_args
-List of arguments passed to supervise-daemon when starting the daemon.
-If undefined, start_stop_daemon_args is used as a fallback.
 .It Ar command
 Daemon to start or stop via
 .Nm start-stop-daemon
@@ -145,56 +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.
+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 output_logger
-This is a process which will be used to log the standard output from the
-service.  If you are starting this service with
-.Xr start-stop-daemon 8 ,
-,  you must set
-.Pa command_background
-to true. Keep in mind that this command must be executable as a shell
-command inside the chroot if the
-.Pa chroot
-variable is set. Keep in mind also that this command works by accepting
-the stdout of the service on stdin.
-An example of a command that can be run this way is logger if you want
-your service output to go to syslog.
-.It Ar error_logger
-The same thing as
-.Pa output_logger
-but for the standard error output.
-.It Ar directory
-.Xr start-stop-daemon 8
-and
-.Xr supervise-daemon 8
-will chdir to this directory before starting the daemon.
 .It Ar chroot
 .Xr start-stop-daemon 8
 and
@@ -239,8 +198,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
@@ -260,10 +217,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
+The service will refuse to start until needed services have started and it
-whether they have been added to the runlevel. It will refuse to start
+will refuse to stop until any services that need it have stopped.
-until all services it needs have started, and it will refuse to stop until all
-services that need it have stopped.
 .It Ic use
 The service will attempt to start any services it uses that have been added
 to the runlevel.
@@ -329,18 +284,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:
@@ -469,65 +412,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
@@ -614,7 +519,7 @@ rc_net_tap1_provide="!net"
 # It's also possible to negate keywords. This is mainly useful for prefix
 # users testing OpenRC.
 rc_keyword="!-prefix"
-# This can also be used to block a script from running in all
+# This can also be used to block a script from runining in all
 # containers except one or two
 rc_keyword="!-containers !-docker"
 .Ed
@@ -753,8 +658,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>

man/openrc-shutdown.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 May 22, 2017
+.Dd April 6, 2017
 .Dt openrc-shutdown 8 SMM
 .Os OpenRC
 .Sh NAME
@@ -16,56 +16,22 @@
 .Nd bring the system down
 .Sh SYNOPSIS
 .Nm
-.Op Fl c , -cancel
-.Nm
-.Op Fl R , -reexec
-.Nm
-.Op Fl w , -write-only
-.Nm
-.Op Fl d , -no-write
-.Op Fl D , -dry-run
 .Op Fl H , -halt
-time
-.Nm
-.Op Fl d , -no-write
-.Op Fl D , -dry-run
 .Op Fl k , -kexec
-time
-.Nm
-.Op Fl d , -no-write
-.Op Fl D , -dry-run
 .Op Fl p , -poweroff
-time
+.Op Fl R , -reexec
-.Nm
-.Op Fl d , -no-write
-.Op Fl D , -dry-run
 .Op Fl r , -reboot
-time
-.Nm
-.Op Fl d , -no-write
-.Op Fl D , -dry-run
-.Op Fl s , -single
-time
 .Sh DESCRIPTION
 .Nm
-is the utility that communicates with
+is the utility that communicates with openrc-init(8) to bring down the
-.Xr openrc-init 8
+system or instruct openrc-init to re-execute itself. It supports the
-to bring down the system or instruct openrc-init to re-execute itself.
+following options:
-It supports the following options:
 .Bl -tag -width "poweroff"
-.It Fl c , -cancel
-Cancel a pending shutdown.
-.It Fl d , -no-write
-Do not write the wtmp boot record.
-.It Fl D , -dry-run
-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
+kernel loaded via kexec(8).
-.Xr kexec 8 .
 .It Fl p , -poweroff
 Stop all services, kill all processes and power off the system.
 .It Fl R , -reexec
@@ -73,10 +39,6 @@ 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
-Wrrite a wtmp shutdown record and do nothing else.
 .El
 .Sh SEE ALSO
 .Xr openrc-init 8 ,

man/openrc.8

@@ -66,7 +66,6 @@ and
 .Xr shutdown 8
 and let them call these special runlevels.
 .Sh SEE ALSO
-.Xr openrc-run 8 ,
 .Xr rc-status 8 ,
 .Xr rc-update 8 ,
 .Xr init 8 ,

man/rc-service.8

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

man/rc-status.8

@@ -17,7 +17,6 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl aclsuC
-.Op Fl f Ar ini
 .Op Ar runlevel
 .Sh DESCRIPTION
 .Nm
@@ -38,17 +37,12 @@ The options are as follows:
 Show all runlevels and their services.
 .It Fl c , -crashed
 List all services that have crashed.
-.It Fl f , -format
-Select a format for the output. Currently, the only one that can be
-specified is ini, which outputs in *.ini format.
 .It Fl l , -list
 List all defined runlevels.
 .It Fl m , -manual
 Show all manually started services.
 .It Fl r , -runlevel
 Print the current runlevel name.
-.It Fl S , -supervised
-Show all supervised services.
 .It Fl s , -servicelist
 Show all services.
 .It Fl u , -unused

man/service.8

@@ -0,0 +1 @@
+.so rc-service.8

man/start-stop-daemon.8

@@ -131,34 +131,9 @@ Modifies the scheduling priority of the daemon.
 .It Fl 1 , -stdout Ar logfile
 Redirect the standard output of the process to logfile when started with
 .Fl background .
-The logfile Must be an absolute pathname, but relative to the path
+Must be an absolute pathname, but relative to the path optionally given with
-optionally given with
 .Fl r , -chroot .
 The logfile can also be a named pipe.
-.It Fl 2 , -stderr Ar logfile
-Redirect the standard error of the process to logfile when started with
-.Fl background .
-The logfile must be an absolute pathname, but relative to the path
-optionally given with
-.Fl r , -chroot .
-The logfile can also be a named pipe.
-.It Fl 3 , -stdout-logger Ar cmd
-Run cmd as a child process redirecting the standard output to the
-standard input of cmd when started with
-.Fl background .
-Cmd must be an absolute pathname, but relative to the path optionally given with
-.Fl r , -chroot .
-This process must be prepared to accept input on stdin and be able to
-log it or send it to another location.
-.It Fl 4 , -stderr-logger Ar cmd
-Run cmd as a child process and 
-Redirect the standard error of the process to the standard input of cmd
-when started with
-.Fl background .
-Cmd must be an absolute pathname, but relative to the path optionally given with
-.Fl r , -chroot .
-This process must be prepared to accept input on stdin and be able to
-log it or send it to another location.
 .It Fl w , -wait Ar milliseconds
 Wait
 .Ar milliseconds
@@ -176,7 +151,6 @@ These options are only used for stopping daemons:
 .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).
-If this option is not given, the default is SIGTERM/5.
 .El
 .Sh ENVIRONMENT
 .Va SSD_IONICELEVEL

man/supervise-daemon.8

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

mk/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 \
+		-Wdeclaration-after-statement -Wsequence-point
-		-Werror=implicit-function-declaration
 
 # We should be using -Wredundant-decls, but our library hidden proto stuff
 # gives loads of warnings. I don't fully understand it (the hidden proto,

mk/os-FreeBSD.mk

@@ -11,5 +11,3 @@
 # Generic definitions
 
 include ${MK}/os-BSD.mk
-
-CPPFLAGS+=	-D_BSD_SOURCE

mk/os-GNU-kFreeBSD.mk

@@ -13,6 +13,6 @@
 SFX=		.GNU-kFreeBSD.in
 PKG_PREFIX?=	/usr
 
-CPPFLAGS+=	-D_BSD_SOURCE
+CPPFLAGS+=	-D_BSD_SOURCE -D_XOPEN_SOURCE=700
 LIBDL=		-Wl,-Bdynamic -ldl
 LIBKVM?=

mk/os-GNU.mk

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

mk/os-Linux.mk

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

mk/scripts.mk

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

mk/sys.mk

@@ -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
 
@@ -45,22 +44,20 @@ SBINDIR?=		${PREFIX}/sbin
 SBINMODE?=		0755
 
 INCDIR?=		${UPREFIX}/include
-INCMODE?=		0644
+INCMODE?=		0444
 
 _LIBNAME_SH=		case `readlink /lib` in /lib64|lib64) echo "lib64";; *) echo "lib";; esac
 _LIBNAME:=		$(shell ${_LIBNAME_SH})
 LIBNAME?=		${_LIBNAME}
 LIBDIR?=		${UPREFIX}/${LIBNAME}
-LIBMODE?=		0644
+LIBMODE?=		0444
 SHLIBDIR?=		${PREFIX}/${LIBNAME}
 
 LIBEXECDIR?=		${PREFIX}/libexec/rc
 
 MANPREFIX?=		${UPREFIX}/share
 MANDIR?=		${MANPREFIX}/man
-MANMODE?=		0644
+MANMODE?=		0444
-
-BASHCOMPDIR?=		${UPREFIX}/share/bash-completion/completions
 
 DATADIR?=		${UPREFIX}/share/openrc
 DATAMODE?=		0644
@@ -68,4 +65,4 @@ DATAMODE?=		0644
 DOCDIR?=		${UPREFIX}/share/doc
 DOCMODE?=		0644
 
-ZSHCOMPDIR?=		${UPREFIX}/share/zsh/site-functions
+CONFMODE?=		0644

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.

runlevels/Makefile

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

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.
 

scripts/.gitignore

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

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

scripts/halt.in

@@ -1,29 +0,0 @@
-#!/bin/sh
-
-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
-
-script_args="$@"
-if [ -z "${script_args}" ]; then
-	script_args=now
-fi
-
-exec @SBINDIR@/openrc-shutdown ${option_arg} ${poweroff_arg} "${script_args}"

scripts/poweroff.in

@@ -1,28 +0,0 @@
-#!/bin/sh
-
-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
-
-script_args="$@"
-if [ -z "${script_args}" ]; then
-	script_args=now
-fi
-
-exec @SBINDIR@/openrc-shutdown ${option_arg} ${poweroff_arg} "${script_args}"

scripts/rc-sstat.in

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!@SHELL@
 # Copyright (c) 2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
 # https://github.com/OpenRC/openrc/blob/master/AUTHORS

scripts/reboot.in

@@ -1,30 +0,0 @@
-#!/bin/sh
-
-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
-
-script_args="$@"
-if [ -z "${script_args}" ]; then
-	script_args=now
-fi
-
-exec @SBINDIR@/openrc-shutdown ${option_arg} ${poweroff_arg} "${script_args}"

scripts/shutdown.in

@@ -1,29 +0,0 @@
-#!/bin/sh
-
-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} "$@"

service-script-guide.md

@@ -1,495 +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.

sh/.gitignore

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

sh/Makefile

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

sh/binfmt.sh.in

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!@SHELL@
 # This is a reimplementation of the systemd binfmt.d code to register
 # misc binary formats with the kernel.
 #

sh/cgroup-release-agent.sh.in

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

sh/functions.sh.in

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

sh/init-early.sh.Linux.in

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!@SHELL@
 # Copyright (c) 2007-2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
 # https://github.com/OpenRC/openrc/blob/master/AUTHORS
@@ -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

sh/init.sh.BSD.in

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!@SHELL@
 # Copyright (c) 2007-2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
 # https://github.com/OpenRC/openrc/blob/master/AUTHORS

sh/init.sh.GNU-kFreeBSD.in

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!@SHELL@
 # Copyright (c) 2007-2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
 # https://github.com/OpenRC/openrc/blob/master/AUTHORS

sh/init.sh.GNU.in

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!@SHELL@
 # Copyright (c) 2007-2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
 # https://github.com/OpenRC/openrc/blob/master/AUTHORS

sh/init.sh.Linux.in

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!@SHELL@
 # Copyright (c) 1999-2007 Gentoo Foundation
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
@@ -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
 

sh/migrate-to-run.sh.in

@@ -0,0 +1,36 @@
+#!@SHELL@
+# Copyright (c) 2012-2015 The OpenRC Authors.
+# See the Authors file at the top-level directory of this distribution and
+# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+#
+# This file is part of OpenRC. It is subject to the license terms in
+# the LICENSE file found in the top-level directory of this
+# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# This file may not be copied, modified, propagated, or distributed
+#    except according to the terms contained in the LICENSE file.
+
+. "@LIBEXECDIR@/sh/functions.sh"
+
+if [ -e /run/openrc/softlevel ]; then
+	einfo "The OpenRC dependency data has already been migrated."
+	exit 0
+fi
+
+if [ ! -d /run ]; then
+	eerror "/run is not a directory."
+	eerror "moving /run to /run.pre-openrc"
+	mv /run /run.pre-openrc
+	mkdir /run
+fi
+
+rm -rf /run/openrc
+
+if ! mountinfo -q -f tmpfs /run; then
+	ln -s "@LIBEXECDIR@"/init.d /run/openrc
+else
+	cp -a "@LIBEXECDIR@/init.d" /run/openrc
+	rc-update -u
+fi
+
+einfo "The OpenRC dependency data was migrated successfully."
+exit 0

sh/openrc-run.sh.in

@@ -133,10 +133,11 @@ _status()
 	elif service_inactive; then
 		ewarn "status: inactive"
 		return 16
-	elif service_crashed; then
-		eerror "status: crashed"
-		return 32
 	elif service_started; then
+		if service_crashed; then
+			eerror "status: crashed"
+			return 32
+		fi
 		einfo "status: started"
 		return 0
 	else
@@ -242,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
@@ -257,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
+			if [ -d /sys/fs/cgroup -a ! -w /sys/fs/cgroup ]; then
-			then
+				eerror "No permission to apply cgroup settings"
-				if [ -d /sys/fs/cgroup -a ! -w /sys/fs/cgroup ]; then
+				break
-					eerror "No permission to apply cgroup settings"
-					break
-				fi
 			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" ] &&
+		[ "$(command -v cgroup_set_limits)" = \
-			cgroup_set_limits
+		    "cgroup_set_limits" ] && \
-		[ "$(command -v cgroup2_set_limits)" = "cgroup2_set_limits" ] &&
+		    cgroup_set_limits
-			[ "$_cmd" = start ] &&
-			cgroup2_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"
@@ -366,14 +364,10 @@ while [ -n "$1" ]; do
 				then
 					"$1"_post || exit $?
 				fi
-				[ "$(command -v cgroup_cleanup)" = "cgroup_cleanup" ] &&
+				[ "$(command -v cgroup_cleanup)" = "cgroup_cleanup" -a \
-					[ "$1" = "stop" ] &&
+				"$1" = "stop" ] && \
-					yesno "${rc_cgroup_cleanup}" && \
+				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

sh/rc-cgroup.sh.in

@@ -1,3 +1,4 @@
+#!@SHELL@
 # Copyright (c) 2012-2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
 # https://github.com/OpenRC/openrc/blob/master/AUTHORS
@@ -13,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
+	local p
-	cgroup_procs="$(cgroup2_find_path)"
+	pids=
-	[ -n "${cgroup_procs}" ] &&
+	while read p; do
-		cgroup_procs="${cgroup_procs}/${RC_SVCNAME}/cgroup.procs" ||
+		[ $p -eq $$ ] || pids="${pids} ${p}"
-		cgroup_procs="/sys/fs/cgroup/openrc/${RC_SVCNAME}/tasks"
+	done < /sys/fs/cgroup/openrc/${RC_SVCNAME}/tasks
-	[ -f "${cgroup_procs}" ] || return 0
+	[ -n "$pids" ]
-	while read -r p; do
-		[ "$p" -eq $$ ] || pids="${pids} ${p}"
-	done < "${cgroup_procs}"
-	printf "%s" "${pids}"
-	return 0
 }
 
 cgroup_running()
 {
-	[ -d "/sys/fs/cgroup/unified/${RC_SVCNAME}" ] ||
+	[ -d "/sys/fs/cgroup/openrc/${RC_SVCNAME}" ]
-			[ -d "/sys/fs/cgroup/${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
+	local controller="$1" h=$(cgroup_find_path "$1")
-	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}" ] &&
+				if [ -n "$name" -a -w "$cgroup/$name" -a -n "$val" ]; then
-					[ -n "${val}" ]; then
 					veinfo "$RC_SVCNAME: Setting $cgroup/$name to $val"
 					printf "%s" "$val" > "$cgroup/$name"
 				fi
@@ -77,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
@@ -143,83 +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}"
-	[ ! -d "${rc_cgroup_path}" ] && mkdir "${rc_cgroup_path}"
-	[ -f "${rc_cgroup_path}"/cgroup.procs ] &&
-		printf 0 > "${rc_cgroup_path}"/cgroup.procs
-	[ -z "${rc_cgroup_settings}" ] && return 0
-	echo "${rc_cgroup_settings}" | while read -r key value; do
-		[ -z "${key}" ] && continue
-		[ -z "${value}" ] && continue
-		[ ! -f "${rc_cgroup_path}/${key}" ] && continue
-		veinfo "${RC_SVCNAME}: cgroups: setting ${key} to ${value}"
-		printf "%s\n" "${value}" > "${rc_cgroup_path}/${key}"
-	done
-	return 0
-}
-
 cgroup_cleanup()
 {
 	cgroup_running || return 0
 	ebegin "starting cgroups cleanup"
-	local pids loops=0
+	for sig in TERM QUIT INT; do
-	pids="$(cgroup_get_pids)"
+		cgroup_get_pids || { eend 0 "finished" ; return 0 ; }
-	if [ -n "${pids}" ]; then
+		for i in 0 1; do
-		kill -s CONT ${pids} 2> /dev/null
+			kill -s $sig $pids
-		kill -s "${stopsig:-TERM}" ${pids} 2> /dev/null
+			for j in 0 1 2; do
-		yesno "${rc_send_sighup:-no}" &&
+				cgroup_get_pids || { eend 0 "finished" ; return 0 ; }
-			kill -s HUP ${pids} 2> /dev/null
+				sleep 1
-		kill -s "${stopsig:-TERM}" ${pids} 2> /dev/null
+			done
-		while [ -n "$(cgroup_get_pids)" ] &&
+		done 2>/dev/null
-			[ "${loops}" -lt "${rc_timeout_stopsec:-90}" ]; do
+	done
-			loops=$((loops+1))
+	cgroup_get_pids || { eend 0 "finished" ; return 0; }
-			sleep 1
+	kill -9 $pids
-		done
+	eend $(cgroup_running && echo 1 || echo 0) "fail to stop all processes"
-		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
 }

sh/rc-functions.sh.in

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