version 0.45

add note about seedrng to news
update news
2022-06-07 18:04:20 -05:00 · 2022-06-07 17:43:24 -05:00 · 2022-06-07 12:41:01 -05:00 · 2022-06-06 23:34:38 -05:00 · 2022-05-08 19:00:00 -05:00 · 2022-05-08 17:10:44 -05:00
328 changed files with 3594 additions and 3437 deletions
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -4,12 +4,12 @@
 test_task:
  freebsd_instance:
    matrix:
-      image: freebsd-12-0-release-amd64
-      image: freebsd-11-2-release-amd64
+      image: freebsd-13-0-release-amd64
+      image: freebsd-12-3-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
+  pkg_install_script: pkg install -y bash gawk gsed meson
  gsed_hack_script: rm /usr/bin/sed && ln -s /usr/local/bin/gsed /usr/bin/sed
  test_script: bash ci/cirrus.sh
--- a/.clangd
+++ b/.clangd
@@ -0,0 +1,2 @@
+CompileFlags:
+  CompilationDatabase: builddir/
--- a/.github/workflows/ci-alpine-linux.yml
+++ b/.github/workflows/ci-alpine-linux.yml
@@ -0,0 +1,31 @@
+name: ci_alpine_linux
+
+on: [push, pull_request]
+
+jobs:
+
+  alpine:
+    name: Alpine Linux
+    runs-on: ubuntu-latest
+    container: alpine:latest
+    strategy:
+      fail-fast: false
+      matrix:
+        compiler:
+          - gcc
+    env:
+      CC: ${{ matrix.compiler }}
+    steps:
+      - run: >-
+          apk --no-cache add \
+            build-base \
+            meson \
+            pkgconf \
+            linux-pam \
+            linux-pam-dev \
+            libcap \
+            libcap-dev
+      - uses: actions/checkout@v2
+      - run: meson setup builddir/
+      - run: meson compile -C builddir
+      - run: meson test --verbose -C builddir
--- a/.github/workflows/ci-ubuntu.yml
+++ b/.github/workflows/ci-ubuntu.yml
@@ -0,0 +1,24 @@
+name: ci_ubuntu
+
+on: [push, pull_request]
+
+jobs:
+
+  ubuntu:
+    name: Ubuntu
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        compiler:
+          - gcc
+          - clang
+    env:
+      CC: ${{ matrix.compiler }}
+    steps:
+    - uses: actions/checkout@v2
+    - run: sudo apt-get update -q
+    - run: sudo apt-get install -q -y build-essential libpam-dev meson libcap-dev ${CC}
+    - run: meson setup builddir/
+    - run: ninja -C builddir
+    - run: ninja test --verbose -C builddir
--- a/.github/workflows/coverity.yml
+++ b/.github/workflows/coverity.yml
@@ -0,0 +1,25 @@
+# GitHub actions workflow.
+# https://docs.github.com/en/actions/learn-github-actions/workflow-syntax-for-github-actions
+
+# https://scan.coverity.com/projects/openrc-openrc
+name: Coverity Scan
+
+on:
+  push:
+    branches: [master]
+
+jobs:
+  coverity:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - run: sudo apt-get update -q
+    - run: sudo apt-get install -q -y build-essential libpam-dev meson libcap-dev
+    - run: meson setup builddir/
+      env:
+        CC: gcc
+    - uses: vapier/coverity-scan-action@v1
+      with:
+        command: ninja -C builddir
+        email: ${{ secrets.COVERITY_SCAN_EMAIL }}
+        token: ${{ secrets.COVERITY_SCAN_TOKEN }}
--- a/.gitignore
+++ b/.gitignore
@@ -9,8 +9,4 @@ core
 .gdb_history
 .gdbinit

-.depend
-*.a
-*.o
-*.So
-lib*.so
+build
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,10 +19,14 @@ addons:
 notifications:
  irc:
    channels:
-      - "irc.freenode.org#openrc"
-    on_success: change  # options: [always|never|change] default: always
+      - "irc.libera.chat#openrc"
+    on_success: always  # options: [always|never|change] default: always
    on_failure: always  # options: [always|never|change] default: always
    on_start: false     # default: false

+before_install:
+  - sudo apt-get update
+  - sudo apt-get install -y shellcheck
+
 script:
  - ./ci/travis.sh
--- a/1
+++ b/1
@@ -43,6 +43,7 @@ Ian Stakenvicius <axs@gentoo.org>
 Jakob Drexel <jake42@rommel.stw.uni-erlangen.de>
 James Le Cuirot <chewi@aura-online.co.uk>
 Jan Psota <jasiu@belsznica.pl>
+Jason A. Donenfeld <Jason@zx2c4.com>
 Jason Zaman <jason@perfinion.com>
 Joe Harvell <jharvell@dogpad.net>
 Joe M <joe9mail@gmail.com>
--- a/1004
+++ b/1004
--- a/55
+++ b/55
@@ -1,55 +0,0 @@
-# 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
-#
-# 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.
-
-TOP:=		${dir ${realpath ${firstword ${MAKEFILE_LIST}}}}
-MK=			${TOP}/mk
-
-include ${TOP}/Makefile.inc
-
-SUBDIR=		conf.d etc init.d local.d man scripts sh src support sysctl.d
-
-# Build bash completion or not
-MKBASHCOMP?=	no
-ifeq (${MKBASHCOMP},yes)
-SUBDIR+=	bash-completion
-endif
-
-# Build pkgconfig or not
-MKPKGCONFIG?=	yes
-ifeq (${MKPKGCONFIG},yes)
-SUBDIR+=	pkgconfig
-endif
-
-# Build zsh completion or not
-MKZSHCOMP?=	no
-ifeq (${MKZSHCOMP},yes)
-SUBDIR+=	zsh-completion
-endif
-
-# We need to ensure that runlevels is done last other than test
-SUBDIR+=	runlevels
-SUBDIR+=	test
-
-INSTALLAFTER=	_installafter
-
-include ${MK}/sys.mk
-include ${MK}/os.mk
-include ${MK}/subdir.mk
-include ${MK}/dist.mk
-include ${MK}/gitver.mk
-
-_installafter:
-ifeq (${MKPREFIX},yes)
-	${INSTALL} -d ${DESTDIR}/${LIBEXECDIR}/init.d
-else ifneq (${OS},Linux)
-	${INSTALL} -d ${DESTDIR}/${LIBEXECDIR}/init.d
-endif
-	${INSTALL} -d ${DESTDIR}/${LIBEXECDIR}/tmp
-	${ECHO} "${VERSION}${GITVER}" > ${DESTDIR}/${LIBEXECDIR}/version
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -1,3 +0,0 @@
-NAME=		openrc
-VERSION=	0.42.1
-PKG=		${NAME}-${VERSION}
--- a/README.newnet
+++ b/README.newnet
@@ -1,5 +1,5 @@
 OpenRC Network Ideals
---------------------
+=====================

 The new style networking for OpenRC is very simplistic - provide a basic means
 of configuring static interface address and routes whilst allowing the
--- a/NEWS.md
+++ b/NEWS.md
@@ -4,6 +4,67 @@ 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.45
+
+The old make-based build system is removed in this release.
+
+The killprocs service now has a KILL_DELAY setting to allow OpenRC based
+containers to close all TCP/IP connections before they are shut down.
+
+The --oom-score-adj option has been added to start-stop-daemon and
+supervise-daemon. This sets the appropriate setting for the Linux
+kernel. for more info, see the man pages.
+
+Support for Linux capabilities has been added to both supervise-daemon
+and start-stop-daemon using the --capabilities option.
+As a result, the user can specify the inheritable, ambient and bounding set
+by defining capabilities in the service script.
+
+noexec has been added to the default mount options for /dev. If you need
+to remove this option, add an entry to fstab.
+
+A --secbits option has been added to start-stop-daemon and
+supervise-daemon. This sets the security bits option which should be
+applied to the daemon.
+
+A no-new-privs option has been added to start-stop-daemon and
+supervise-daemon. This sets the NO_NEW_PRIVS flag to apply to the
+daemon.
+
+On Linux, the service that seeds the random number generator has been
+renamed from urandom to seedrng. This means that when  you upgrade to
+this version, if urandom is in your boot runlevel, you must add seedrng.
+This can be done by issuing the following commands:
+
+```
+# rc-update add seedrng boot
+# rc-update del urandom boot
+```
+
+## OpenRC 0.44
+
+This version is the first to use a meson-based build system.
+The gnu make build system should now be considered deprecated; it will
+be removed sometime after 0.44.x.
+
+I have opened a [discussion](https://github.com/OpenRC/openrc/discussions/441)
+where you can voice concerns about removing it.
+
+## OpenRC 0.43
+
+This version changes the behavior of the checkpath helper to address
+CVE-2018-21269. on Linux systems, We require  non-terminal symbolic links
+to be owned by root. Since we can't do this on non-linux systems, we do
+not dereference non-terminal symbolic links by default. If you need them
+dereferenced, you should add the "-s" switch to the appropriate
+checkpath calls.
+For more information, see http://github.com/openrc/openrc/issues/201.
+
+The SHLIBDIR variable has been removed from the makefiles to make them
+more consistent with most common makefiles. All libraries are now in
+LIBDIR, so if you need to put them in /, override the LIBDIR variable
+when you run make.
+
 ## OpenRC 0.42

 openrc-shutdown now has the ability to shut down sysvinit-based systems.
@@ -82,7 +143,7 @@ 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,
+If you are a linux user and are still separating / from /usr,
 you will need to add the following line to the appropriate conf.d files:

 rc_need="localmount"
--- a/README.md
+++ b/README.md
@@ -2,68 +2,23 @@ OpenRC README
 =============

 OpenRC is a dependency-based init system that works with the
-system-provided init program, normally `/sbin/init`. Currently, it does
-not have an init program of its own.
+system-provided init program, normally `/sbin/init`.

-## Installation
+## building and installing

-OpenRC requires GNU make.
-
-Once you have GNU Make installed, the default OpenRC installation can be
-executed using this command:
-
-make install
-
-## Configuration
-
-You may wish to configure the installation by passing one or more of the
-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
-```
+OpenRC uses the  [meson](http://mesonbuild.com) build system, so use the
+usual methods for this build system to build and install.

 ## Notes

 We don't support building a static OpenRC with PAM.

-You may need to use `PROGLDFLAGS=-Wl,-Bstatic` on glibc instead of just `-static`.
-
-If you are building OpenRC for a Gentoo Prefix installation, add `MKPREFIX=yes`.
-
 `PKG_PREFIX` should be set to where packages install to by default.

-`LOCAL_PREFIX` should be set when to where user maintained packages are.
+`LOCAL_PREFIX` should be set to where user maintained packages are.
 Only set `LOCAL_PREFIX` if different from `PKG_PREFIX`.

-`PREFIX` should be set when OpenRC is not installed to /.
-
-If any of the following files exist then we do not overwrite them
-
-```
-/etc/devd.conf
-/etc/rc
-/etc/rc.shutdown
-/etc/conf.d/*
-```
+`ROOTPREFIX` should be set when the root path is different from '/'.

 `rc` and `rc.shutdown` are the hooks from the BSD init into OpenRC.

@@ -77,20 +32,21 @@ Obviously, if you're installing this onto a system that does not use
 OpenRC by default then you may wish to backup the above listed files,
 remove them and then install so that the OS hooks into OpenRC.

+## Discussions
+
+We are testing [discussions](https://github.com/OpenRC/openrc/discussions), so
+feel free to open topics there.
+
 ## Reporting Bugs

-If you are using Gentoo Linux, bugs can be filed on their bugzilla under
-the `gentoo hosted projects` product and the `openrc` component [1].
-Otherwise, you can report issues on our github [2].
+Please report bugs on our [bug tracker](http://github.com/OpenRC/openrc/issues).

-Better yet, if you can contribute code, please feel free to submit pull
-requests [3].
+If you can contribute code , please feel free to do so by opening
+[pull requests](https://github.com/OpenRC/openrc/pulls).

 ## IRC Channel

-We have an official irc channel, #openrc on freenode, feel free to join
-us there.
+We have an official irc channel, #openrc on the libera network.
+Please connect your irc client to irc.libera.chat and join #openrc on
+that network.

-[1]	https://bugs.gentoo.org/
-[2]	https://github.com/openrc/openrc/issues
-[3]	https://github.com/openrc/openrc/pulls
--- a/bash-completion/Makefile
+++ b/bash-completion/Makefile
@@ -1,11 +0,0 @@
-DIR=	${BASHCOMPDIR}
-CONF=	openrc \
-		openrc-service-script \
-		rc-service \
-		rc-status \
-		rc-update \
-
-MK=	../mk
-include ${MK}/os.mk
-
-include ${MK}/scripts.mk
--- a/bash-completion/meson.build
+++ b/bash-completion/meson.build
@@ -0,0 +1,12 @@
+if get_option('bash-completions')
+bash_completions = [
+  'openrc',
+  'openrc-service-script',
+  'rc-service',
+  'rc-status',
+  'rc-update',
+  ]
+
+install_data(bash_completions,
+  install_dir : get_option('datadir') / 'bash-completion/completions')
+endif
--- a/bash-completion/openrc
+++ b/bash-completion/openrc
@@ -1,10 +1,10 @@
 # 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
+# https://github.com/OpenRC/openrc/blob/HEAD/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
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.

--- a/bash-completion/openrc-service-script
+++ b/bash-completion/openrc-service-script
@@ -1,10 +1,10 @@
 # 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
+# https://github.com/OpenRC/openrc/blob/HEAD/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
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.

--- a/bash-completion/rc-service
+++ b/bash-completion/rc-service
@@ -1,10 +1,10 @@
 # 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
+# https://github.com/OpenRC/openrc/blob/HEAD/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
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.

--- a/bash-completion/rc-status
+++ b/bash-completion/rc-status
@@ -1,10 +1,10 @@
 # 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
+# https://github.com/OpenRC/openrc/blob/HEAD/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
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.

--- a/bash-completion/rc-update
+++ b/bash-completion/rc-update
@@ -1,10 +1,10 @@
 # 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
+# https://github.com/OpenRC/openrc/blob/HEAD/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
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.

--- a/ci/cirrus.sh
+++ b/ci/cirrus.sh
@@ -1,11 +1,11 @@
 #!/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
+# https://github.com/OpenRC/openrc/blob/HEAD/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
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.

@@ -16,6 +16,6 @@ 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
+meson build
+meson compile -C build
+meson test --verbose -C build
--- a/ci/travis.sh
+++ b/ci/travis.sh
@@ -1,11 +1,11 @@
 #!/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
+# https://github.com/OpenRC/openrc/blob/HEAD/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
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.

@@ -16,6 +16,23 @@ set -x
 # These are steps to run on TravisCI under a containerized Ubuntu system.
 # See $TOP/.travis.yml for more info about the TravisCI setup.

+# Run shellcheck, but don't fail (yet):
+shellcheck --version
+for shellscript in $(git ls-files); do
+	case $shellscript in
+		init.d/*.in) ;;
+		sh/*.in) ;;
+		sh/*.sh) ;;
+		support/init.d.examples/*.in) ;;
+		support/openvpn/*.sh) ;;
+		support/sysvinit/halt.sh) ;;
+		test/*.sh) ;;
+		*) continue ;;
+	esac
+	echo "Checking ${shellscript} with shellcheck:"
+	shellcheck -s sh "${shellscript}" || true
+done
+
 cpus=$(getconf _NPROCESSORS_CONF || echo 1)
 # make on TravisCI doesn't support -O yet
 make -j"${cpus}"
--- a/conf.d/Makefile
+++ b/conf.d/Makefile
@@ -1,20 +0,0 @@
-include ../mk/net.mk
-
-DIR=	${CONFDIR}
-CONF=	bootmisc fsck hostname localmount netmount swap urandom ${CONF-${OS}}
-
-ifeq (${MKNET},yes)
-CONF+= network staticroute
-endif
-
-MK=	../mk
-include ${MK}/os.mk
-
-CONF-FreeBSD=	ipfw modules moused powerd rarpd savecore syscons
-
-CONF-Linux=	agetty consolefont devfs dmesg hwclock keymaps killprocs modules \
-	mtab net-online
-
-CONF-NetBSD=	moused rarpd savecore
-
-include ${MK}/scripts.mk
--- a/conf.d/fsck
+++ b/conf.d/fsck
@@ -8,7 +8,7 @@
 # We can also specify the passno in /etc/fstab to check
 # If you multiplex fsck (ie ln -s fsck /etc/init.d/fsck.late) then you can
 # do an fsck outside of the normal scope, say for /home.
-# Here are some exampes:-
+# Here are some examples:-
 #fsck_passno="=1 =2"
 #fsck_passno=">1"
 #fsck_passno="<2"
--- a/conf.d/hostname
+++ b/conf.d/hostname
@@ -1,2 +1,2 @@
-# Set to the hostname of this machine
+# Hostname fallback if /etc/hostname does not exist
 hostname="localhost"
--- a/conf.d/ipfw
+++ b/conf.d/ipfw
@@ -1,6 +1,6 @@
 # ipfw provides a stateful firewall.
 # This means we allow everything out, and if we have a connection we allow it
-# back in. This is very flexable and quite secure.
+# back in. This is very flexible and quite secure.

 # For ease of use, we allow auth and ssh ports through as well.
 # To override the list of allowed ports
--- a/conf.d/killprocs
+++ b/conf.d/killprocs
@@ -4,3 +4,8 @@
 # The setting is called killall5_opts because the options here are meant
 # to be identical to those you could pass to killall5.
 killall5_opts=""
+
+# If you need to delay after each kill attempt during shutdown, set the amount
+# of time you need to delay here. This gets passed directly to sleep in
+# the shell.
+# kill_delay=0
--- a/conf.d/meson.build
+++ b/conf.d/meson.build
@@ -0,0 +1,61 @@
+conf_d_dir = get_option('sysconfdir') / 'conf.d'
+
+conf_common = [
+  'bootmisc',
+  'fsck',
+  'hostname',
+  'localmount',
+  'netmount',
+  'swap',
+  ]
+
+conf_net = [
+  'network',
+  'staticroute',
+  ]
+
+conf_FreeBSD = [
+  'ipfw',
+  'modules',
+  'moused',
+  'powerd',
+  'rarpd',
+  'savecore',
+  'syscons',
+  'urandom',
+  ]
+
+conf_Linux = [
+  'agetty',
+  'consolefont',
+  'devfs',
+  'dmesg',
+  'hwclock',
+  'keymaps',
+  'killprocs',
+  'modules',
+  'mtab',
+  'net-online',
+  'seedrng',
+  ]
+
+conf_NetBSD =  [
+  'moused',
+  'rarpd',
+  'savecore',
+  'urandom',
+  ]
+
+conf_data = conf_common
+if get_option('newnet')
+  conf_data = conf_data + conf_net
+endif
+if os == 'FreeBSD'
+  conf_data = conf_data + conf_FreeBSD
+elif os == 'Linux'
+  conf_data = conf_data + conf_Linux
+elif os == 'NetBSD'
+  conf_data = conf_data + conf_NetBSD
+endif
+
+install_data(conf_data, install_dir : conf_d_dir)
--- a/conf.d/network
+++ b/conf.d/network
@@ -1,5 +1,5 @@
 # Assign static IP addresses and run custom scripts per interface.
-# Seperate commands with ;
+# Separate commands with ;
 # Prefix with ! to run a shell script.
 # Use \$int to represent the interface
 #ifconfig_eth0="192.168.0.10 netmask 255.255.255.0"
--- a/conf.d/powerd
+++ b/conf.d/powerd
@@ -3,5 +3,5 @@
 powerd_ac_mode="maximum"
 #powerd_battery_mode="minimum"

-# Addiditonal arguments for powerd - see the man page for details
+# Additional arguments for powerd - see the man page for details
 powerd_args=""
--- a/conf.d/seedrng
+++ b/conf.d/seedrng
@@ -0,0 +1,14 @@
+# The convention in this file is to show the default settings commented out.
+#
+# Sometimes you want to have urandom start before "localmount" (say for crypt
+# swap), so you will need to customize this behavior.  If you have /var on a
+# separate partition, make sure paths under /var are adjusted to point to
+# locations on your root device.
+#
+# Set skip_credit to yes or true if you do not want seed files to actually
+# credit the random number generator. For example, you should set this if you
+# plan to replicate the file system image without removing the contents of
+# ${seed_dir}.
+#
+# seed_dir=/var/lib/seedrng
+# skip_credit=no
--- a/etc/.gitignore
+++ b/etc/.gitignore
@@ -1,2 +0,0 @@
-rc
-rc.shutdown
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,23 +0,0 @@
-DIR=	${SYSCONFDIR}
-SRCS=	rc.in rc.shutdown.in
-BIN=	${BIN-${OS}}
-CONF=	rc.conf ${BIN-${OS}}
-
-MK=	../mk
-include ${MK}/os.mk
-
-SED_EXTRA-FreeBSD=	-e 's:@TERM@:cons25:g'
-BIN-FreeBSD=		rc rc.shutdown rc.devd
-CONF-FreeBSD=		devd.conf
-
-SED_EXTRA-Linux=	-e 's:@TERM@:wsvt25:g'
-BIN-Linux=
-CONF-Linux=
-
-SED_EXTRA-NetBSD=	-e 's:@TERM@:wsvt25:g'
-BIN-NetBSD=		rc rc.shutdown
-CONF-NetBSD=
-
-SED_EXTRA=	${SED_EXTRA-${OS}}
-
-include ${MK}/scripts.mk
--- a/etc/meson.build
+++ b/etc/meson.build
@@ -0,0 +1,44 @@
+etc_conf_data = configuration_data()
+if os == 'FreeBSD'
+  etc_conf_data.set('TERM', 'cons25')
+elif os == 'Linux'
+  etc_conf_data.set('TERM', 'wsvt25')
+endif
+
+etc_conf_common = [
+  'rc.conf',
+  ]
+
+etc_bin_FreeBSD = [
+  'rc.devd',
+  ]
+
+etc_conf_FreeBSD = [
+  'devd.conf',
+  ]
+
+etc_bin_NetBSD =  [
+  'rc.in',
+  'rc.shutdown.in',
+  ]
+
+install_data(etc_conf_common,
+  install_dir : get_option('sysconfdir'))
+
+  if os == 'FreeBSD'
+  install_data(etc_bin_FreeBSD,
+    install_dir : get_option('sysconfdir'),
+    install_mode: 'rwxr-xr-x')
+  install_data(etc_conf_FreeBSD,
+    install_dir : get_option('sysconfdir'))
+endif
+
+if os == 'FreeBSD' or os == 'NetBSD'
+  foreach file : etc_bin_NetBSD
+    configure_file(input : file,
+      output : '@BASENAME@',
+      configuration : etc_conf_data,
+      install_dir: get_option('sysconfdir'),
+      install_mode: 'rwxr-xr-x')
+  endforeach
+endif
--- a/etc/rc.conf
+++ b/etc/rc.conf
@@ -116,10 +116,12 @@

 # Some daemons are started and stopped via start-stop-daemon.
 # We can set some things on a per service basis, like the nicelevel.
-#SSD_NICELEVEL="-19"
+#SSD_NICELEVEL="0"
 # Or the ionice level. The format is class[:data] , just like the
 # --ionice start-stop-daemon parameter.
-#SSD_IONICELEVEL="2:2"
+#SSD_IONICELEVEL="0:0"
+# Or the OOM score adjustment.
+#SSD_OOM_SCORE_ADJ="0"

 # Pass ulimit parameters
 # If you are using bash in POSIX mode for your shell, note that the
@@ -198,10 +200,9 @@ rc_tty_number=12
 # "unified" mounts cgroups version 2 on /sys/fs/cgroup
 #rc_cgroup_mode="hybrid"

-# This is a list of controllers which should be enabled for cgroups version 2.
-# If hybrid mode is being used, controllers listed here will not be
-# available for cgroups version 1.
-# This is a global setting.
+# This is a list of controllers which should be enabled for cgroups version 2
+# when hybrid mode is being used.
+# Controllers listed here will not be available for cgroups version 1.
 #rc_cgroup_controllers=""

 # This variable contains the cgroups version 2 settings for your services.
@@ -289,7 +290,9 @@ rc_tty_number=12
 # 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:
+# If the kernel includes support for cgroup2's cgroup.kill, this is used
+# to reliably teardown the cgroup.
+# If this fails, 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
--- a/etc/rc.devd
+++ b/etc/rc.devd
@@ -1,11 +1,11 @@
 #!/bin/sh
 # 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
+# https://github.com/OpenRC/openrc/blob/HEAD/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
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 #    except according to the terms contained in the LICENSE file.

@@ -26,7 +26,7 @@ getmedia() {
 if [ ! -e /etc/init.d/"$1" -a ! -e /usr/local/init.d/"$1" ]; then
 	base=${1%%.*}
 	if [ "${base}" = "net" ]; then
-		# We only create links for pyhsical interfaces
+		# We only create links for physical interfaces
 		[ -n "$(getmedia ${1#*.})" ] || exit 1
 		base="net.lo0"
 	fi
--- a/etc/rc.in
+++ b/etc/rc.in
@@ -1,11 +1,11 @@
 #!/bin/sh
 # 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
+# https://github.com/OpenRC/openrc/blob/HEAD/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
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 #    except according to the terms contained in the LICENSE file.

--- a/etc/rc.shutdown.in
+++ b/etc/rc.shutdown.in
@@ -1,11 +1,11 @@
 #!/bin/sh
 # 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
+# https://github.com/OpenRC/openrc/blob/HEAD/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
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 #    except according to the terms contained in the LICENSE file.

--- a/init-guide.md
+++ b/init-guide.md
@@ -45,6 +45,3 @@ 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.
-
--- a/init.d/.gitignore
+++ b/init.d/.gitignore
@@ -1,51 +0,0 @@
-agetty
-binfmt
-cgroups
-modules-load
-bootmisc
-fsck
-hostname
-local
-localmount
-loopback
-moused
-netmount
-network
-root
-savecache
-swap
-sysctl
-urandom
-devfs
-dmesg
-hwclock
-consolefont
-keymaps
-killprocs
-modules
-mount-ro
-mtab
-net-online
-numlock
-osclock
-procfs
-s6-svscan
-staticroute
-sysfs
-devdb
-hostid
-newsyslog
-pf
-rarpd
-rc-enabled
-rpcbind
-runsvdir
-savecore
-save-keymaps
-save-termencoding
-swap-blk
-swclock
-syslogd
-termencoding
-ttys
-wscons
--- a/init.d/Makefile
+++ b/init.d/Makefile
@@ -1,37 +0,0 @@
-include ../mk/net.mk
-
-DIR=	${INITDIR}
-SRCS=	bootmisc.in fsck.in hostname.in local.in localmount.in loopback.in \
-	netmount.in osclock.in root.in savecache.in swap.in swclock.in \
-	sysctl.in runsvdir.in urandom.in s6-svscan.in ${SRCS-${OS}}
-BIN=	${OBJS}
-
-# Are we installing our network scripts?
-ifeq (${MKNET},yes)
-SRCS+= network.in staticroute.in
-endif
-
-MK=	../mk
-include ${MK}/os.mk
-
-# Generic BSD scripts
-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
-
-SRCS-Linux=	agetty.in binfmt.in devfs.in cgroups.in dmesg.in hwclock.in \
-	consolefont.in keymaps.in killprocs.in modules.in \
-	mount-ro.in mtab.in numlock.in procfs.in net-online.in save-keymaps.in \
-	save-termencoding.in sysfs.in termencoding.in
-
-# Generic BSD scripts
-SRCS-NetBSD=	hostid.in moused.in newsyslog.in pf.in rarpd.in rc-enabled.in \
-		rpcbind.in savecore.in syslogd.in
-# These are NetBSD specific
-SRCS-NetBSD+=	devdb.in swap-blk.in ttys.in wscons.in
-
-include ${MK}/scripts.mk
-
-_installafter_: realinstall
--- a/init.d/adjkerntz.in
+++ b/init.d/adjkerntz.in
@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # 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
+# https://github.com/OpenRC/openrc/blob/HEAD/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
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.

--- a/init.d/agetty.in
+++ b/init.d/agetty.in
@@ -1,11 +1,11 @@
 #!@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
+# https://github.com/OpenRC/openrc/blob/HEAD/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
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.

@@ -25,7 +25,7 @@ depend() {
 }

 start_pre() {
-	if [ -z "$port" ]; then
+	if [ "$port" = "$RC_SVCNAME" ]; then
 		eerror "${RC_SVCNAME} cannot be started directly. You must create"
 		eerror "symbolic links to it for the ports you want to start"
 		eerror "agetty on and add those to the appropriate runlevels."
--- a/init.d/binfmt.in
+++ b/init.d/binfmt.in
@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # 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
+# https://github.com/OpenRC/openrc/blob/HEAD/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
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.

--- a/init.d/bootmisc.in
+++ b/init.d/bootmisc.in
@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # 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
+# https://github.com/OpenRC/openrc/blob/HEAD/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
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.

@@ -113,8 +113,10 @@ migrate_to_run()
 		rm $src
 	elif [ ! -L $src -a -d $src ]; then
 		ebegin "Migrating $src to $dst"
- 		cp -a $src/* $dst/
- 		rm -rf $src
+ 		if ! rmdir $src 2>/dev/null; then
+ 			cp -a $src/* $dst/
+ 			rm -rf $src
+ 		fi
 		eend $?
 	fi
 	# If $src doesn't exist at all, just run this
@@ -224,7 +226,7 @@ start()
 			case "$RC_SYS" in
 				VSERVER|OPENVZ|LXC|SYSTEMD-NSPAWN) ;;
 				*)
-					if yesno ${previous_dmesg:-no}; then
+					if yesno ${previous_dmesg:-no} && [ -e /var/log/dmesg ]; then
 						mv /var/log/dmesg /var/log/dmesg.old
 					fi
 					dmesg > /var/log/dmesg
@@ -241,7 +243,13 @@ stop()
 {
 	# Write a halt record if we're shutting down
 	if [ "$RC_RUNLEVEL" = shutdown ]; then
-		[ "$RC_UNAME" = Linux ] && openrc-shutdown -w
+		if [ "$RC_UNAME" = Linux ]; then
+			if [ -x /sbin/halt ]; then
+				halt -w
+			else
+				openrc-shutdown -w
+			fi
+		fi
 		if [ "$RC_SYS" = OPENVZ ]; then
 			yesno $RC_REBOOT && printf "" >/reboot
 		fi
--- a/init.d/cgroups.in
+++ b/init.d/cgroups.in
@@ -1,11 +1,11 @@
 #!@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
+# https://github.com/OpenRC/openrc/blob/HEAD/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
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.

@@ -83,14 +83,22 @@ cgroup2_controllers()
 	local active cgroup_path x y
 	cgroup_path="$(cgroup2_find_path)"
 	[ -z "${cgroup_path}" ] && return 0
-	[ -e "${cgroup_path}/cgroup.controllers" ] &&
+	[ ! -e "${cgroup_path}/cgroup.controllers" ] && return 0
+	[ ! -e "${cgroup_path}/cgroup.subtree_control" ]&& return 0
 	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" ]&&
+	for x in ${active}; do
+	case "$rc_cgroup_mode" in
+		unified)
 			echo "+${x}"  > "${cgroup_path}/cgroup.subtree_control"
-		done
+			;;
+		hybrid)
+			for y in ${rc_cgroup_controllers}; do
+				if [ "$x" = "$y" ]; then
+					echo "+${x}"  > "${cgroup_path}/cgroup.subtree_control"
+				fi
+			done
+			;;
+		esac
 	done
 	return 0
 }
--- a/init.d/consolefont.in
+++ b/init.d/consolefont.in
@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # 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
+# https://github.com/OpenRC/openrc/blob/HEAD/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
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.

--- a/init.d/devd.in
+++ b/init.d/devd.in
@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # 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
+# https://github.com/OpenRC/openrc/blob/HEAD/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
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.

--- a/init.d/devdb.in
+++ b/init.d/devdb.in
@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # Copyright (c) 2008-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
+# https://github.com/OpenRC/openrc/blob/HEAD/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
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.

--- a/init.d/devfs.in
+++ b/init.d/devfs.in
@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # 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
+# https://github.com/OpenRC/openrc/blob/HEAD/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
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.

@@ -15,7 +15,7 @@ depend()
 {
 	provide dev-mount
 	before dev
-	keyword -docker -lxc -prefix -systemd-nspawn -vserver
+	keyword -docker -prefix -systemd-nspawn -vserver
 }

 mount_dev()
@@ -24,8 +24,9 @@ mount_dev()
 	action=--mount
 	conf_d_dir="${RC_SERVICE%/*/*}/conf.d"
 	msg=Mounting
-	# Some devices require exec, Bug #92921
-	mountopts="exec,nosuid,mode=0755"
+	# Some devices require exec, https://bugs.gentoo.org/92921
+	# Users with such requirements can use an fstab entry for /dev
+	mountopts="noexec,nosuid,mode=0755"
 	if yesno ${skip_mount_dev:-no} ; then
 		einfo "/dev will not be mounted due to user request"
 		return 0
@@ -66,18 +67,20 @@ seed_dev()
 {
 	# Seed /dev with some things that we know we need

-	# creating /dev/console, /dev/tty and /dev/tty1 to be able to write
-	# to $CONSOLE with/without bootsplash before udevd creates it
-	[ -c /dev/console ] || mknod -m 600 /dev/console c 5 1
-	[ -c /dev/tty1 ] || mknod -m 620 /dev/tty1 c 4 1
-	[ -c /dev/tty ] || mknod -m 666 /dev/tty c 5 0
+	if [ "${RC_SYS}" != LXC ]; then
+		# creating /dev/console, /dev/tty and /dev/tty1 to be able to write
+		# to $CONSOLE with/without bootsplash before udevd creates it
+		[ -c /dev/console ] || mknod -m 600 /dev/console c 5 1
+		[ -c /dev/tty1 ] || mknod -m 620 /dev/tty1 c 4 1
+		[ -c /dev/tty ] || mknod -m 666 /dev/tty c 5 0

-	# udevd will dup its stdin/stdout/stderr to /dev/null
-	# and we do not want a file which gets buffered in ram
-	[ -c /dev/null ] || mknod -m 666 /dev/null c 1 3
+		# udevd will dup its stdin/stdout/stderr to /dev/null
+		# and we do not want a file which gets buffered in ram
+		[ -c /dev/null ] || mknod -m 666 /dev/null c 1 3

-	# so udev can add its start-message to dmesg
-	[ -c /dev/kmsg ] || mknod -m 660 /dev/kmsg c 1 11
+		# so udev can add its start-message to dmesg
+		[ -c /dev/kmsg ] || mknod -m 660 /dev/kmsg c 1 11
+	fi

 	# extra symbolic links not provided by default
 	[ -e /dev/fd ] || ln -snf /proc/self/fd /dev/fd
--- a/init.d/dmesg.in
+++ b/init.d/dmesg.in
@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # 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
+# https://github.com/OpenRC/openrc/blob/HEAD/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
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.

--- a/init.d/dumpon.in
+++ b/init.d/dumpon.in
@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # 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
+# https://github.com/OpenRC/openrc/blob/HEAD/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
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.

--- a/init.d/fsck.in
+++ b/init.d/fsck.in
@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # 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
+# https://github.com/OpenRC/openrc/blob/HEAD/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
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.

@@ -106,7 +106,7 @@ start()
 			_abort
 		fi;;
 	4)	if [ "$RC_UNAME" = Linux ]; then
-			ewend 1 "Fileystem errors left uncorrected, aborting"
+			ewend 1 "Filesystem errors left uncorrected, aborting"
 			_abort
 		else
 		 	ewend 1 "Filesystems repaired, but reboot needed"
--- a/init.d/hostid.in
+++ b/init.d/hostid.in
@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # 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
+# https://github.com/OpenRC/openrc/blob/HEAD/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
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.

--- a/init.d/hostname.in
+++ b/init.d/hostname.in
@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # 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
+# https://github.com/OpenRC/openrc/blob/HEAD/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
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.

--- a/init.d/hwclock.in
+++ b/init.d/hwclock.in
@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # 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
+# https://github.com/OpenRC/openrc/blob/HEAD/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
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.

--- a/init.d/ipfw.in
+++ b/init.d/ipfw.in
@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # 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
+# https://github.com/OpenRC/openrc/blob/HEAD/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
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.

@@ -122,7 +122,7 @@ start() {
 		ipfw add deny { tcp or udp } from any to any $p in
 	done

-	# Broadcasts and muticasts
+	# Broadcasts and multicasts
 	ipfw add deny ip from any to 255.255.255.255
 	ipfw add deny ip from any to 224.0.0.0/24

--- a/init.d/keymaps.in
+++ b/init.d/keymaps.in
@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # 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
+# https://github.com/OpenRC/openrc/blob/HEAD/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
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.

--- a/init.d/killprocs.in
+++ b/init.d/killprocs.in
@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # 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
+# https://github.com/OpenRC/openrc/blob/HEAD/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
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.

@@ -20,8 +20,10 @@ start()
 {
 	ebegin "Terminating remaining processes"
 	kill_all 15 ${killall5_opts}
+	sleep ${kill_delay:-0}
 	eend 0
 	ebegin "Killing remaining processes"
+	sleep ${kill_delay:-0}
 	kill_all 9 ${killall5_opts}
 	eend 0
 }
--- a/init.d/local.in
+++ b/init.d/local.in
@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # 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
+# https://github.com/OpenRC/openrc/blob/HEAD/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
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.

--- a/init.d/localmount.in
+++ b/init.d/localmount.in
@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # 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
+# https://github.com/OpenRC/openrc/blob/HEAD/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
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.

@@ -13,9 +13,9 @@ description="Mounts disks and swap according to /etc/fstab."

 depend()
 {
-	need fsck
-	use lvm modules root
-	after clock lvm modules root
+	need fsck root
+	use lvm modules
+	after clock lvm modules
 	keyword -docker -jail -lxc -prefix -systemd-nspawn -vserver
 }

--- a/init.d/loopback.in
+++ b/init.d/loopback.in
@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # Copyright (c) 2013-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
+# https://github.com/OpenRC/openrc/blob/HEAD/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
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.

--- a/init.d/meson.build
+++ b/init.d/meson.build
@@ -0,0 +1,101 @@
+init_d_dir = get_option('sysconfdir') / 'init.d'
+
+init_common =  [
+  'bootmisc.in',
+  'fsck.in',
+  'hostname.in',
+  'local.in',
+  'localmount.in',
+  'loopback.in',
+  'netmount.in',
+  'osclock.in',
+  'root.in',
+  'savecache.in',
+  'swap.in',
+  'swclock.in',
+  'sysctl.in',
+  'runsvdir.in',
+  's6-svscan.in',
+  ]
+
+if get_option('newnet')
+  init_common = init_common + [
+    'network.in',
+    'staticroute.in',
+    ]
+endif
+
+init_Linux =  [
+  'agetty.in',
+  'binfmt.in',
+  'cgroups.in',
+  'consolefont.in',
+  'devfs.in',
+  'dmesg.in',
+  'hwclock.in',
+  'keymaps.in',
+  'killprocs.in',
+  'modules.in',
+  'mount-ro.in',
+  'mtab.in',
+  'numlock.in',
+  'procfs.in',
+  'net-online.in',
+  'save-keymaps.in',
+  'save-termencoding.in',
+  'seedrng.in',
+  'sysfs.in',
+  'termencoding.in',
+  ]
+
+init_BSD =  [
+  'hostid.in',
+  'moused.in',
+  'newsyslog.in',
+  'pf.in',
+  'rarpd.in',
+  'rc-enabled.in',
+  'rpcbind.in',
+  'savecore.in',
+  'syslogd.in',
+  'urandom.in',
+  ]
+
+init_FreeBSD =  [
+  'adjkerntz.in',
+  'devd.in',
+  'dumpon.in',
+  'encswap.in',
+  'ipfw.in',
+  'modules.in',
+  'mixer.in',
+  'nscd.in',
+  'powerd.in',
+  'syscons.in',
+  ]
+
+init_NetBSD =  [
+  'devdb.in',
+  'swap-blk.in',
+  'ttys.in',
+  'wscons.in',
+  ]
+
+init_data = init_common
+if os == 'Dragonfly'
+  init_data = init_data + init_BSD
+elif os == 'FreeBSD' or os == 'Gnu-kFreeBSD'
+  init_data = init_data + init_BSD + init_FreeBSD
+elif os == 'Linux'
+  init_data = init_data + init_Linux
+elif os == 'NetBSD'
+  init_data = init_data + init_BSD + init_NetBSD
+  endif
+
+foreach init_d_file : init_data
+  configure_file(input : init_d_file,
+    output : '@BASENAME@',
+    configuration : init_d_conf_data,
+    install_dir: init_d_dir,
+    install_mode: 'rwxr-xr-x')
+endforeach
--- a/init.d/mixer.in
+++ b/init.d/mixer.in
@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # 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
+# https://github.com/OpenRC/openrc/blob/HEAD/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
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.

--- a/init.d/modules.in
+++ b/init.d/modules.in
@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # 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
+# https://github.com/OpenRC/openrc/blob/HEAD/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
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.

@@ -41,18 +41,18 @@ find_modfiles()

 load_modules()
 {
-	local file m modules rc x
+	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"
+			*) _modules="$_modules $m"
 			;;
 		esac
 	done < $file
-	for x in $modules; do
+	for x in $_modules; do
 		ebegin "Loading module $x"
 		case "$RC_UNAME" in
 			FreeBSD) kldload "$x"; rc=$? ;;
--- a/init.d/mount-ro.in
+++ b/init.d/mount-ro.in
@@ -1,15 +1,15 @@
 #!@SBINDIR@/openrc-run
 # 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
+# https://github.com/OpenRC/openrc/blob/HEAD/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
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.

-description="Re-mount filesytems read-only for a clean reboot."
+description="Re-mount filesystems read-only for a clean reboot."

 depend()
 {
--- a/init.d/moused.in
+++ b/init.d/moused.in
@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # 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
+# https://github.com/OpenRC/openrc/blob/HEAD/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
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.

--- a/init.d/mtab.in
+++ b/init.d/mtab.in
@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # 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
+# https://github.com/OpenRC/openrc/blob/HEAD/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
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.

--- a/init.d/net-online.in
+++ b/init.d/net-online.in
@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # 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
+# https://github.com/OpenRC/openrc/blob/HEAD/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
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.

@@ -23,7 +23,7 @@ get_interfaces()
 {
 	local ifname iftype
 	for ifname in /sys/class/net/*; do
-		[ -h "${ifname}" ] && continue
+		[ -h "${ifname}" ] || continue
 		read iftype < ${ifname}/type
 		[ "$iftype" = "1" ] && printf "%s " ${ifname##*/}
 	done
@@ -68,6 +68,7 @@ start ()
 			ping -c 1 $ping_test_host > /dev/null 2>&1
 			rc=$?
 			[ $rc -eq 0 ] && break
+			sleep 1
 			: $((timeout -= 1))
 		done
 	fi
--- a/init.d/netmount.in
+++ b/init.d/netmount.in
@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # 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
+# https://github.com/OpenRC/openrc/blob/HEAD/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
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.

--- a/init.d/network.in
+++ b/init.d/network.in
@@ -1,11 +1,11 @@
 #!@SBINDIR@/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
+# https://github.com/OpenRC/openrc/blob/HEAD/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
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.

--- a/init.d/newsyslog.in
+++ b/init.d/newsyslog.in
@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # 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
+# https://github.com/OpenRC/openrc/blob/HEAD/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
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.

--- a/init.d/nscd.in
+++ b/init.d/nscd.in
@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # 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
+# https://github.com/OpenRC/openrc/blob/HEAD/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
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.

--- a/init.d/numlock.in
+++ b/init.d/numlock.in
@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # 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
+# https://github.com/OpenRC/openrc/blob/HEAD/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
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.

@@ -42,6 +42,8 @@ start()

 stop()
 {
+	yesno $RC_GOINGDOWN && return 0
+
 	ebegin "Disabling numlock on ttys"
 	_setleds -
 	eend $? "Failed to disable numlock"
--- a/init.d/osclock.in
+++ b/init.d/osclock.in
@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # Copyright (c) 2014-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
+# https://github.com/OpenRC/openrc/blob/HEAD/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
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.

@@ -17,3 +17,15 @@ depend()
 {
 	provide clock
 }
+
+start()
+{
+	# This stub function is required to avoid OpenRC warning at boot:
+	#
+	#  * The command variable is undefined.
+	#  * There is nothing for osclock to start.
+	#  * If this is what you intend, please write a start function.
+	#  * This will become a failure in a future release.
+	#
+	return 0
+}
--- a/init.d/pf.in
+++ b/init.d/pf.in
@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # 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
+# https://github.com/OpenRC/openrc/blob/HEAD/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
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.

--- a/init.d/powerd.in
+++ b/init.d/powerd.in
@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # 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
+# https://github.com/OpenRC/openrc/blob/HEAD/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
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.

--- a/init.d/procfs.in
+++ b/init.d/procfs.in
@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # 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
+# https://github.com/OpenRC/openrc/blob/HEAD/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
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.

--- a/init.d/rarpd.in
+++ b/init.d/rarpd.in
@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # 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
+# https://github.com/OpenRC/openrc/blob/HEAD/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
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.

--- a/init.d/rc-enabled.in
+++ b/init.d/rc-enabled.in
@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # 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
+# https://github.com/OpenRC/openrc/blob/HEAD/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
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.

--- a/init.d/root.in
+++ b/init.d/root.in
@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # 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
+# https://github.com/OpenRC/openrc/blob/HEAD/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
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.

--- a/init.d/rpcbind.in
+++ b/init.d/rpcbind.in
@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # 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
+# https://github.com/OpenRC/openrc/blob/HEAD/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
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.

--- a/init.d/runsvdir.in
+++ b/init.d/runsvdir.in
@@ -1,17 +1,17 @@
 #!@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
+# https://github.com/OpenRC/openrc/blob/HEAD/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
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.

+supervisor=supervise-daemon
 command=/usr/bin/runsvdir
-command_background=yes
-pidfile=/var/run/runsvdir.pid
+pidfile="/var/run/${RC_SVCNAME}.pid"
 command_args="-P $RC_SVCDIR/sv 'log: ...........................................................................................................................................................................................................................................................................................................................................................................................................'"

 start_pre()
--- a/init.d/s6-svscan.in
+++ b/init.d/s6-svscan.in
@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # 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
+# https://github.com/OpenRC/openrc/blob/HEAD/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
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.

@@ -21,9 +21,13 @@ depend()

 start_pre()
 {
-	einfo "Creating s6 scan directory"
-	checkpath -d -m 0755 "$RC_SVCDIR"/s6-scan
-	return $?
+	if [ ! -e "$command" ]; then
+		eerror "$command is missing (please install s6)"
+	else
+		einfo "Creating s6 scan directory"
+		checkpath -d -m 0755 "$RC_SVCDIR"/s6-scan
+	fi
+	return
 }

 stop_post()
--- a/init.d/save-keymaps.in
+++ b/init.d/save-keymaps.in
@@ -3,7 +3,7 @@
 #
 # 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
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.

--- a/init.d/save-termencoding.in
+++ b/init.d/save-termencoding.in
@@ -3,7 +3,7 @@
 #
 # 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
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.

--- a/init.d/savecache.in
+++ b/init.d/savecache.in
@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # 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
+# https://github.com/OpenRC/openrc/blob/HEAD/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
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.

--- a/init.d/savecore.in
+++ b/init.d/savecore.in
@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # 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
+# https://github.com/OpenRC/openrc/blob/HEAD/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
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.

--- a/init.d/seedrng.in
+++ b/init.d/seedrng.in
@@ -0,0 +1,44 @@
+#!@SBINDIR@/openrc-run
+# Copyright (c) 2007-2022 The OpenRC Authors.
+# See the Authors file at the top-level directory of this distribution and
+# https://github.com/OpenRC/openrc/blob/HEAD/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/HEAD/LICENSE
+# This file may not be copied, modified, propagated, or distributed
+# except according to the terms contained in the LICENSE file.
+
+description="Initializes the random number generator."
+
+depend()
+{
+	after clock
+	need localmount
+	keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn
+	provide urandom
+}
+
+seedrng_with_options()
+{
+	set --
+	[ -n "${seed_dir}" ] && set -- "$@" --seed-dir "${seed_dir}"
+	yesno "${skip_credit}" && set -- "$@" --skip-credit
+	seedrng "$@"
+}
+
+start()
+{
+	ebegin "Seeding random number generator"
+	seedrng_with_options
+	eend $? "Error seeding random number generator"
+	return 0
+}
+
+stop()
+{
+	ebegin "Saving random number generator seed"
+	seedrng_with_options
+	eend $? "Error saving random number generator seed"
+	return 0
+}
--- a/init.d/staticroute.in
+++ b/init.d/staticroute.in
@@ -1,11 +1,11 @@
 #!@SBINDIR@/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
+# https://github.com/OpenRC/openrc/blob/HEAD/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
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.

--- a/init.d/swap-blk.in
+++ b/init.d/swap-blk.in
@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # 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
+# https://github.com/OpenRC/openrc/blob/HEAD/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
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.

--- a/init.d/swap.in
+++ b/init.d/swap.in
@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # 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
+# https://github.com/OpenRC/openrc/blob/HEAD/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
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.

--- a/init.d/swclock.in
+++ b/init.d/swclock.in
@@ -1,11 +1,11 @@
 #!@SBINDIR@/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
+# https://github.com/OpenRC/openrc/blob/HEAD/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
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.

--- a/init.d/syscons.in
+++ b/init.d/syscons.in
@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # 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
+# https://github.com/OpenRC/openrc/blob/HEAD/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
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.

--- a/init.d/sysctl.in
+++ b/init.d/sysctl.in
@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # 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
+# https://github.com/OpenRC/openrc/blob/HEAD/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
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.

--- a/init.d/sysfs.in
+++ b/init.d/sysfs.in
@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # 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
+# https://github.com/OpenRC/openrc/blob/HEAD/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
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.

--- a/init.d/syslogd.in
+++ b/init.d/syslogd.in
@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # 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
+# https://github.com/OpenRC/openrc/blob/HEAD/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
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.

--- a/init.d/termencoding.in
+++ b/init.d/termencoding.in
@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # Copyright (c) 2008-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
+# https://github.com/OpenRC/openrc/blob/HEAD/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
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.

--- a/init.d/ttys.in
+++ b/init.d/ttys.in
@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # Copyright (c) 2008-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
+# https://github.com/OpenRC/openrc/blob/HEAD/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
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.

--- a/Show More
+++ b/Show More