update changelog

fix selinux build
Add LANG, LC_MESSAGES and TERM to the environment whitelist
2016-01-13 20:21:17 -06:00 · 2016-01-13 20:15:15 -06:00 · 2016-01-13 20:15:14 -06:00 · 2016-01-13 20:15:14 -06:00 · 2016-01-13 19:53:03 -06:00
391 changed files with 7217 additions and 12480 deletions
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -1,15 +0,0 @@
-# Cirrus CI integration
-# https://cirrus-ci.org
-
-test_task:
-  freebsd_instance:
-    matrix:
-      image: freebsd-13-1-release-amd64
-      image: freebsd-12-4-release-amd64
-  env:
-    OS: FreeBSD
-  procfs_script: >
-    [ -f /proc/curproc ] || mount -t procfs proc /proc
-  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
@@ -1,2 +0,0 @@
-CompileFlags:
-  CompilationDatabase: builddir/
--- a/.github/workflows/ci-alpine-linux.yml
+++ b/.github/workflows/ci-alpine-linux.yml
@@ -1,31 +0,0 @@
-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
@@ -1,24 +0,0 @@
-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
@@ -1,25 +0,0 @@
-# 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
@@ -1,4 +1,4 @@
-*.gz
+*.bz2

 *.diff
 *.patch
@@ -9,4 +9,8 @@ core
 .gdb_history
 .gdbinit

-build
+.depend
+*.a
+*.o
+*.So
+lib*.so
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,32 +0,0 @@
-# Travis build integration.
-# https://docs.travis-ci.com/
-
-language: c
-
-os:
-  - linux
-
-compiler:
-  - gcc
-  - clang
-  - musl-gcc
-
-addons:
-  apt:
-    packages:
-    - musl-tools
-
-notifications:
-  irc:
-    channels:
-      - "irc.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/2
+++ b/2
@@ -43,7 +43,6 @@ 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>
@@ -83,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>
--- a/BUSYBOX.md
+++ b/BUSYBOX.md
@@ -1,5 +1,4 @@
-Using Busybox as your Default Shell with OpenRC
-===============================================
+# Using Busybox as your Default Shell with OpenRC

 If you have/bin/sh linked to busybox, you need to be aware of several
 incompatibilities between busybox's applets and the standalone
@@ -23,6 +22,9 @@ or recognize the nofail option in fstab.

 CONFIG_SETFONT -- The setfont applet does not support the -u option from kbd.

+CONFIG_IP -- The ip applet  doesn't support the "scope" modifier for
+"ip route add" and "ip address add".
+
 CONFIG_BB_SYSCTL -- The sysctl applet does not support the --system command
 line switch.

--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -1,142 +0,0 @@
-# OpenRC Code of Conduct
-
-This code of conduct outlines our expectations for participants within the
-community, as well as steps for reporting unacceptable behavior. We are
-committed to providing a welcoming and inspiring community for all and
-expect our code of conduct to be honored. Anyone who violates this code
-of conduct may be banned from the community.
-
-## Our Pledge
-
-We as members, contributors, and leaders pledge to make participation in our
-community a harassment-free experience for everyone, regardless of age, body
-size, visible or invisible disability, ethnicity, sex characteristics, gender
-identity and expression, level of experience, education, socio-economic status,
-nationality, personal appearance, race, caste, color, religion, or sexual
-identity and orientation.
-
-We pledge to act and interact in ways that contribute to an open, welcoming,
-diverse, inclusive, and healthy community.
-
-## Our Standards
-
-Examples of behavior that contributes to a positive environment for our
-community include:
-
-* Demonstrating empathy and kindness toward other people
-* Being respectful of differing opinions, viewpoints, and experiences
-* Giving and gracefully accepting constructive feedback
-* Accepting responsibility and apologizing to those affected by our mistakes,
-  and learning from the experience
-* Focusing on what is best not just for us as individuals, but for the overall
-  community
-
-Examples of unacceptable behavior include:
-
-* The use of sexualized language or imagery, and sexual attention or advances of
-  any kind
-* Trolling, insulting or derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or email address,
-  without their explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Enforcement Responsibilities
-
-Community leaders are responsible for clarifying and enforcing our standards of
-acceptable behavior and will take appropriate and fair corrective action in
-response to any behavior that they deem inappropriate, threatening, offensive,
-or harmful.
-
-Community leaders have the right and responsibility to remove, edit, or reject
-comments, commits, code, wiki edits, issues, and other contributions that are
-not aligned to this Code of Conduct, and will communicate reasons for moderation
-decisions when appropriate.
-
-## Scope
-
-This Code of Conduct applies within all community spaces, and also applies when
-an individual is officially representing the community in public spaces.
-Examples of representing our community include using an official e-mail address,
-posting via an official social media account, or acting as an appointed
-representative at an online or offline event.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported to the community leaders responsible for enforcement via integrated
-"Report Content" functionality.
-See the GitHub documentation for more details:
-https://docs.github.com/en/communities/maintaining-your-safety-on-github/reporting-abuse-or-spam
-
-All complaints will be reviewed and investigated promptly and fairly.
-
-All community leaders are obligated to respect the privacy and security of the
-reporter of any incident.
-
-## Enforcement Guidelines
-
-Community leaders will follow these Community Impact Guidelines in determining
-the consequences for any action they deem in violation of this Code of Conduct:
-
-### 1. Correction
-
-**Community Impact**: Use of inappropriate language or other behavior deemed
-unprofessional or unwelcome in the community.
-
-**Consequence**: A private, written warning from community leaders, providing
-clarity around the nature of the violation and an explanation of why the
-behavior was inappropriate. A public apology may be requested.
-
-### 2. Warning
-
-**Community Impact**: A violation through a single incident or series of
-actions.
-
-**Consequence**: A warning with consequences for continued behavior. No
-interaction with the people involved, including unsolicited interaction with
-those enforcing the Code of Conduct, for a specified period of time. This
-includes avoiding interactions in community spaces as well as external channels
-like social media. Violating these terms may lead to a temporary or permanent
-ban.
-
-### 3. Temporary Ban
-
-**Community Impact**: A serious violation of community standards, including
-sustained inappropriate behavior.
-
-**Consequence**: A temporary ban from any sort of interaction or public
-communication with the community for a specified period of time. No public or
-private interaction with the people involved, including unsolicited interaction
-with those enforcing the Code of Conduct, is allowed during this period.
-Violating these terms may lead to a permanent ban.
-
-### 4. Permanent Ban
-
-**Community Impact**: Demonstrating a pattern of violation of community
-standards, including sustained inappropriate behavior, harassment of an
-individual, or aggression toward or disparagement of classes of individuals.
-
-**Consequence**: A permanent ban from any sort of public interaction within the
-community.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage],
-version 2.1, available at
-[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
-
-Community Impact Guidelines were inspired by
-[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
-
-For answers to common questions about this code of conduct, see the FAQ at
-[https://www.contributor-covenant.org/faq][FAQ]. Translations are available at
-[https://www.contributor-covenant.org/translations][translations].
-
-[homepage]: https://www.contributor-covenant.org
-[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
-[Mozilla CoC]: https://github.com/mozilla/diversity
-[FAQ]: https://www.contributor-covenant.org/faq
-[translations]: https://www.contributor-covenant.org/translations
-
--- a/1361
+++ b/1361
--- a/FEATURE-REMOVAL-SCHEDULE.md
+++ b/FEATURE-REMOVAL-SCHEDULE.md
@@ -1,12 +1,11 @@
-Features Scheduled for Removal
-==============================
+# Features Scheduled for Removal

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

-# Service pause action
+## Service pause action

 When: 1.0

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

 Who:

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

 When: 1.0

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

 Who:

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

 When: 1.0

@@ -35,24 +34,24 @@ 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

-Why: Deprecated in favor of extra_commands, extra_started_commands
+Why: Depprecated in favor of extra_commands, extra_started_commands
 	 and extra_stopped_commands.

 Who:

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

 When: 1.0

-Why: Deprecated in favor of executable scripts in @SYSCONFDIR@/local.d
+Why: Depprecated 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

@@ -77,3 +76,13 @@ Why: The getline() function was standardized in POSIX.1-2008, so it

 Who:

+### rc_sys()
+
+When: 1.0
+
+Why: The OpenRC code now uses two internal functions, detect_container()
+	 and detect_vm() to handle this. rc_sys() is broken because it
+	 doesn't differentiate between containers and vm's.
+
+Who:
+
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,4 @@
-OpenRC History
-==============
+# OpenRC History

 This history of OpenRC was written by Daniel Robbins, Roy Marples, William
 Hubbs and others.
--- a/2
+++ b/2
@@ -1,5 +1,5 @@
 Copyright (c) 2007-2008, Roy Marples <roy@marples.name>
-Copyright (c) 2007-2023, the OpenRC authors
+Copyright (c) 2007-2015, the OpenRC authors
 All rights reserved.

 Redistribution and use in source and binary forms, with or without
--- a/42
+++ b/42
@@ -0,0 +1,42 @@
+# 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 sysctl.d
+
+# Build pkgconfig or not
+MKPKGCONFIG?=	yes
+ifeq (${MKPKGCONFIG},yes)
+SUBDIR+=	pkgconfig
+endif
+
+# We need to ensure that runlevels is done last
+SUBDIR+=	runlevels
+
+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
@@ -0,0 +1,3 @@
+NAME=		openrc
+VERSION=	0.20.1
+PKG=		${NAME}-${VERSION}
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,321 +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.48
-
-This release is a maintenance release; it has no user-facing changes.
-
-## OpenRC 0.47
-
-This release is primarily an internal cleanup release.
-The only user-visible difference is that unicode is now on by default.
-
-## OpenRC 0.46
-
-The path for the reference file for the swclock service is now
-configurable in conf.d/swclock.
-
-In the past, if supervise_daemon_args was not set *or empty*, it defaulted to
-`start_stop_daemon_args`. This was bad because supervise-daemon doesn't
-accept the same options as `start-stop-daemon`. So if we set e.g.
-`start_stop_daemon_args="--wait 50"`, but not `supervise_daemon_args`,
-and the user adds `supervisor=supervise-daemon` to the corresponding
-conf.d/<service> file, the service will fail to start due to
-unrecognized option "wait".
-It would be best to remove this fallback, but that might break some
-existing scripts that depend on it. So we are changing it to
-use `start_stop_daemon_args` as the default for `supervise_daemon_args`
-only if `supervise_daemon_args` is not set at all, but not if it's
-empty.
-
-This fallback will be dropped in a future release.
-
-
-## 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.
-
-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 separating / 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
-Linux which can be used in place of sysvinit or any other init process.
-For information on its usage, see the man pages for openrc-init (8) and
-openrc-shutdown (8).
-
-## OpenRC-0.24.1
-
-This version starts cleaning up the dependencies so that rc_parallel
-will work correctly.
-
-The first step in this process is to remove the 'before *' from the
-depend functions in the clock services. This means some  services not
-controlled by OpenRC may now start before instead of after the clock
-service. If it is important for these services to start after the clock
-service, they need to have 'after clock' added to their depend
-functions.
-
-## OpenRC-0.24
-
-Since the deptree2dot tool and the perl requirement are completely
-optional, the deptree2dot tool has been moved to the support directory.
-As a result, the MKTOOLS=yes/no switch has been removed from the makefiles.
-
-This version adds the agetty service which can be used to spawn
-agetty on a specific terminal. This is currently documented in the
-agetty-guide.md file at the top level of this distribution.
-
-## OpenRC-0.23
-
-The tmpfiles.d processing code, which was part of previous versions of
-OpenRC, has been separated into its own package [1]. If you need to
-process systemd style tmpfiles.d files, please install this package.
-
-[1] https://github.com/openrc/opentmpfiles
-
-## OpenRC-0.22
-
-In previous versions of OpenRC, configuration information was processed
-so that service-specific configuration stored in /etc/conf.d/* was
-overridden by global configuration stored in /etc/rc.conf. This release
-reverses that. Global configuration is now overridden by
-service-specific configuration.
-
-The swapfiles service, which was basically a copy of the swap service,
-has been removed. If you are only using swap partitions, this change
-will not affect you. If you are using swap files, please adjust the
-dependencies of the swap service as shown in /etc/conf.d/swap.
-
-## OpenRC-0.21
-
-This version adds a daemon supervisor which can start daemons and
-restart them if they crash. See supervise-daemon-guide.md in the
-distribution for details on its use.
-
-It is now possible to mark certain mount points as critical. If these
-mount points are unable to be mounted, localmount or netmount will fail.
-This is handled in /etc/conf.d/localmount and /etc/conf.d/netmount. See
-these files for the setup.
-
-The deprecation messages in 0.13.x for runscript and rc are now
-made visible in preparation for the removal of these binaries in 1.0.
-
-The steps you should take to get rid of these warnings is to run openrc
-in initialization steps instead of rc and change the shebang lines in
-service scripts to refer to "openrc-run" instead of "runscript".
-
-In 0.21.4, a modules-load service was added. This works like the
-equivalent service in systemd. It looks for files named *.conf first in
-/usr/lib/modules-load.d, then /run/modules-load.d, then
-/etc/modules-load.d. These files contain a list of modules, one per
-line, which should be loaded into the kernel. If a file name appears in
-/run/modules-load.d, it overrides a file of the same name in
-/usr/lib/modules-load.d. A file appearing in /etc/modules-load.d
-overrides a file of the same name in both previous directories.
-
 ## OpenRC-0.19

 This version adds a net-online service. By default, this
--- a/README.md
+++ b/README.md
@@ -1,24 +1,68 @@
-OpenRC README
-=============
+# OpenRC README

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

-## building and installing
+## Installation

-OpenRC uses the  [meson](http://mesonbuild.com) build system, so use the
-usual methods for this build system to build and install.
+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
+MKNET=no
+MKPAM=pam
+MKPREFIX=yes
+MKPKGCONFIG=no
+MKSELINUX=yes
+MKSTATICLIBS=no
+MKTERMCAP=ncurses
+MKTERMCAP=termcap
+MKTOOLS=yes
+PKG_PREFIX=/usr/pkg
+LOCAL_PREFIX=/usr/local
+PREFIX=/usr/local
+BRANDING=\"Gentoo/$(uname -s)\"
+```

 ## 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 debug memory under valgrind, add `-DDEBUG_MEMORY`
+to your `CPPFLAGS` so that all malloc memory should be freed at exit.
+
+If you are building OpenRC for a Gentoo Prefix installation, add `MKPREFIX=yes`.
+
 `PKG_PREFIX` should be set to where packages install to by default.

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

-`ROOTPREFIX` should be set when the root path is different from '/'.
+`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/*
+```

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

@@ -32,21 +76,24 @@ 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.
+`init.d.misc` is not installed by default as the scripts will need
+tweaking on a per distro basis. They are also non essential to the
+operation of the system.

 ## Reporting Bugs

-Please report bugs on our [bug tracker](http://github.com/OpenRC/openrc/issues).
+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].

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

 ## IRC Channel

-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.
+We have an official irc channel, #openrc on freenode, feel free to join
+us there.

+[1]	https://bugs.gentoo.org/
+[2]	https://github.com/openrc/openrc/issues
+[3]	https://github.com/openrc/openrc/pulls
--- 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/STYLE-GUIDE.md
+++ b/STYLE-GUIDE.md
@@ -1,5 +1,4 @@
-OpenRC Coding Style Guide
-=========================
+# OpenRC Style Guide

 This is the openrc style manual.  It governs the coding style of all code
 in this repository.  Follow it.  Contact openrc@gentoo.org for any questions
--- a/agetty-guide.md
+++ b/agetty-guide.md
@@ -1,19 +0,0 @@
-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
-spawning a getty manager for this port some other way (such as through
-sysvinit/inittab), then run the following commands as root.
-
-Note that [port] refers to the port you are spawning the getty on, for
-example, tty1 or ttyS0. The full path to it, for example, /dev/tty1
-should not be used.
-
-```
-# cd /etc/init.d
-# ln -s agetty agetty.[port]
-# cd /etc/conf.d
-# cp agetty agetty.[port]
-#rc-update add agetty.[port] [runlevel]
-```
--- a/bash-completion/meson.build
+++ b/bash-completion/meson.build
@@ -1,12 +0,0 @@
-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,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/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.
-
-#
-# openrc completion command
-#
-_openrc()
-{
-	local cur
-	COMPREPLY=()
-	cur="${COMP_WORDS[COMP_CWORD]}"
-	if [[ ${#COMP_WORDS[*]} -le 2 ]]; then
-		COMPREPLY=($(compgen -W "$(rc-status --list)" -- $cur))
-	fi
-	return 0
-} &&
-complete -F _openrc openrc
--- a/bash-completion/openrc-service-script
+++ b/bash-completion/openrc-service-script
@@ -1,29 +0,0 @@
-# Copyright (c) 2017 The OpenRC Authors.
-# See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/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.
-
-_openrc_service_script()
-{
-	local script="${COMP_WORDS[0]}"
-	local cur="${COMP_WORDS[$COMP_CWORD]}"
-
-	if [[ ( -f "${script}" || -h "${script}" ) && -r "${script}" ]] \
-	&& [[ "$(head -n 1 "${script}")" =~ \#\!.*/openrc-run ]]
-	then
-		[[ $COMP_CWORD -gt 1 ]] && return 1
-		COMPREPLY=($(opts="start stop status restart pause zap ineed needsme iuse usesme broken"; \
-			eval "$(grep '^opts=' "${script}")"; echo "${opts}"))
-		[[ -n "$COMPREPLY" ]] || COMPREPLY=(start stop restart zap)
-		COMPREPLY=($(compgen -W "${COMPREPLY[*]}" -- "${cur}"))
-	else
-		COMPREPLY=($(compgen -o default -- "${cur}"))
-	fi
-	return 0
-}
-complete -F _openrc_service_script */etc/init.d/*
--- a/bash-completion/rc-service
+++ b/bash-completion/rc-service
@@ -1,115 +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/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.
-
-#
-# 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
-			# complete for init scripts
-			COMPREPLY=($(for i in $(rc-service --list) ; 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
-		COMPREPLY=($(for i in $(rc-service --list) ; do \
-			[[ ${i} == "${cur}"* ]] && echo ${i} ; \
-		done))
-		return 0
-	fi
-	return 0
-} &&
-complete -F _rc_service rc-service
--- a/bash-completion/rc-status
+++ b/bash-completion/rc-status
@@ -1,31 +0,0 @@
-# Copyright (c) 2017 The OpenRC Authors.
-# See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/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.
-
-#
-# rc-status completion command
-#
-_rcstatus()
-{
-	local cur
-	cur="${COMP_WORDS[COMP_CWORD]}"
-	if [[ $COMP_CWORD -eq 1 ]]; then
-		if [[ "${cur}" == --* ]]; then
-			COMPREPLY=($(compgen -W '--all --list --unused' -- ${cur}))
-		elif [[ "${cur}" == -* ]]; then
-			COMPREPLY=($(compgen -W '-a -l -u' -- ${cur}))
-		else
-			COMPREPLY=($(compgen -W "$(rc-status --list)" -- ${cur}))
-		fi
-	else
-		unset COMPREPLY
-	fi
-	return 0
-} &&
-complete -F _rcstatus rc-status
--- a/bash-completion/rc-update
+++ b/bash-completion/rc-update
@@ -1,42 +0,0 @@
-# Copyright (c) 2017 The OpenRC Authors.
-# See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/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.
-
-#
-# rc-update completion command
-#
-_rc_update()
-{
-	local cur show
-	COMPREPLY=()
-	cur="${COMP_WORDS[COMP_CWORD]}"
-	if [[ $COMP_CWORD -eq 1 ]]; then
-		if [[ "${cur}" == -* ]]; then
-			COMPREPLY=($(compgen -W '-a -d -s' -- ${cur}))
-		else
-			COMPREPLY=($(compgen -W 'add del show' ${cur}))
-		fi
-	else
-		if [[ "${COMP_WORDS[1]}" == "show" ]] || [[ "${COMP_WORDS[1]}" == "-s" ]]; then
-			show="TRUE"
-		fi
-		if ([[ $COMP_CWORD -eq 3 ]] && [[ -z "$show" ]]) || \
-			([[ $COMP_CWORD -eq 2 ]] && [[ -n "$show" ]]); then
-		COMPREPLY=($(compgen -W "$(rc-status --list)" -- $cur))
-		elif [[ $COMP_CWORD -eq 2 ]]; then
-			COMPREPLY=($(compgen -W "$(rc-service --list)" $cur))
-		elif [[ ${#COMP_WORDS[*]} -gt 2 ]] ; then
-			COMPREPLY=($(compgen -W "$(rc-status --list)" -- $cur))
-		else
-			unset COMPREPLY
-		fi
-	fi
-	return 0
-} &&
-complete -F _rc_update rc-update
--- a/ci/cirrus.sh
+++ b/ci/cirrus.sh
@@ -1,21 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2007-2018 The OpenRC Authors.
-# See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/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.
-
-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.
-
-meson build
-meson compile -C build
-meson test --verbose -C build
--- a/ci/travis.sh
+++ b/ci/travis.sh
@@ -1,40 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2007-2018 The OpenRC Authors.
-# See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/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.
-
-set -e
-set -u
-set -x
-
-# These are steps to run on TravisCI under a containerized Ubuntu system.
-# See $TOP/.travis.yml for more info about the TravisCI setup.
-
-# Run shellcheck, but don't fail (yet):
-shellcheck --version
-for shellscript in $(git ls-files); do
-	case $shellscript in
-		init.d/*.in) ;;
-		sh/*.in) ;;
-		sh/*.sh) ;;
-		support/init.d.examples/*.in) ;;
-		support/openvpn/*.sh) ;;
-		support/sysvinit/halt.sh) ;;
-		test/*.sh) ;;
-		*) continue ;;
-	esac
-	echo "Checking ${shellscript} with shellcheck:"
-	shellcheck -s sh "${shellscript}" || true
-done
-
-cpus=$(getconf _NPROCESSORS_CONF || echo 1)
-# make on TravisCI doesn't support -O yet
-make -j"${cpus}"
-
-make test
--- a/conf.d/.gitignore
+++ b/conf.d/.gitignore
@@ -0,0 +1,2 @@
+network
+staticroute
--- a/conf.d/Makefile
+++ b/conf.d/Makefile
@@ -0,0 +1,29 @@
+include ../mk/net.mk
+
+DIR=	${CONFDIR}
+CONF=	bootmisc fsck hostname localmount netmount urandom tmpfiles \
+		${CONF-${OS}}
+
+ifeq (${MKNET},yes)
+CONF+= network staticroute
+TARGETS+=	network staticroute
+CLEANFILES+=	network staticroute
+endif
+
+MK=	../mk
+include ${MK}/os.mk
+
+CONF-FreeBSD=	ipfw moused powerd rarpd savecore syscons
+
+CONF-Linux=	consolefont devfs dmesg hwclock keymaps killprocs modules mtab \
+	net-online
+
+CONF-NetBSD=	moused rarpd savecore
+
+include ${MK}/scripts.mk
+
+network: network.in network${SFX}
+	cat $^ > $@
+
+staticroute: staticroute${SFX}
+	cp $@${SFX} $@
--- a/conf.d/agetty
+++ b/conf.d/agetty
@@ -1,11 +0,0 @@
-# make agetty quiet
-#quiet="yes"
-
-# Set the baud rate of the terminal line
-#baud=""
-
-# set the terminal type
-#term_type="linux"
-
-# extra options to pass to agetty for this port
-#agetty_options=""
--- a/conf.d/bootmisc
+++ b/conf.d/bootmisc
@@ -9,7 +9,7 @@ wipe_tmp="YES"
 # This may be useful if you need the kernel boot log afterwards
 log_dmesg="YES"

-# Save the previous dmesg log to dmesg.old
+# Save the previous dmesg log to dmesc.old
 # This may be useful if you need to compare the current boot to the
 # previous one.
 #previous_dmesg=no
--- 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 examples:-
+# Here are some exampes:-
 #fsck_passno="=1 =2"
 #fsck_passno=">1"
 #fsck_passno="<2"
--- a/conf.d/hostname
+++ b/conf.d/hostname
@@ -1,2 +1,2 @@
-# Hostname fallback if /etc/hostname does not exist
+# Set to the hostname of this machine
 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 flexible and quite secure.
+# back in. This is very flexable 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
@@ -1,11 +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=""
-
-# 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/localmount
+++ b/conf.d/localmount
@@ -1,10 +1,3 @@
 # Stop the unmounting of certain points.
 # This could be useful for some NFS related work.
 #no_umounts="/dir1:/var/dir2"
-#
-# Mark certain mount points as critical.
-# This contains a space 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.
-#critical_mounts="/home /var"
--- a/conf.d/meson.build
+++ b/conf.d/meson.build
@@ -1,62 +0,0 @@
-conf_d_dir = get_option('sysconfdir') / 'conf.d'
-
-conf_common = [
-  'bootmisc',
-  'fsck',
-  'hostname',
-  'localmount',
-  'netmount',
-  'swap',
-  'swclock',
-  ]
-
-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/modules
+++ b/conf.d/modules
@@ -1,17 +1,18 @@
-# Linux users can define a list of modules for a specific kernel version,
-# a released kernel version, a main kernel version or all kernel versions.
+# You can define a list modules for a specific kernel version,
+# a released kernel version, a main kernel version or just a list.
 # The most specific versioned variable will take precedence.
-# FreeBSD users can only use the modules="foo bar" setting.
 #modules_2_6_23_gentoo_r5="ieee1394 ohci1394"
 #modules_2_6_23="tun ieee1394"
 #modules_2_6="tun"
 #modules_2="ipv6"
 #modules="ohci1394"

-# Linux users can give the modules some arguments if needed, per version
-# if necessary.
+# You can give modules a different name when they load - the new name
+# will also be used to pick arguments below.
+#modules="dummy:dummy1"
+
+# Give the modules some arguments if needed, per version if necessary.
 # Again, the most specific versioned variable will take precedence.
-# This is not supported on FreeBSD.
 #module_ieee1394_args="debug"
 #module_ieee1394_args_2_6_23_gentoo_r5="debug2"
 #module_ieee1394_args_2_6_23="debug3"
--- a/conf.d/mtab
+++ b/conf.d/mtab
@@ -1,13 +1,5 @@
-# As far as we are aware, there are no modern linux tools or use cases
-# which require /etc/mtab to be a separate file from /proc/self/mounts,
-# so this setting should be commented out.
-# If it is set to yes, please comment it out and run this command:
-# # rc-service mtab restart
-# In the future, the mtab service will be removed since we are not aware
-# of any need to manipulate /etc/mtab as a separate file from
-# /proc/self/mounts.
-# If you have a technical reason we should keep this support, please
-# open an issue at https://github.com/openrc/openrc/issues and let us
-# know about your situation.
 # This setting controls whether /etc/mtab is a file or symbolic link.
+# Most of the time, you shouldn't touch this. However, if the default
+# breaks your system in some way, please see the NEWS.md file that comes
+# with OpenRC for the actions to take.
 # mtab_is_file=no
--- a/conf.d/net-online
+++ b/conf.d/net-online
@@ -1,15 +1,12 @@
 # The interfaces setting controls which interfaces the net-online
-# service considers in deciding whether the network is active. The
-# default is all interfaces that support ethernet.
+# service considers in deciding whether the network is active. By
+# default, it is all ethernet or wireless LAN interfaces.
 #interfaces=""

-# This setting controls whether a ping test is included in the test for
-# network connectivity after all interfaces are active.
-#include_ping_test=no
-
-# This setting is the host to attempt to ping if the above is yes.
-# The default is google.com.
-#ping_test_host=some.host.name
+# This setting controls whether a ping to the default gateway is
+# included in the test for network connectivity after all interfaces
+# are active.
+#ping_default_gateway=no

 # The timeout setting controls how long the net-online service waits
 # for the network to be configured.
--- a/conf.d/netmount
+++ b/conf.d/netmount
@@ -38,10 +38,3 @@
 # other words, please change it to be more suited to your system.
 #
 rc_need="net"
-#
-# Mark certain mount points as critical.
-# This contains aspace separated list of mount points which should be
-# considered critical. If one of these mount points cannot be mounted,
-# netmount will fail.
-# By default, this is empty.
-#critical_mounts="/home /var"
--- a/conf.d/network
+++ b/conf.d/network
@@ -1,80 +0,0 @@
-# Assign static IP addresses and run custom scripts per interface.
-# 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"
-
-# You also have ifup_eth0 and ifdown_eth0 to run other commands when
-# eth0 is started and stopped.
-# You should note that we don't stop the network at system shutdown by default.
-# If you really need this, then set keep_network=NO
-
-# Lastly, the interfaces variable pulls in virtual interfaces that cannot
-# be automatically detected.
-#interfaces="br0 bond0 vlan0"
-
-# You can also use files instead of variables here if you like:
-# /etc/ifconfig.eth0 is equivalent to ifconfig_eth0
-# /etc/ip.eth0 is equivalent to ifconfig_eth0
-# /etc/ifup.eth0 is equivalent to ifup_eth0
-# /etc/ifdown.eth0 is equivalent to ifdown_eth0
-# Any files found will automatically be put into the interfaces variable.
-# You don't need to escape variables in files, so use $int instead of \$int.
-
-# If you require DHCP, you should install dhcpcd and add it to the boot or
-# default runlevel.
-
-# NIS users can set the domain name here
-#domainname="foobar"
-
-# You can add a default route.
-# The way this is done is slightly different depending on the operating system.
-#
-# *BSD:
-#defaultroute="192.168.0.1"
-#defaultroute6="2001:a:b:c"
-#Hurd/Linux (ifconfig):
-#defaultroute="gw 192.168.0.1"
-#defaultroute6="gw 2001:a:b:c"
-
-# The remainder of this file applies to Linux only and shows how
-# iproute2 is supported along with other examples.
-
-# ifconfig under Linux is not that powerful and doesn't easily handle
-# multiple addresses
-# On the other hand, iproute2 is quite powerful and is also supported
-#ip_eth0="192.168.0.10/24; 192.168.10.10/24"
-
-# You can also use iproute2 to add the default route.
-#defaultiproute="via 192.168.0.1"
-#defaultiproute6="via 2001:a:b:c"
-
-# ip doesn't handle MTU like ifconfig, but we can do it like so
-#ifup_eth0="ip link set \$int mtu 1500"
-
-# Create a bonded interface
-#interfaces="bond0"
-#ifup_bond0="modprobe bonding; ifconfig \$int up; ifenslave \$int bge0"
-#ifconfig_bond0="192.168.0.10 netmask 255.255.255.0"
-#ifdown_bond0="rmmod bonding"
-
-# Create tap interface and a bridge interface.
-# We add the tap to the bridge.
-# An external program, like dhcpcd, will configure the IP on the bridge
-#interfaces="tun0 br0"
-#ifup_tun0="tunctl -t \$int"
-#ifdown_tun0="tunctl -d \$int"
-#ifup_br0="brctl addbr \$int; brctl add \$int eth1; brtctl add \$int eth2"
-#ifdown_br0="ifconfig \$int down; btctl delbr \$int"
-
-# Create VLAN
-#interfaces="eth0_2 eth0_3 eth0_4"
-#ifup_eth0="vconfig add \$int 2; vconfig add \$int 3; vconfig add \$int 4"
-#ifconfig_eth0_2="192.168.2.10 netmask 255.255.255.0"
-#ifconfig_eth0_3="192.168.3.10 netmask 255.255.255.0"
-#ifconfig_eth0_4="192.168.4.10 netmask 255.255.255.0"
-#ifdown_eth0="vconfig rem \$int.2; vconfig rem \$int.3; vconfig rem \$int.4"
-
-# Normally you would use wpa_supplicant to configure wireless, but you can
-# use iwconfig also
-#ifup_wlan0="iwconfig \$int key s:secretkey enc open essid foobar"
--- a/conf.d/network.BSD.in
+++ b/conf.d/network.BSD.in
@@ -0,0 +1,4 @@
+
+# You can assign a default route
+#defaultroute="192.168.0.1"
+#defaultroute6="2001:a:b:c"
--- a/conf.d/network.GNU-kFreeBSD.in
+++ b/conf.d/network.GNU-kFreeBSD.in
@@ -0,0 +1,4 @@
+
+# You can assign a default route
+#defaultroute="192.168.0.1"
+#defaultroute6="2001:a:b:c"
--- a/conf.d/network.GNU.in
+++ b/conf.d/network.GNU.in
@@ -0,0 +1,4 @@
+
+# You can assign a default route
+#defaultroute="gw 192.168.0.1"
+#defaultroute6="gw 2001:a:b:c"
--- a/conf.d/network.Linux.in
+++ b/conf.d/network.Linux.in
@@ -0,0 +1,43 @@
+
+# You can assign a default route
+#defaultroute="gw 192.168.0.1"
+#defaultroute6="gw 2001:a:b:c"
+
+# ifconfig under Linux is not that powerful and doesn't easily handle
+# multiple addresses
+# On the other hand, ip (iproute2) is quite powerful and is also supported
+#ip_eth0="192.168.0.10/24; 192.168.10.10/24"
+
+# You can also use ip to add the default route.
+#defaultiproute="via 192.168.0.1"
+#defaultiproute6="via 2001:a:b:c"
+
+# ip doesn't handle MTU like ifconfig, but we can do it like so
+#ifup_eth0="ip link set \$int mtu 1500"
+
+# Create a bonded interface
+#interfaces="bond0"
+#ifup_bond0="modprobe bonding; ifconfig \$int up; ifenslave \$int bge0"
+#ifconfig_bond0="192.168.0.10 netmask 255.255.255.0"
+#ifdown_bond0="rmmod bonding"
+
+# Create tap interface and a bridge interface.
+# We add the tap to the bridge.
+# An external program, like dhcpcd, will configure the IP on the bridge
+#interfaces="tun0 br0"
+#ifup_tun0="tunctl -t \$int"
+#ifdown_tun0="tunctl -d \$int"
+#ifup_br0="brctl addbr \$int; brctl add \$int eth1; brtctl add \$int eth2"
+#ifdown_br0="ifconfig \$int down; btctl delbr \$int"
+
+# Create VLAN
+#interfaces="eth0_2 eth0_3 eth0_4"
+#ifup_eth0="vconfig add \$int 2; vconfig add \$int 3; vconfig add \$int 4"
+#ifconfig_eth0_2="192.168.2.10 netmask 255.255.255.0"
+#ifconfig_eth0_3="192.168.3.10 netmask 255.255.255.0"
+#ifconfig_eth0_4="192.168.4.10 netmask 255.255.255.0"
+#ifdown_eth0="vconfig rem \$int.2; vconfig rem \$int.3; vconfig rem \$int.4"
+
+# Normally you would use wpa_supplicant to configure wireless, but you can
+# use iwconfig also
+#ifup_wlan0="iwconfig \$int key s:secretkey enc open essid foobar"
--- a/conf.d/network.in
+++ b/conf.d/network.in
@@ -0,0 +1,28 @@
+# Assign static IP addresses and run custom scripts per interface.
+# Seperate 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"
+
+# You also have ifup_eth0 and ifdown_eth0 to run other commands when
+# eth0 is started and stopped.
+# You should note that we don't stop the network at system shutdown by default.
+# If you really need this, then set keep_network=NO
+
+# Lastly, the interfaces variable pulls in virtual interfaces that cannot
+# be automatically detected.
+#interfaces="br0 bond0 vlan0"
+
+# You can also use files instead of variables here if you like:
+# /etc/ifconfig.eth0 is equivalent to ifconfig_eth0
+# /etc/ip.eth0 is equivalent to ifconfig_eth0
+# /etc/ifup.eth0 is equivalent to ifup_eth0
+# /etc/ifdown.eth0 is equivalent to ifdown_eth0
+# Any files found will automatically be put into the interfaces variable.
+# You don't need to escape variables in files, so use $int instead of \$int.
+
+# If you require DHCP, you should install dhcpcd and it to the boot or
+# default runlevel.
+
+# NIS users can set the domain name here
+#domainname="foobar"
--- a/conf.d/powerd
+++ b/conf.d/powerd
@@ -3,5 +3,5 @@
 powerd_ac_mode="maximum"
 #powerd_battery_mode="minimum"

-# Additional arguments for powerd - see the man page for details
+# Addiditonal arguments for powerd - see the man page for details
 powerd_args=""
--- a/conf.d/seedrng
+++ b/conf.d/seedrng
@@ -1,14 +0,0 @@
-# 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/conf.d/staticroute
+++ b/conf.d/staticroute
@@ -1,26 +0,0 @@
-# Static routes are defined differently depending on your operating
-# system, so please be sure to use the correct syntax.
-# Do not use this file to define the default route.
-# In all settings, multiple routes should be separated using ; or new lines.
-
-# Define static routes on Linux using route. See route(8) for syntax.
-#staticroute="net 192.168.0.0 netmask 255.255.255.0 gw 10.73.1.1
-#net 192.168.1.0 netmask 255.255.255.0 gw 10.73.1.1"
-
-# Define static routes on Linux using iproute2. See ip(8) for syntax.
-#staticiproute="192.168.0.0/24 via 10.73.1.1; 192.168.1.0/24 via 10.73.1.1"
-
-# Define static routes on GNU/Hurd. See route(8) for syntax.
-# /etc/route.conf(5) takes precedence over this configuration.
-# FIXME: "net ..." not supported
-#staticroute="net 192.168.0.0 -netmask 255.255.255.0 --address 10.73.1.1
-#net 192.168.1.0 -netmask 255.255.255.0 --address 10.73.1.1"
-
-# Define static routes on GNU/KFreeBSD. See route(8) for syntax.
-#staticroute="net 192.168.0.0 10.73.1.1 netmask 255.255.255.0
-#net 192.168.1.0 10.73.1.1 netmask 255.255.255.0"
-
-# Define static routes on other BSD systems. See route(8) for syntax.
-# /etc/route.conf(5) takes precedence over this configuration.
-#staticroute="net 192.168.0.0 -netmask 255.255.255.0 10.73.1.1
-#net 192.168.1.0 -netmask 255.255.255.0 10.73.1.1"
--- a/conf.d/staticroute.BSD.in
+++ b/conf.d/staticroute.BSD.in
@@ -0,0 +1,6 @@
+# Separate multiple routes using ; or new lines.
+# /etc/route.conf(5) takes precedence over this configuration.
+
+# Example static routes. See route(8) for syntax.
+#staticroute="net 192.168.0.0 -netmask 255.255.255.0 10.73.1.1
+#net 192.168.1.0 -netmask 255.255.255.0 10.73.1.1"
--- a/conf.d/staticroute.GNU-kFreeBSD.in
+++ b/conf.d/staticroute.GNU-kFreeBSD.in
@@ -0,0 +1,5 @@
+# Separate multiple routes using ; or new lines.
+
+# Example static routes. See route(8) for syntax.
+#staticroute="net 192.168.0.0 10.73.1.1 netmask 255.255.255.0
+#net 192.168.1.0 10.73.1.1 netmask 255.255.255.0"
--- a/conf.d/staticroute.GNU.in
+++ b/conf.d/staticroute.GNU.in
@@ -0,0 +1,7 @@
+# Separate multiple routes using ; or new lines.
+# /etc/route.conf(5) takes precedence over this configuration.
+
+# Example static routes. See route(8) for syntax.
+# FIXME: "net ..." not supported
+#staticroute="net 192.168.0.0 -netmask 255.255.255.0 --address 10.73.1.1
+#net 192.168.1.0 -netmask 255.255.255.0 --address 10.73.1.1"
--- a/conf.d/staticroute.Linux.in
+++ b/conf.d/staticroute.Linux.in
@@ -0,0 +1,8 @@
+# Separate multiple routes using ; or new lines.
+
+# Example static routes. See route(8) for syntax.
+#staticroute="net 192.168.0.0 netmask 255.255.255.0 gw 10.73.1.1
+#net 192.168.1.0 netmask 255.255.255.0 gw 10.73.1.1"
+
+# Example static routes using iproute2. See ip(8) for syntax.
+#staticiproute="192.168.0.0/24 via 10.73.1.1; 192.168.1.0/24 via 10.73.1.1"
--- a/conf.d/swap
+++ b/conf.d/swap
@@ -1,13 +0,0 @@
-# If you are only using local swap partitions, you should not change
-# this file. Otherwise, you need to uncomment the below rc_before line
-# followed by the appropriate rc_need line.
-#rc_before="!localmount"
-#
-# If you are using swap files stored on local file systems, uncomment
-# this line.
-#rc_need="localmount"
-#
-# If you are using swap files stored on network file systems or swap
-# partitions stored on network block devices such as iSCSI, uncomment
-# this line.
-#rc_need="netmount"
--- a/conf.d/swclock
+++ b/conf.d/swclock
@@ -1,6 +0,0 @@
-# This is the location of the reference file swclock uses to set the
-# system date and time.
-# This is the default path. If you are using it, you do not need to
-# uncomment it. If you are using the default and have /var on its own
-# file system, you need to add the appropriate rc_after setting.
-# swclock_file=/var/lib/misc/openrc-shutdowntime
--- a/conf.d/tmpfiles
+++ b/conf.d/tmpfiles
@@ -0,0 +1,3 @@
+# Extra options for tmpfiles.sh
+#tmpfiles_opts="--verbose"
+tmpfiles_opts=""
--- a/etc/.gitignore
+++ b/etc/.gitignore
@@ -0,0 +1,3 @@
+rc.conf
+rc
+rc.shutdown
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -0,0 +1,28 @@
+DIR=	${SYSCONFDIR}
+SRCS=	rc.conf.in rc.in rc.shutdown.in
+BIN=	${BIN-${OS}}
+CONF=	rc.conf ${BIN-${OS}}
+
+CLEANFILES+=	rc.conf
+
+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
+
+rc.conf: rc.conf.in rc.conf.${OS}
+	${SED} ${SED_REPLACE} ${SED_EXTRA} $^ > $@
--- a/etc/meson.build
+++ b/etc/meson.build
@@ -1,44 +0,0 @@
-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
@@ -1,318 +0,0 @@
-# Global OpenRC configuration settings
-
-# Set to "YES" if you want the rc system to try and start services
-# in parallel for a slight speed improvement. When running in parallel we
-# prefix the service output with its name as the output will get
-# jumbled up.
-# WARNING: whilst we have improved parallel, it can still potentially lock
-# the boot process. Don't file bugs about this unless you can supply
-# patches that fix it without breaking other things!
-#rc_parallel="NO"
-
-# Set rc_interactive to "YES" and you'll be able to press the I key during
-# boot so you can choose to start specific services. Set to "NO" to disable
-# this feature. This feature is automatically disabled if rc_parallel is
-# set to YES.
-#rc_interactive="YES"
-
-# If we need to drop to a shell, you can specify it here.
-# If not specified we use $SHELL, otherwise the one specified in /etc/passwd,
-# otherwise /bin/sh
-# Linux users could specify /sbin/sulogin
-#rc_shell=/bin/sh
-
-# Do we allow any started service in the runlevel to satisfy the dependency
-# or do we want all of them regardless of state? For example, if net.eth0
-# and net.eth1 are in the default runlevel then with rc_depend_strict="NO"
-# both will be started, but services that depend on 'net' will work if either
-# one comes up. With rc_depend_strict="YES" we would require them both to
-# come up.
-#rc_depend_strict="YES"
-
-# rc_hotplug controls which services we allow to be hotplugged.
-# A hotplugged service is one started by a dynamic dev manager when a matching
-# hardware device is found.
-# Hotplugged services appear in the "hotplugged" runlevel.
-# If rc_hotplug is set to any value, we compare the name of this service
-# to every pattern in the value, from left to right, and we allow the
-# service to be hotplugged if it matches a pattern, or if it matches no
-# patterns. Patterns can include shell wildcards.
-# To disable services from being hotplugged, prefix patterns with "!".
-#If rc_hotplug is not set or is empty, all hotplugging is disabled.
-# Example - rc_hotplug="net.wlan !net.*"
-# This allows net.wlan and any service not matching net.* to be hotplugged.
-# Example - rc_hotplug="!net.*"
-# This allows services that do not match "net.*" to be hotplugged.
-
-# rc_logger launches a logging daemon to log the entire rc process to
-# /var/log/rc.log
-# NOTE: Linux systems require the devfs service to be started before
-# logging can take place and as such cannot log the sysinit runlevel.
-#rc_logger="NO"
-
-# Through rc_log_path you can specify a custom log file.
-# The default value is: /var/log/rc.log
-#rc_log_path="/var/log/rc.log"
-
-# If you want verbose output for OpenRC, set this to yes. If you want
-# verbose output for service foo only, set it to yes in /etc/conf.d/foo.
-#rc_verbose=no
-
-# By default we filter the environment for our running scripts. To allow other
-# variables through, add them here. Use a * to allow all variables through.
-#rc_env_allow="VAR1 VAR2"
-
-# By default we assume that all daemons will start correctly.
-# However, some do not - a classic example is that they fork and return 0 AND
-# then child barfs on a configuration error. Or the daemon has a bug and the
-# child crashes. You can set the number of milliseconds start-stop-daemon
-# waits to check that the daemon is still running after starting here.
-# The default is 0 - no checking.
-#rc_start_wait=100
-
-# rc_nostop is a list of services which will not stop when changing runlevels.
-# This still allows the service itself to be stopped when called directly.
-#rc_nostop=""
-
-# rc will attempt to start crashed services by default.
-# However, it will not stop them by default as that could bring down other
-# critical services.
-#rc_crashed_stop=NO
-#rc_crashed_start=YES
-
-# Set rc_nocolor to yes if you do not want colors displayed in OpenRC
-# output.
-#rc_nocolor=NO
-
-##############################################################################
-# MISC CONFIGURATION VARIABLES
-# There variables are shared between many init scripts
-
-# Set unicode to NO to turn off unicode support for keyboards and screens.
-#unicode="YES"
-
-# This is how long fuser should wait for a remote server to respond. The
-# default is 60 seconds, but  it can be adjusted here.
-#rc_fuser_timeout=60
-
-# Below is the default list of network fstypes.
-#
-# afs ceph cifs coda davfs fuse fuse.glusterfs fuse.sshfs gfs glusterfs lustre
-# ncpfs nfs nfs4 ocfs2 shfs smbfs
-#
-# If you would like to add to this list, you can do so by adding your
-# own fstypes to the following variable.
-#extra_net_fs_list=""
-
-##############################################################################
-# SERVICE CONFIGURATION VARIABLES
-# These variables are documented here, but should be configured in
-# /etc/conf.d/foo for service foo and NOT enabled here unless you
-# really want them to work on a global basis.
-# If your service has characters in its name which are not legal in
-# shell variable names and you configure the variables for it in this
-# file, those characters should be replaced with underscores in the
-# variable names as shown below.
-
-# Some daemons are started and stopped via start-stop-daemon.
-# We can set some things on a per service basis, like the nicelevel.
-# These need to be exported
-#export SSD_NICELEVEL="0"
-# Or the ionice level. The format is class[:data] , just like the
-# --ionice start-stop-daemon parameter.
-#export SSD_IONICELEVEL="0:0"
-# Or the OOM score adjustment.
-#export SSD_OOM_SCORE_ADJ="0"
-
-# Pass ulimit parameters
-# If you are using bash in POSIX mode for your shell, note that the
-# ulimit command uses a block size of 512 bytes for the -c and -f
-# options
-#rc_ulimit="-u 30"
-
-# It's possible to define extra dependencies for services like so
-#rc_config="/etc/foo"
-#rc_need="openvpn"
-#rc_use="net.eth0"
-#rc_after="clock"
-#rc_before="local"
-#rc_provide="!net"
-
-# You can also enable the above commands here for each service. Below is an
-# example for service foo.
-#rc_foo_config="/etc/foo"
-#rc_foo_need="openvpn"
-#rc_foo_after="clock"
-
-# Below is an example for service foo-bar. Note that the '-' is illegal
-# in a shell variable name, so we convert it to an underscore.
-# example for service foo-bar.
-#rc_foo_bar_config="/etc/foo-bar"
-#rc_foo_bar_need="openvpn"
-#rc_foo_bar_after="clock"
-
-# You can also remove dependencies.
-# This is mainly used for saying which services do NOT provide net.
-#rc_net_tap0_provide="!net"
-
-# This is the subsystem type.
-# It is used to match against keywords set by the keyword call in the
-# depend function of service scripts.
-#
-# It should be set to the value representing the environment this file is
-# PRESENTLY in, not the virtualization the environment is capable of.
-# If it is commented out, automatic detection will be used.
-#
-# The list below shows all possible settings as well as the host
-# operating systems where they can be used and autodetected.
-#
-# ""               - nothing special
-# "docker"         - Docker container manager (Linux)
-# "jail"           - Jail (DragonflyBSD or FreeBSD)
-# "lxc"            - Linux Containers
-# "openvz"         - Linux OpenVZ
-# "prefix"         - Prefix
-# "rkt"            - CoreOS container management system (Linux)
-# "subhurd"        - Hurd subhurds (to be checked)
-# "systemd-nspawn" - Container created by systemd-nspawn (Linux)
-# "uml"            - Usermode Linux
-# "vserver"        - Linux vserver
-# "xen0"           - Xen0 Domain (Linux and NetBSD)
-# "xenU"           - XenU Domain (Linux and NetBSD)
-#rc_sys=""
-
-# if  you use openrc-init, which is currently only available on Linux,
-# this is the default runlevel to activate after "sysinit" and "boot"
-# when booting.
-#rc_default_runlevel="default"
-
-# on Linux and Hurd, this is the number of ttys allocated for logins
-# It is used in the consolefont, keymaps, numlock and termencoding
-# service scripts.
-rc_tty_number=12
-
-##############################################################################
-# LINUX CGROUPS RESOURCE MANAGEMENT
-
-# This sets the mode used to mount cgroups.
-# "hybrid" mounts cgroups version 2 on /sys/fs/cgroup/unified and
-# cgroups version 1 on /sys/fs/cgroup.
-# "legacy" mounts cgroups version 1 on /sys/fs/cgroup
-# "unified" mounts cgroups version 2 on /sys/fs/cgroup
-#rc_cgroup_mode="hybrid"
-
-# This is a list of controllers which should be enabled for cgroups version 2
-# 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.
-# 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
-# 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.
-# 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 names of the settings followed by their
-# values. Each variable can hold multiple settings.
-# For example, you would use this to set the cpu.shares setting in the
-# cpu controller to 512 for your service.
-# rc_cgroup_cpu="
-# cpu.shares 512
-# "
-#
-# For more information about the adjustments that can be made with
-# cgroups version 1, see Documentation/cgroups-v1/* in the linux kernel
-# source tree.
-
-# Set the blkio controller settings for this service.
-#rc_cgroup_blkio=""
-
-# Set the cpu controller settings for this service.
-#rc_cgroup_cpu=""
-
-# Add this service to the cpuacct controller (any value means yes).
-#rc_cgroup_cpuacct=""
-
-# Set the cpuset controller settings for this service.
-#rc_cgroup_cpuset=""
-
-# Set the devices controller settings for this service.
-#rc_cgroup_devices=""
-
-# Set the hugetlb controller settings for this service.
-#rc_cgroup_hugetlb=""
-
-# Set the memory controller settings for this service.
-#rc_cgroup_memory=""
-
-# Set the net_cls controller settings for this service.
-#rc_cgroup_net_cls=""
-
-# Set the net_prio controller settings for this service.
-#rc_cgroup_net_prio=""
-
-# Set the pids controller settings for this service.
-#rc_cgroup_pids=""
-
-# Set this to YES if you want all of the processes in a service's cgroup
-# killed when the service is stopped or restarted.
-# Be aware that setting this to yes means all of a service's
-# child processes will be killed. Keep this in mind if you set this to
-# yes here instead of for the individual services in
-# /etc/conf.d/<service>.
-# 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.
-# 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
-# yes.
-# 3. delay for rc_timeout_stopsec seconds.
-# 4. send sigkill to all processes in the cgroup unless disabled by
-# setting rc_send_sigkill to no.
-# rc_cgroup_cleanup="NO"
-
-# If this is yes, we will send sighup to the processes in the cgroup
-# immediately after stopsig and sigcont.
-#rc_send_sighup="NO"
-
-# This is the amount of time in seconds that we delay after sending sigcont
-# and optionally sighup, before we optionally send sigkill to all
-# processes in the # cgroup.
-# The default is 90 seconds.
-#rc_timeout_stopsec="90"
-
-# If this is set to no, we do not send sigkill to all processes in the
-# cgroup.
-#rc_send_sigkill="YES"
--- a/etc/rc.conf.DragonFly
+++ b/etc/rc.conf.DragonFly
@@ -0,0 +1,13 @@
+##############################################################################
+# DragonFly BSD SPECIFIC OPTIONS
+
+# This is the subsystem type. Valid options on DragonFly BSD:
+# ""        - nothing special
+# "jail"    - DragonFly BSD jails
+# "prefix"  - Prefix
+# If this is commented out, automatic detection will be used.
+#
+# This should be set to the value representing the environment this file is
+# PRESENTLY in, not the virtualization the environment is capable of.
+#rc_sys=""
+
--- a/etc/rc.conf.FreeBSD
+++ b/etc/rc.conf.FreeBSD
@@ -0,0 +1,13 @@
+##############################################################################
+# FreeBSD SPECIFIC OPTIONS
+
+# This is the subsystem type. Valid options on FreeBSD:
+# ""        - nothing special
+# "jail"    - FreeBSD jails
+# "prefix"  - Prefix
+# If this is commented out, automatic detection will be used.
+#
+# This should be set to the value representing the environment this file is
+# PRESENTLY in, not the virtualization the environment is capable of.
+#rc_sys=""
+
--- a/etc/rc.conf.GNU
+++ b/etc/rc.conf.GNU
@@ -0,0 +1,14 @@
+##############################################################################
+# GNU/Hurd SPECIFIC OPTIONS
+
+# This is the subsystem type. Valid options on GNU/Hurd:
+# ""        - nothing special
+# "subhurd" - Hurd subhurds (to be checked)
+# If this is commented out, automatic detection will be used.
+#
+# This should be set to the value representing the environment this file is
+# PRESENTLY in, not the virtualization the environment is capable of.
+#rc_sys=""
+# This is the number of tty's used in most of the rc-scripts (like
+# consolefont, numlock, etc ...)
+#rc_tty_number=6?
--- a/etc/rc.conf.GNU-kFreeBSD
+++ b/etc/rc.conf.GNU-kFreeBSD
@@ -0,0 +1,11 @@
+##############################################################################
+# GNU/kFreeBSD SPECIFIC OPTIONS
+
+# This is the subsystem type. Valid options on GNU/kFreeBSD:
+# ""        - nothing special
+# "jail"    - FreeBSD jails (not yet implemented)
+# If this is commented out, automatic detection will be used.
+#
+# This should be set to the value representing the environment this file is
+# PRESENTLY in, not the virtualization the environment is capable of.
+#rc_sys=""
--- a/etc/rc.conf.Linux
+++ b/etc/rc.conf.Linux
@@ -0,0 +1,90 @@
+##############################################################################
+# LINUX SPECIFIC OPTIONS
+
+# This is the subsystem type. Valid options on Linux:
+# ""               - nothing special
+# "docker"         - Docker container manager
+# "lxc"            - Linux Containers
+# "openvz"         - Linux OpenVZ
+# "prefix"         - Prefix
+# "rkt"            - CoreOS container management system
+# "uml"            - Usermode Linux
+# "vserver"        - Linux vserver
+# "systemd-nspawn" - Container created by the systemd-nspawn utility
+# "xen0"           - Xen0 Domain
+# "xenU"           - XenU Domain
+# If this is commented out, automatic detection will be used.
+#
+# This should be set to the value representing the environment this file is
+# PRESENTLY in, not the virtualization the environment is capable of.
+#rc_sys=""
+
+# This is the number of tty's used in most of the rc-scripts (like
+# consolefont, numlock, etc ...)
+rc_tty_number=12
+
+##############################################################################
+# CGROUPS RESOURCE MANAGEMENT
+
+# If you have cgroups turned on in your kernel, this switch controls
+# whether or not a group for each controller is mounted under
+# /sys/fs/cgroup.
+# None of the other options in this section work if this is set to "NO".
+#rc_controller_cgroups="YES"
+
+# The following settings allow you to set up values for the cgroup
+# controllers for your services.
+# They can be set in this file;, however, if you do this, the settings
+# will apply to all of your services.
+# 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 names of the settings followed by their
+# values. Each variable can hold multiple settings.
+# For example, you would use this to set the cpu.shares setting in the
+# cpu controller to 512 for your service.
+# rc_cgroup_cpu="
+# cpu.shares 512
+# "
+#
+#For more information about the adjustments that can be made with
+#cgroups, see Documentation/cgroups/* in the linux kernel source tree.
+
+# Set the blkio controller settings for this service.
+#rc_cgroup_blkio=""
+
+# Set the cpu controller settings for this service.
+#rc_cgroup_cpu=""
+
+# Add this service to the cpuacct controller (any value means yes).
+#rc_cgroup_cpuacct=""
+
+# Set the cpuset controller settings for this service.
+#rc_cgroup_cpuset=""
+
+# Set the devices controller settings for this service.
+#rc_cgroup_devices=""
+
+# Set the hugetlb controller settings for this service.
+#rc_cgroup_hugetlb=""
+
+# Set the memory controller settings for this service.
+#rc_cgroup_memory=""
+
+# Set the net_cls controller settings for this service.
+#rc_cgroup_net_cls=""
+
+# Set the net_prio controller settings for this service.
+#rc_cgroup_net_prio=""
+
+# Set the pids controller settings for this service.
+#rc_cgroup_pids=""
+
+# Set this to YES if yu want all of the processes in a service's cgroup
+# killed when the service is stopped or restarted.
+# This should not be set globally because it kills all of the service's
+# child processes, and most of the time this is undesirable. Please set
+# it in /etc/conf.d/<service>.
+# To perform this cleanup manually for a stopped service, you can
+# execute cgroup_cleanup with /etc/init.d/<service> cgroup_cleanup or
+# rc-service <service> cgroup_cleanup.
+# rc_cgroup_cleanup="NO"
--- a/etc/rc.conf.NetBSD
+++ b/etc/rc.conf.NetBSD
@@ -0,0 +1,14 @@
+##############################################################################
+# NetBSD SPECIFIC OPTIONS
+
+# This is the subsystem type. Valid options on NetBSD:
+# ""        - nothing special
+# "prefix"  - Prefix
+# "xen0"    - Xen0 Domain
+# "xenU"    - XenU Domain
+# If this is commented out, automatic detection will be used.
+#
+# This should be set to the value representing the environment this file is
+# PRESENTLY in, not the virtualization the environment is capable of.
+#rc_sys=""
+
--- a/etc/rc.conf.in
+++ b/etc/rc.conf.in
@@ -0,0 +1,151 @@
+# Global OpenRC configuration settings
+
+# Set to "YES" if you want the rc system to try and start services
+# in parallel for a slight speed improvement. When running in parallel we
+# prefix the service output with its name as the output will get
+# jumbled up.
+# WARNING: whilst we have improved parallel, it can still potentially lock
+# the boot process. Don't file bugs about this unless you can supply
+# patches that fix it without breaking other things!
+#rc_parallel="NO"
+
+# Set rc_interactive to "YES" and you'll be able to press the I key during
+# boot so you can choose to start specific services. Set to "NO" to disable
+# this feature. This feature is automatically disabled if rc_parallel is
+# set to YES.
+#rc_interactive="YES"
+
+# If we need to drop to a shell, you can specify it here.
+# If not specified we use $SHELL, otherwise the one specified in /etc/passwd,
+# otherwise /bin/sh
+# Linux users could specify /sbin/sulogin
+#rc_shell=/bin/sh
+
+# Do we allow any started service in the runlevel to satisfy the dependency
+# or do we want all of them regardless of state? For example, if net.eth0
+# and net.eth1 are in the default runlevel then with rc_depend_strict="NO"
+# both will be started, but services that depend on 'net' will work if either
+# one comes up. With rc_depend_strict="YES" we would require them both to
+# come up.
+#rc_depend_strict="YES"
+
+# rc_hotplug controls which services we allow to be hotplugged.
+# A hotplugged service is one started by a dynamic dev manager when a matching
+# hardware device is found.
+# Hotplugged services appear in the "hotplugged" runlevel.
+# If rc_hotplug is set to any value, we compare the name of this service
+# to every pattern in the value, from left to right, and we allow the
+# service to be hotplugged if it matches a pattern, or if it matches no
+# patterns. Patterns can include shell wildcards.
+# To disable services from being hotplugged, prefix patterns with "!".
+#If rc_hotplug is not set or is empty, all hotplugging is disabled.
+# Example - rc_hotplug="net.wlan !net.*"
+# This allows net.wlan and any service not matching net.* to be hotplugged.
+# Example - rc_hotplug="!net.*"
+# This allows services that do not match "net.*" to be hotplugged.
+
+# rc_logger launches a logging daemon to log the entire rc process to
+# /var/log/rc.log
+# NOTE: Linux systems require the devfs service to be started before
+# logging can take place and as such cannot log the sysinit runlevel.
+#rc_logger="YES"
+
+# Through rc_log_path you can specify a custom log file.
+# The default value is: /var/log/rc.log
+#rc_log_path="/var/log/rc.log"
+
+# If you want verbose output for OpenRC, set this to yes. If you want
+# verbose output for service foo only, set it to yes in /etc/conf.d/foo.
+#rc_verbose=no
+
+# By default we filter the environment for our running scripts. To allow other
+# variables through, add them here. Use a * to allow all variables through.
+#rc_env_allow="VAR1 VAR2"
+
+# By default we assume that all daemons will start correctly.
+# However, some do not - a classic example is that they fork and return 0 AND
+# then child barfs on a configuration error. Or the daemon has a bug and the
+# child crashes. You can set the number of milliseconds start-stop-daemon
+# waits to check that the daemon is still running after starting here.
+# The default is 0 - no checking.
+#rc_start_wait=100
+
+# rc_nostop is a list of services which will not stop when changing runlevels.
+# This still allows the service itself to be stopped when called directly.
+#rc_nostop=""
+
+# rc will attempt to start crashed services by default.
+# However, it will not stop them by default as that could bring down other
+# critical services.
+#rc_crashed_stop=NO
+#rc_crashed_start=YES
+
+# Set rc_nocolor to yes if you do not want colors displayed in OpenRC
+# output.
+#rc_nocolor=NO
+
+##############################################################################
+# MISC CONFIGURATION VARIABLES
+# There variables are shared between many init scripts
+
+# Set unicode to YES to turn on unicode support for keyboards and screens.
+#unicode="NO"
+
+# This is how long fuser should wait for a remote server to respond. The
+# default is 60 seconds, but  it can be adjusted here.
+#rc_fuser_timeout=60
+
+# Below is the default list of network fstypes.
+#
+# afs ceph cifs coda davfs fuse fuse.sshfs gfs glusterfs lustre ncpfs
+# nfs nfs4 ocfs2 shfs smbfs
+#
+# If you would like to add to this list, you can do so by adding your
+# own fstypes to the following variable.
+#extra_net_fs_list=""
+
+##############################################################################
+# SERVICE CONFIGURATION VARIABLES
+# These variables are documented here, but should be configured in
+# /etc/conf.d/foo for service foo and NOT enabled here unless you
+# really want them to work on a global basis.
+# If your service has characters in its name which are not legal in
+# shell variable names and you configure the variables for it in this
+# file, those characters should be replaced with underscores in the
+# variable names as shown below.
+
+# 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"
+
+# Pass ulimit parameters
+# If you are using bash in POSIX mode for your shell, note that the
+# ulimit command uses a block size of 512 bytes for the -c and -f
+# options
+#rc_ulimit="-u 30"
+
+# It's possible to define extra dependencies for services like so
+#rc_config="/etc/foo"
+#rc_need="openvpn"
+#rc_use="net.eth0"
+#rc_after="clock"
+#rc_before="local"
+#rc_provide="!net"
+
+# You can also enable the above commands here for each service. Below is an
+# example for service foo.
+#rc_foo_config="/etc/foo"
+#rc_foo_need="openvpn"
+#rc_foo_after="clock"
+
+# Below is an example for service foo-bar. Note that the '-' is illegal
+# in a shell variable name, so we convert it to an underscore.
+# example for service foo-bar.
+#rc_foo_bar_config="/etc/foo-bar"
+#rc_foo_bar_need="openvpn"
+#rc_foo_bar_after="clock"
+
+# You can also remove dependencies.
+# This is mainly used for saying which servies do NOT provide net.
+#rc_net_tap0_provide="!net"
+
--- 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/HEAD/AUTHORS
+# 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/HEAD/LICENSE
+# 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.

@@ -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 physical interfaces
+		# We only create links for pyhsical interfaces
 		[ -n "$(getmedia ${1#*.})" ] || exit 1
 		base="net.lo0"
 	fi
--- a/etc/rc.in
+++ b/etc/rc.in
@@ -1,11 +1,11 @@
-#!/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/HEAD/AUTHORS
+# 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/HEAD/LICENSE
+# 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.

--- a/etc/rc.shutdown.in
+++ b/etc/rc.shutdown.in
@@ -1,11 +1,11 @@
-#!/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/HEAD/AUTHORS
+# 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/HEAD/LICENSE
+# 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.

@@ -14,7 +14,7 @@ trap : SIGINT SIGQUIT

 # Try and use stuff in /lib over anywhere else so we can shutdown
 # local mounts correctly.
-LD_LIBRARY_PATH="/lib${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}" ; export LD_LIBRARY_PATH
+LD_LIBRARY_PATH="/lib${LD_LIBRARY_PATH:+:}${LDLIBRARY_PATH}" ; export LD_LIBRARY_PATH

 # If $TERM is not set then assume default of @TERM@
 # This gives us a nice colour boot :)
--- a/init-guide.md
+++ b/init-guide.md
@@ -1,47 +0,0 @@
-# OpenRC init process guide
-
-OpenRC now includes an init process which can be used on Linux systems
-in place of sysvinit.
-
-## migrating a live system to openrc-init
-
-Configuring a live system to use this init process is very
-straight-forward, but the steps must be completed in this order.
-
-* have your boot loader add "init=/sbin/openrc-init" to the kernel command line
-
-The details of how to do this will vary from distro to distro, so they are
-out of scope for this document.
-
-* Install gettys into the runlevels where you need them.
-
-If you are using the provided /etc/init.d/agetty script,, you should
-first create symlinks in /etc/init.d to it for the ports where you
-want gettys to run, e.g. the following will work if you want gettys on
-tty1-tty6.
-
-```
-# cd /etc/init.d
-# for x in tty1 tty2 tty3 tty4 tty5 tty6; do
-  ln -snf agetty agetty.$x
-  done
-```
-
-Once this is done, use ```rc-update``` as normal to install the agetty
-services in the appropriate runlevels.
-
-* Reboot your system.
-
-At this point you are running under openrc-init, and you should use
-openrc-shutdown to handle shutting down, powering off, rebooting etc.
-
-## optional sysvinit compatibility
-
-If you build and install OpenRC with MKSYSVINIT=yes, you will build and install
-wrappers that make openrc-init compatible with sysvinit -- you will have
-commands like "halt" "shutdown" "reboot" and "poweroff".
-
-If you want this functionality on a live system, you should first
-migrate the system to openrc-init, remove sysvinit, then rebuild and
-install this package with MKSYSVINIT=yes.
-
--- a/init.d.misc/.gitignore
+++ b/init.d.misc/.gitignore
@@ -0,0 +1,11 @@
+avahi-dnsconfd
+avahid
+dhcpcd
+dbus
+hald
+named
+ntpd
+openvpn
+polkitd
+sshd
+wpa_supplicant
--- a/init.d.misc/Makefile
+++ b/init.d.misc/Makefile
@@ -0,0 +1,11 @@
+DIR=	${INITDIR}
+SRCS=	avahi-dnsconfd.in avahid.in dhcpcd.in dbus.in \
+	hald.in named.in ntpd.in \
+	openvpn.in polkitd.in sshd.in wpa_supplicant.in
+
+MK=	../mk
+
+SED_EXTRA+= -e 's:@VARBASE@:/var:g'
+
+include ${MK}/os.mk
+include ${MK}/scripts.mk
--- a/support/init.d.examples/avahi-dnsconfd.in
+++ b/support/init.d.examples/avahi-dnsconfd.in
@@ -1,17 +1,17 @@
 #!@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/HEAD/AUTHORS
+# 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/HEAD/LICENSE
+# 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.

-command=/sbin/avahi-dnsconfd
+command=@PKG_PREFIX@/sbin/avahi-dnsconfd
 command_args="$avahi_dnsconfd_args -D"
-pidfile=/var/run/avahi-dnsconfd.pid
+pidfile=@VARBASE@/run/avahi-dnsconfd.pid
 name="Avahi DNS Configuration Daemon"

 depend()
--- a/support/init.d.examples/avahid.in
+++ b/support/init.d.examples/avahid.in
@@ -1,17 +1,17 @@
 #!@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/HEAD/AUTHORS
+# 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/HEAD/LICENSE
+# 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.

-command=/sbin/avahi-daemon
+command=@PKG_PREFIX@/sbin/avahi-daemon
 command_args="$avahid_args -D"
-pidfile=/var/run/avahi-daemon/pid
+pidfile=@VARBASE@/run/avahi-daemon/pid
 name="Avahi Service Advertisement Daemon"

 depend()
--- a/support/init.d.examples/dbus.in
+++ b/support/init.d.examples/dbus.in
@@ -1,16 +1,16 @@
 #!@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/HEAD/AUTHORS
+# 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/HEAD/LICENSE
+# 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.

-command=/bin/dbus-daemon
-pidfile=/var/run/dbus/pid
+command=@PKG_PREFIX@/bin/dbus-daemon
+pidfile=@VARBASE@/run/dbus/pid
 command_args="${dbusd_args---system}"
 name="Message Bus Daemon"

--- a/support/init.d.examples/dhcpcd.in
+++ b/support/init.d.examples/dhcpcd.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/HEAD/AUTHORS
+# 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/HEAD/LICENSE
+# 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.

--- a/support/init.d.examples/dnsmasq.in
+++ b/support/init.d.examples/dnsmasq.in
@@ -1,17 +1,17 @@
 #!@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/HEAD/AUTHORS
+# 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/HEAD/LICENSE
+# 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.

-command=/sbin/dnsmasq
+command=@PKG_PREFIX@/sbin/dnsmasq
 command_args=$dnsmasq_args
-pidfile=/var/run/dnsmasq.pid
+pidfile=@VARBASE@/run/dnsmasq.pid
 required_files=/etc/dnsmasq.conf

 extra_started_commands="reload"
--- a/support/init.d.examples/hald.in
+++ b/support/init.d.examples/hald.in
@@ -1,16 +1,16 @@
 #!@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/HEAD/AUTHORS
+# 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/HEAD/LICENSE
+# 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.

-command=/sbin/hald
-pidfile=/var/run/hald/hald.pid
+command=@PKG_PREFIX@/sbin/hald
+pidfile=@VARBASE@/run/hald/hald.pid
 command_args=$hald_args
 name="Hardware Abstraction Layer Daemon"

--- a/support/init.d.examples/named.in
+++ b/support/init.d.examples/named.in
@@ -1,17 +1,17 @@
 #!@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/HEAD/AUTHORS
+# 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/HEAD/LICENSE
+# 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.

 command=/usr/sbin/named
 command_args=$named_args
-pidfile=/var/run/named.pid
+pidfile=@VARBASE@/run/named.pid
 name="Domain Name server"
 extra_started_commands="reload"

@@ -20,7 +20,7 @@ uid=named
 case "$RC_UNAME" in
 	FreeBSD)
 		uid=bind
-		pidfile=/var/run/named/pid
+		pidfile=@VARBASE@/run/named/pid
 		;;
 	Linux)
 		uid=bind
--- a/support/init.d.examples/ntpd.in
+++ b/support/init.d.examples/ntpd.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/HEAD/AUTHORS
+# 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/HEAD/LICENSE
+# 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.

--- a/support/init.d.examples/openvpn.in
+++ b/support/init.d.examples/openvpn.in
@@ -1,21 +1,21 @@
 #!@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/HEAD/AUTHORS
+# 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/HEAD/LICENSE
+# 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.

 vpn=${RC_SVCNAME#*.}
 name="OpenVPN"
 [ "$vpn" != openvpn ] && name="$name ($vpn)"
-command=/sbin/openvpn
+command=@PKG_PREFIX@/sbin/openvpn

-pidfile=/var/run/"$RC_SVCNAME".pid
-: ${openvpn_dir:=/etc/openvpn}
+pidfile=@VARBASE@/run/"$RC_SVCNAME".pid
+: ${openvpn_dir:=@PKG_PREFIX@/etc/openvpn}
 : ${openvpn_config:=$openvpn_dir/$vpn.conf}
 command_args="$openvpn_args --daemon --config $openvpn_config"
 command_args="$command_args --writepid $pidfile"
--- a/support/init.d.examples/polkitd.in
+++ b/support/init.d.examples/polkitd.in
@@ -1,16 +1,16 @@
 #!@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/HEAD/AUTHORS
+# 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/HEAD/LICENSE
+# 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.

-command=/sbin/polkitd
-pidfile=/var/run/polkitd/polkitd.pid
+command=@PKG_PREFIX@/sbin/polkitd
+pidfile=@VARBASE@/run/polkitd/polkitd.pid
 command_args="$polkitd_args"
 name="PolicyKit Daemon"

--- a/support/init.d.examples/sshd.in
+++ b/support/init.d.examples/sshd.in
@@ -1,17 +1,17 @@
 #!@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/HEAD/AUTHORS
+# 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/HEAD/LICENSE
+# 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.

 command=/usr/sbin/sshd
 command_args=$sshd_args
-pidfile=/var/run/sshd.pid
+pidfile=@VARBASE@/run/sshd.pid
 required_files=/etc/ssh/sshd_config

 depend()
--- a/support/init.d.examples/wpa_supplicant.in
+++ b/support/init.d.examples/wpa_supplicant.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/HEAD/AUTHORS
+# 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/HEAD/LICENSE
+# 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.

@@ -39,11 +39,6 @@ find_wireless()
 			fi
 		done
 		;;
-	FreeBSD)
-		for iface in $(sysctl -b net.wlan.devices 2>/dev/null); do
-			echo "${iface##*/}"
-		done
-		;;
 	*)
 		for iface in /dev/net/* $(ifconfig -l 2>/dev/null); do
 			if ifconfig "${iface##*/}" 2>/dev/null | \
--- a/init.d/.gitignore
+++ b/init.d/.gitignore
@@ -0,0 +1,48 @@
+binfmt
+bootmisc
+fsck
+hostname
+local
+localmount
+loopback
+moused
+netmount
+network
+root
+savecache
+swap
+swapfiles
+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
+savecore
+swap-blk
+swclock
+syslogd
+termencoding
+ttys
+wscons
+tmpfiles.dev
+tmpfiles.setup
--- a/init.d/Makefile
+++ b/init.d/Makefile
@@ -0,0 +1,39 @@
+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 swapfiles.in \
+	tmpfiles.setup.in swclock.in sysctl.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 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=	binfmt.in devfs.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 sysfs.in termencoding.in tmpfiles.dev.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
+
+%.in: %${SFX}
+	sed ${SED_REPLACE} ${SED_EXTRA} $< > $@
+
+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/HEAD/AUTHORS
+# 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/HEAD/LICENSE
+# 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.

@@ -23,7 +23,6 @@ fi

 depend()
 {
-	after swclock
 	provide clock
 	# BSD adjkerntz needs to be able to write to /etc
 	if [ "$clock" = "UTC" -a -e /etc/wall_cmos_clock ] ||
--- a/init.d/agetty.in
+++ b/init.d/agetty.in
@@ -1,41 +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/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="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}"
-pidfile="/run/${RC_SVCNAME}.pid"
-
-depend() {
-	after local
-	keyword -prefix
-	provide getty
-}
-
-start_pre() {
-	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."
-		return 1
-	else
-		export EINFO_QUIET="${quiet:-yes}"
-	fi
-}
-
-stop_pre()
-{
-	export EINFO_QUIET="${quiet:-yes}"
-}
--- 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/HEAD/AUTHORS
+# 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/HEAD/LICENSE
+# 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.

@@ -13,9 +13,9 @@ description="Register misc binary format handlers"

 depend()
 {
-	after clock procfs
+	after procfs
 	use modules devfs
-	keyword -docker -lxc -openvz -prefix -systemd-nspawn -vserver
+	keyword -openvz -prefix -systemd-nspawn -vserver -lxc
 }

 start()
--- 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/HEAD/AUTHORS
+# 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/HEAD/LICENSE
+# 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.

@@ -71,8 +71,7 @@ cleanup_var_run_dir()
 	ebegin "Cleaning /var/run"
 	for x in $(find /var/run ! -type d ! -name utmp \
 		! -name random-seed ! -name dev.db \
-		! -name ld-elf.so.hints ! -name ld-elf32.so.hints \
-		! -name ld.so.hints);
+		! -name ld-elf.so.hints ! -name ld.so.hints);
 	do
 		# Clean stale sockets
 		if [ -S "$x" ]; then
@@ -113,10 +112,8 @@ migrate_to_run()
 		rm $src
 	elif [ ! -L $src -a -d $src ]; then
 		ebegin "Migrating $src to $dst"
- 		if ! rmdir $src 2>/dev/null; then
- 			cp -a $src/* $dst/
- 			rm -rf $src
- 		fi
+ 		cp -a $src/* $dst/
+ 		rm -rf $src
 		eend $?
 	fi
 	# If $src doesn't exist at all, just run this
@@ -226,7 +223,7 @@ start()
 			case "$RC_SYS" in
 				VSERVER|OPENVZ|LXC|SYSTEMD-NSPAWN) ;;
 				*)
-					if yesno ${previous_dmesg:-no} && [ -e /var/log/dmesg ]; then
+					if yesno ${previous_dmesg:-no}; then
 						mv /var/log/dmesg /var/log/dmesg.old
 					fi
 					dmesg > /var/log/dmesg
@@ -243,13 +240,7 @@ stop()
 {
 	# Write a halt record if we're shutting down
 	if [ "$RC_RUNLEVEL" = shutdown ]; then
-		if [ "$RC_UNAME" = Linux ]; then
-			if [ -x /sbin/halt ]; then
-				halt -w
-			else
-				openrc-shutdown -w
-			fi
-		fi
+		[ "$RC_UNAME" = Linux ] && halt -w
 		if [ "$RC_SYS" = OPENVZ ]; then
 			yesno $RC_REBOOT && printf "" >/reboot
 		fi
--- a/init.d/cgroups.in
+++ b/init.d/cgroups.in
@@ -1,157 +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/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="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" ] && return 0
-	[ ! -e "${cgroup_path}/cgroup.subtree_control" ]&& return 0
-	read -r active < "${cgroup_path}/cgroup.controllers"
-	for x in ${active}; do
-	case "$rc_cgroup_mode" in
-		unified)
-			echo "+${x}"  > "${cgroup_path}/cgroup.subtree_control"
-			;;
-		hybrid)
-			for y in ${rc_cgroup_controllers}; do
-				if [ "$x" = "$y" ]; then
-					echo "+${x}"  > "${cgroup_path}/cgroup.subtree_control"
-				fi
-			done
-			;;
-		esac
-	done
-	return 0
-}
-
-cgroups_hybrid()
-{
-	cgroup1_base
-	cgroup2_base
-	cgroup2_controllers
-	cgroup1_controllers
-	return 0
-}
-
-cgroups_legacy()
-{
-	cgroup1_base
-	cgroup1_controllers
-	return 0
-}
-
-cgroups_unified()
-{
-	cgroup2_base
-	cgroup2_controllers
-	return 0
-}
-
-mount_cgroups()
-{
-	case "${rc_cgroup_mode:-hybrid}" in
-	hybrid) cgroups_hybrid ;;
-	legacy) cgroups_legacy ;;
-	unified) cgroups_unified ;;
-	esac
-	return 0
-}
-
-restorecon_cgroups()
-{
-	if [ -x /sbin/restorecon ]; then
-		ebegin "Restoring SELinux contexts in /sys/fs/cgroup"
-		restorecon -rF /sys/fs/cgroup >/dev/null 2>&1
-		eend $?
-	fi
-	return 0
-}
-
-start()
-{
-	# set up kernel support for cgroups
-	if [ -d /sys/fs/cgroup ]; then
-		mount_cgroups
-		restorecon_cgroups
-	fi
-	return 0
-}
--- a/init.d/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/HEAD/AUTHORS
+# 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/HEAD/LICENSE
+# 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.

@@ -13,9 +13,9 @@ 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
+	keyword -openvz -prefix -systemd-nspawn -uml -vserver -xenu -lxc
 }

 start()
--- 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/HEAD/AUTHORS
+# 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/HEAD/LICENSE
+# 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.

--- 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/HEAD/AUTHORS
+# 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/HEAD/LICENSE
+# 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.

@@ -13,7 +13,6 @@ description="Creates the dev database"

 depend()
 {
-	after clock
 	need localmount
 }

--- 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/HEAD/AUTHORS
+# 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/HEAD/LICENSE
+# 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.

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

 mount_dev()
 {
-	local action conf_d_dir devfstype msg mountopts
-	action=--mount
-	conf_d_dir="${RC_SERVICE%/*/*}/conf.d"
-	msg=Mounting
-	# 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"
+	local action=--mount devfstype msg=Mounting
+	# Some devices require exec, Bug #92921
+	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
@@ -37,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
@@ -58,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
 }
@@ -67,20 +63,18 @@ seed_dev()
 {
 	# Seed /dev with some things that we know we need

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

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

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

 	# extra symbolic links not provided by default
 	[ -e /dev/fd ] || ln -snf /proc/self/fd /dev/fd
--- 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/HEAD/AUTHORS
+# 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/HEAD/LICENSE
+# 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.

@@ -14,7 +14,7 @@ description="Set the dmesg level for a cleaner boot"
 depend()
 {
 	before dev modules
-	keyword -docker -lxc -prefix -systemd-nspawn -vserver
+	keyword -lxc -prefix -systemd-nspawn -vserver
 }

 start()
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
William Hubbs	2747f40f82	update changelog	2016-01-13 20:21:17 -06:00
William Hubbs	933972da53	fix selinux build	2016-01-13 20:15:15 -06:00
William Hubbs	dbcb8ba3fe	Add LANG, LC_MESSAGES and TERM to the environment whitelist	2016-01-13 20:15:14 -06:00
William Hubbs	e462c3223e	fix seg fault	2016-01-13 20:15:14 -06:00
William Hubbs	06f195ce37	increment version number	2016-01-13 19:53:03 -06:00