config rc_libexecdir

Remove the mention of linking with libtermcap from einfo(3), and fix
some comments in libeinfo.c to more accurately reflect the new
situation.

.cirrus.yml

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

.clangd

@@ -0,0 +1,2 @@
+CompileFlags:
+  CompilationDatabase: builddir/

.github/workflows/ci-alpine-linux.yml

@@ -0,0 +1,31 @@
+name: ci_alpine_linux
+
+on: [push, pull_request]
+
+jobs:
+
+  alpine:
+    name: Alpine Linux
+    runs-on: ubuntu-latest
+    container: alpine:latest
+    strategy:
+      fail-fast: false
+      matrix:
+        compiler:
+          - gcc
+    env:
+      CC: ${{ matrix.compiler }}
+    steps:
+      - run: >-
+          apk --no-cache add \
+            build-base \
+            meson \
+            pkgconf \
+            linux-pam \
+            linux-pam-dev \
+            libcap \
+            libcap-dev
+      - uses: actions/checkout@v2
+      - run: meson setup builddir/
+      - run: meson compile -C builddir
+      - run: meson test --verbose -C builddir

.github/workflows/ci-ubuntu.yml

@@ -0,0 +1,24 @@
+name: ci_ubuntu
+
+on: [push, pull_request]
+
+jobs:
+
+  ubuntu:
+    name: Ubuntu
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        compiler:
+          - gcc
+          - clang
+    env:
+      CC: ${{ matrix.compiler }}
+    steps:
+    - uses: actions/checkout@v2
+    - run: sudo apt-get update -q
+    - run: sudo apt-get install -q -y build-essential libpam-dev meson libcap-dev ${CC}
+    - run: meson setup builddir/
+    - run: ninja -C builddir
+    - run: ninja test --verbose -C builddir

.github/workflows/coverity.yml

@@ -0,0 +1,25 @@
+# GitHub actions workflow.
+# https://docs.github.com/en/actions/learn-github-actions/workflow-syntax-for-github-actions
+
+# https://scan.coverity.com/projects/openrc-openrc
+name: Coverity Scan
+
+on:
+  push:
+    branches: [master]
+
+jobs:
+  coverity:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - run: sudo apt-get update -q
+    - run: sudo apt-get install -q -y build-essential libpam-dev meson libcap-dev
+    - run: meson setup builddir/
+      env:
+        CC: gcc
+    - uses: vapier/coverity-scan-action@v1
+      with:
+        command: ninja -C builddir
+        email: ${{ secrets.COVERITY_SCAN_EMAIL }}
+        token: ${{ secrets.COVERITY_SCAN_TOKEN }}

.gitignore

@@ -9,8 +9,4 @@ core
 .gdb_history
 .gdbinit
 
-.depend
-*.a
-*.o
-*.So
-lib*.so
+build

.travis.yml

@@ -19,8 +19,8 @@ addons:
 notifications:
   irc:
     channels:
-      - "irc.freenode.org#openrc"
-    on_success: change  # options: [always|never|change] default: always
+      - "irc.libera.chat#openrc"
+    on_success: always  # options: [always|never|change] default: always
     on_failure: always  # options: [always|never|change] default: always
     on_start: false     # default: false
 

AUTHORS

@@ -43,6 +43,7 @@ Ian Stakenvicius <axs@gentoo.org>
 Jakob Drexel <jake42@rommel.stw.uni-erlangen.de>
 James Le Cuirot <chewi@aura-online.co.uk>
 Jan Psota <jasiu@belsznica.pl>
+Jason A. Donenfeld <Jason@zx2c4.com>
 Jason Zaman <jason@perfinion.com>
 Joe Harvell <jharvell@dogpad.net>
 Joe M <joe9mail@gmail.com>

CODE_OF_CONDUCT.md

@@ -0,0 +1,142 @@
+# 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
+

ChangeLog

@@ -1,539 +0,0 @@
-commit 901b752463eb37784fcebe5a3b5648b4bfbd9371
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    README: force references to be on separate lines for github
-
-commit c88368b7925e343e293a493da671edaa4ccebc0d
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    update news
-    
-    This adds a note about SHLIBDIR being dropped from the makefiles.
-
-commit bfffe2c585dd6a23a7d3c99d16d414abcb321105
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    drop reference to gentoo bugzilla
-    
-    OpenRC has a bug tracker on github, so ask people to file issues there.
-
-commit 5f890ee8ab94f8760f4840d280feb7eced999068
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    init.sh: rework the /run setup for linux xystems
-    
-    - fix mount options for /run.
-    - run restorecon after everything is set up.
-    
-    X-Gentoo-Bug: 740576
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/740576
-
-commit ef76a663bcc03d4cc9dd1ef05c800f208e26d0ed
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    stop namespaced services with specified pids
-    
-    The previous fix excludes PIDs of processes running in a different namespace
-    regardless of whether the PID has been explicitly stored in a PID file mentioned
-    in the --pidfile parameter.  The correct behavior is to only exclude the pid if
-    it is not stored in a pidfile.
-    
-    X-Gentoo-Bug: 776010
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/776010
-
-commit fccd37c34cbabe77d701316491b899a0eb529114
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    add PKGCONFIGDIR to the makefiles
-    
-    This allows pkgconfig files to be stored in /usr even if PREFIX is /.
-
-commit 5058b6668caaa1ac019d6da299528ad0c75379c2
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    drop shlibdir
-    
-    I know of no other build systems that have separate paths for static vs
-    shared libraries, so this changes ours to use libdir for all libraries.
-
-commit 1878a74a124e12fbdc3fe3286d81045b9198d424
-Author: Thomas Deutschmann <whissi@whissi.de>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    numlock: Don't disable numlock on shutdown
-    
-    When dealing with remote consoles, a shutdown could disable
-    host's numlock which is not desired.
-    
-    This fixes #413.
-
-commit 897c2c00eff0dd73717b0903548912063cfd9f01
-Author: btdmaster <59375667+btdmaster@users.noreply.github.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    README: Wrap 'make install' in backticks
-    
-    This fixes #412
-
-commit 08d518b7fe8f4eade97a50d41859da841a04658a
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    rc_cgroup.sh: do not add newline when writing group2 values
-    
-    Fixes: #407
-
-commit de776746634cde398bf2a171bfcb43ecc7069e33
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    rc-cgroup.sh: avoid process substitution for cgroup_get_pids
-    
-    This should make cgroup_cleanup work successfully since cgroup_get_pids
-    no longer uses a subshell.
-    
-    This fixes #396.
-    This fixes #397.
-
-commit 4fb4674374931be2fa279692800185078f350d9f
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    fix unified cgroups v2 setup
-    
-    The cgroups v2 setup required the rc_cgroups_controllers variable
-    to be set to the list of controllers to enable regardless of whether the
-    mode was hybrid or unified.
-    
-    This makes sense for hybrid mode since the controllers can't be in both
-    the cgroups v1 and v2 hierarchies, but for unified mode we should enable
-    all controllers that are configured in the kernel.
-
-commit 0ddab761be249f54388c12f6cc8197dd01a63673
-Author: Disconnect3d <dominik.b.czarnota@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    start-stop-daemon: Fix off by ones when checking for RC_* envvars
-    
-    The same as https://github.com/OpenRC/openrc/pull/361
-    
-    This fixes #362.
-
-commit f5dd2f5baf1a33173c8ac47495e53d32aee834f5
-Author: Disconnect3d <dominik.b.czarnota@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    supervise-daemon: Fix off by ones when checking for RC_* envvars
-    
-    Fixes strncmp size argument off by one as the current implementation didn't
-    match the `=` character.
-    
-    This fixes #361.
-
-commit b12c52d40f2221e6e2b3ae0296d45c607845ea2a
-Author: Rin Cat <me@rin.cat>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    Support docker and lxc stop
-    
-    This fixes #398.
-
-commit bac71fce5bc9cb7ba02338c6c4cfc949badd218b
-Author: sqozz <sqozz@geekify.de>
-Commit: Mike Frysinger <vapier@gmail.com>
-
-    start-stop-daemon: fix typo in manpage
-
-commit 12ee72a9b34ef33411cf1bfd5ea059676ee6e482
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    allow devfs to run on lxc
-    
-    X-Gentoo-Bug: 761918
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=761918
-    Closes #272.
-
-commit 170ce2624a98952e6eb871cd9915c7c1b76ab887
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    typo fix
-
-commit 9a6698876af1c7563ae7a3237111fc43cf4f5bda
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    improve the diagnostic when the ulimit builtin fails
-    
-    X-Gentoo-Bug:739274
-    X-Gentoo-Bug-URL:https://bugs.gentoo.org/739274
-
-commit bf9af1fb23b57af38880d824e7bba37a648f12fb
-Author: Gaël PORTAY <gael.portay@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    net-online: fix process of symlinks in sysfs
-    
-    The test `[ -h "${ifname}" ] && continue` skips the symlinks while it is
-    the opposite that is the expected: ignoring files that are not symlinks.
-    
-    Fixes commit f42ec82f21f3760b829507344ad0ae761e1d59aa.
-    This fixes #391.
-
-commit 5c9c2a19397eb7bcc0bd1c7091229bbf9ef883b5
-Author: Patrick Noll <8444617+pnoll1@users.noreply.github.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    remove statement about not providing an init
-    
-    This fixes #359.
-
-commit 4b2a61f1b8b786600e39ba1a223ff8d9b389b275
-Author: Manuel Rüger <manuel@rueg.eu>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    rc-status: Remove noise from ini-formatted output
-    
-    Otherwise this would create the following output:
-    
-    rc-status -f ini
-     * Caching service dependencies ...        [ ok ]
-    [default]
-    dbus =  started
-    NetworkManager =  started
-    syslog-ng =  started
-    ...
-    
-    This fixes #364.
-
-commit 62bc463c63a3beeeead0b6fb164f7c7e9b917849
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    update freebsd 11.x image on cirrus ci
-
-commit 7019bfad3b4cf6eff31d967f6f4e0960f67858fb
-Author: Clayton Craft <clayton@craftyguy.net>
-Commit: Luca Barbato <luca.barbato@gmail.com>
-
-    user-guide: clarify note for Runlevels/rc-update usage
-    
-    I found the original note a little confusing, since using rc-update will
-    add it to a runlevel so it *is* auto-started when the system reaches
-    that runlevel again, but I don't think that was the intended meaning of
-    'auto-start', so hopefully this makes it a little more clear.
-
-commit 8346c985d598385e760375a8adf69c986bb4a350
-Author: lishuxiang <GoldenMean58@outlook.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    Update user-guide.md
-    
-    fix a typo
-    
-    This fixes #389.
-
-commit da30767353eb1cc13826176bf19308a05c7bade4
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    supervise-daemon: do not spawn a process if we are exiting
-    
-    This fixes #375 and allows us to not add another level of indentation in
-    the supervisor loop.
-
-commit 57d9528a0bc64366ea3e0fbbb21b1282ce5c1212
-Author: Dermot Bradley <dermot_bradley@yahoo.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    Remove warning when osclock init.d script runs
-    
-    Currently when osclock is enabled as a init.d service the following
-    messages appear during boot when osclock starts:
-    
-      * The command variable is undefined.
-      * There is nothing for osclock to start.
-      * If this is what you intend, please write a start function.
-      * This will become a failure in a future release.
-    
-    osclock is activated whenever a machine's system clock is automatically
-    configured from a RTC by the kernel and the osclock's only purpose is to
-    satisfy the "clock" dependency defined by other init.d services.
-    
-    Adding a stub start() function prevents OpenRC from showing warnings but
-    continues to ensure that the osclock service still does not actually do
-    anything.
-    
-    This fixes #377.
-
-commit 6ce48f124aea593b77163d6f198d18bbe9093068
-Author: Calvin Montgomery <calzoneman@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    man/openrc.8: populate OPTIONS from --help output
-    
-    This fixes #378.
-
-commit 00ea2166081856774f24f7243126f701c7fe6db9
-Author: Michael Orlitzky <michael@orlitzky.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    src/rc/checkpath.c: replace mkdir() with mkdirat().
-    
-    The do_check() function recently gained some defenses against symlink
-    replacement attacks that involve the use of *at functions in place of
-    their vanilla counterparts; openat() instead of open(), for example.
-    One opportunity to replace mkdir() with mkdirat() was missed, however,
-    and this commit replaces it.
-    
-    This fixes #386.
-
-commit ac7ca6d901d72b1bc4ed13be5438e825c07fc0da
-Author: Michael Orlitzky <michael@orlitzky.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    src/rc/checkpath.c: fix typo "synbolic" -> "symbolic".
-
-commit 47819f004cec3cc3e911ba69003b8b52bacbebef
-Author: Johannes Heimansberg <git@jhe.dedyn.io>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    start-stop-daemon, supervise-daemon: fix parsing of usernames passed via --user that start with a number
-    
-    start-stop-daemon and supervise-daemon parse usernames and group names
-    passed via the --user argument as numeric UID/GID if they start with a
-    number (e.g. user "4foo" will be treated as UID 4). This results in the
-    process that is being started to run under a totally unexpected user if
-    that UID exists.
-    
-    Even though the result of the sscanf calls are tested for a result of
-    exactly 1, which means exactly one value was extracted, because sscanf's
-    format string only contains only one placeholder, it will never return
-    a value greater than 1, even if there are still characters left to be
-    parsed. This causes start-stop-daemon and supervise-daemon to assume
-    that usernames starting with a number are just that number. Adding a
-    second placeholder "%1s" to the format string, which matches a string of
-    length 1, makes sure that sscanf can distinguish between pure numbers
-    (in which case it will return 1) and strings either starting with a
-    number (in which case it will return 2) and any other string (in which
-    case it will return 0).
-    
-    This fixes #379.
-    This fixes #380.
-
-commit 0fab3e837b45021fdcc02a71873c3c245ce96080
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    bootmisc: allow sysvinit compatibility  during shutdown
-    
-    Use "halt -w" to write the halt record if it exists.
-    Otherwise use openrc-shutdown.
-    
-    This fixes #336.
-
-commit 38aaba28ee86602e29d8a31f155dfa72f5481e68
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    scripts/shutdown.in: fix sysvinit compatible shutdown
-    
-    X-Gentoo-Bug: https://bugs.gentoo.org/755422
-
-commit 3ed4126a31406124ae8042fc3d4c0bf963d6961e
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    update news for 0.43 with info on checkpath fix
-
-commit aa0fdf6d08b987dfcabebf5b8d05beff015ad8f4
-Author: Lars Wendler <polynomial-c@gentoo.org>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    start-stop-daemon: Don't segfault if --exec was given a non-existing file name
-    
-      Starting program: /sbin/start-stop-daemon --start --exec i-dont-exist
-    
-      Program received signal SIGSEGV, Segmentation fault.
-      0x0000555555559053 in main (argc=1, argv=0x7fffffffdc20)
-          at start-stop-daemon.c:631
-      631                         *exec_file ? exec_file : exec);
-    
-    This fixes #385.
-
-commit b6fef599bf8493480664b766040fa9b0d4b1e335
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    checkpath: fix CVE-2018-21269
-    
-    This walks the directory path to the file we are going to manipulate to make
-    sure that when we create the file and change the ownership and permissions
-    we are working on the same file.
-    Also, all non-terminal symbolic links must be owned by root. This will
-    keep a non-root user from making a symbolic link as described in the
-    bug. If root creates the symbolic link, it is assumed to be trusted.
-    
-    On non-linux platforms, we no longer follow non-terminal symbolic links
-    by default. If you need to do that, add the -s option on the checkpath
-    command line, but keep in mind that this is not secure.
-    
-    This fixes #201.
-
-commit aac1734a70b60da97d4d24930f1902ca46894b44
-Author: Julien Surloppe <julien@surloppe.fr>
-Commit: Mike Frysinger <vapier@gmail.com>
-
-    Update user-guide.md
-    
-    Add missing underscore.
-
-commit 2355f1a3f2a4fd62cac6d9af0e94c8731acd4c0f
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    supervise-daemon: only log debug logs when verbose mode is active
-
-commit fbec1eed51c85c53b39f97a213479caa0a2b75ab
-Author: Manuel Rüger <manuel@rueg.eu>
-Commit: Manuel Rüger <manuel@rueg.eu>
-
-    .cirrus.yml: Update FreeBSD releases
-    
-    Signed-off-by: Manuel Rüger <manuel@rueg.eu>
-
-commit 229692cc3424e95d8185e6c681b76c0dc88899f9
-Author: Austin English <austinenglish@gmail.com>
-Commit: Mike Frysinger <vapier@gmail.com>
-
-    man/openrc-run.8: fix a typo
-
-commit 375ef42393f3dc6edbaa2cb70c79b2366072db38
-Author: Sergei Trofimovich <slyfox@gentoo.org>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    src/rc/rc-logger.h: fix build failure against gcc-10
-    
-    On gcc-10 (and gcc-9 -fno-common) build fails as:
-    
-    ```
-    cc  -L../librc -L../libeinfo -O2 -g -std=c99 -Wall -Wextra -Wimplicit -Wshadow \
-      -Wformat=2 -Wmissing-prototypes -Wmissing-declarations -Wmissing-noreturn \
-      -Wmissing-format-attribute -Wnested-externs -Winline -Wwrite-strings \
-      -Wcast-align -Wcast-qual -Wpointer-arith -Wdeclaration-after-statement \
-      -Wsequence-point -Werror=implicit-function-declaration    \
-      -Wl,-rpath=/lib   -o openrc rc.o rc-logger.o rc-misc.o rc-plugin.o _usage.o -lutil -lrc -leinfo -Wl,-Bdynamic -ldl
-    ld: rc-logger.o:/home/slyfox/dev/git/openrc/src/rc/rc-logger.h:16:
-      multiple definition of `rc_logger_pid'; rc.o:openrc/src/rc/rc-logger.h:16: first defined here
-    ld: rc-logger.o:/home/slyfox/dev/git/openrc/src/rc/rc-logger.h:17:
-      multiple definition of `rc_logger_tty'; rc.o:openrc/src/rc/rc-logger.h:17: first defined here
-    ```
-    
-    gcc-10 will change the default from -fcommon to fno-common:
-    https://gcc.gnu.org/PR85678.
-    
-    The error also happens if CFLAGS=-fno-common passed explicitly.
-    
-    This fixes #348.
-
-commit 6deda13754f1b60245945e953cce8d97e40e86fc
-Author: Wolf <wolf@wolfsden.cz>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    supervise-daemon: Fix segfault when executable does not exist
-    
-    When executable is provided just by name (and therefore searched in a
-    path), exec_file is reset to NULL every time. exists() handles it being
-    NULL just fine, but dereferencing it in eerror does not work.
-    
-    Fixes #326
-    Fixes #327
-
-commit eb610859519292c6164c4ba601d22e642c306beb
-Author: artoo <artoo@artixlinux.org>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    binfmt: ensure a file is ungegistered before registering
-    
-    This fixes #328
-
-commit 039845b742e40752b05ef9393d5a6959d55fe0b6
-Author: Andrew Scheller <github@loowis.durge.org>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    Fix typo in README
-    
-    This fixes #338
-
-commit a7e7fd2b37a7666f26c2d4de9386b2d04f583b41
-Author: Ethan Sommer <e5ten.arch@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    make grep usage POSIX compliant
-    
-    use grep -E instead of egrep
-    check for space or end of line instead of GNU-specific word boundary
-    
-    This fixes #345
-
-commit 12e147a107c6e27172734c660624343a3c092437
-Author: Jason Bowen <jbowen@infinitecactus.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    Delete stray text.
-    
-    It looks like some stray text was left at the bottom of the file:
-    ```
-    package.
-    migrating your system to openrc-init.
-    ```
-    There's a subsection on migrating a system to `openrc-ini`; perhaps this was
-    an embryonic section title?
-    
-    This fixes #347.
-
-commit fd852865e06a74ecf8b77ff534fa8053e020160f
-Author: William Hubbs <william.hubbs@sony.com>
-Commit: William Hubbs <william.hubbs@sony.com>
-
-    openrc-shutdown.c: typo fix
-
-commit 35ec935741ffb571cacf763dcca98661c0cfb296
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <william.hubbs@sony.com>
-
-    ci/travis.sh: run shellcheck on shell scripts
-
-commit 19cfd82dadf2e52299cf3752deb04562be52145c
-Author: Austin English <austinenglish@gmail.com>
-Commit: William Hubbs <william.hubbs@sony.com>
-
-    .travis.yml: install shellcheck
-
-commit 87cfad3d6cd619c6090e8209092448ae68279b0c
-Author: E5ten <ethancsommer@gmail.com>
-Commit: William Hubbs <william.hubbs@sony.com>
-
-    cgroup2_set_limits: verify that the cgroup2 path is a mount point
-    
-    prior to cgroups getting mounted, /sys/fs/cgroup will still exist,
-    but attempts to make directories in it will fail, change cgroup2_set_limits() to
-    verify that cgroups are mounted instead of just checking that /sys/fs/cgroup
-    exists.
-    
-    This fixes #307.
-    This fixes #321.
-
-commit 8e31614c4b6679fc1bc1f1d1e0779dcedd066a5a
-Author: William Hubbs <william.hubbs@sony.com>
-Commit: William Hubbs <william.hubbs@sony.com>
-
-    fix clang build

LICENSE

@@ -1,5 +1,5 @@
 Copyright (c) 2007-2008, Roy Marples <roy@marples.name>
-Copyright (c) 2007-2015, the OpenRC authors
+Copyright (c) 2007-2023, the OpenRC authors
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

Makefile

@@ -1,55 +0,0 @@
-# Copyright (c) 2007-2015 The OpenRC Authors.
-# See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
-#
-# This file is part of OpenRC. It is subject to the license terms in
-# the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
-# This file may not be copied, modified, propagated, or distributed
-# except according to the terms contained in the LICENSE file.
-
-TOP:=		${dir ${realpath ${firstword ${MAKEFILE_LIST}}}}
-MK=			${TOP}/mk
-
-include ${TOP}/Makefile.inc
-
-SUBDIR=		conf.d etc init.d local.d man scripts sh src support sysctl.d
-
-# Build bash completion or not
-MKBASHCOMP?=	no
-ifeq (${MKBASHCOMP},yes)
-SUBDIR+=	bash-completion
-endif
-
-# Build pkgconfig or not
-MKPKGCONFIG?=	yes
-ifeq (${MKPKGCONFIG},yes)
-SUBDIR+=	pkgconfig
-endif
-
-# Build zsh completion or not
-MKZSHCOMP?=	no
-ifeq (${MKZSHCOMP},yes)
-SUBDIR+=	zsh-completion
-endif
-
-# We need to ensure that runlevels is done last other than test
-SUBDIR+=	runlevels
-SUBDIR+=	test
-
-INSTALLAFTER=	_installafter
-
-include ${MK}/sys.mk
-include ${MK}/os.mk
-include ${MK}/subdir.mk
-include ${MK}/dist.mk
-include ${MK}/gitver.mk
-
-_installafter:
-ifeq (${MKPREFIX},yes)
-	${INSTALL} -d ${DESTDIR}/${LIBEXECDIR}/init.d
-else ifneq (${OS},Linux)
-	${INSTALL} -d ${DESTDIR}/${LIBEXECDIR}/init.d
-endif
-	${INSTALL} -d ${DESTDIR}/${LIBEXECDIR}/tmp
-	${ECHO} "${VERSION}${GITVER}" > ${DESTDIR}/${LIBEXECDIR}/version

Makefile.inc

@@ -1,3 +0,0 @@
-NAME=		openrc
-VERSION=	0.43
-PKG=		${NAME}-${VERSION}

NEWNET.md

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

NEWS.md

@@ -4,11 +4,135 @@ 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.54
+
+This release drops the support for the split-usr build option.
+Also, it drops the support for ncurses/termcap and uses ansi codes
+directly for color support on terminals that support them.
+
+## OpenRC 0.53
+
+The names of cgroups for services started by OpenRC are now prefixed by
+"openrc." This is done because some services, like docker, create their
+own cgroups.
+
+It is now possible to override the mount options used to mount the
+cgroups filesystems.
+## OpenRC 0.52
+
+This release drops the "runscript" and "rc" binaries.
+These binaries have been deprecated for multiple years, so it should be
+fine to remove them at this point.
+
+There was an issue before this release with the default setting for
+cgroups being inconsistent. This is fixed.
+
+Start-stop-daemon did not work correctly on Linux 6.6 systems.
+This has been fixed in this release as well.
+
+## OpenRC 0.51
+
+The default RC_CGROUP_MODE has been updated to unified.
+This benefits users since it will assign each service to its own cgroup,
+making resource nanagement better over all.
+
+OUTPUT_LOGGER and ERROR_LOGGER have been implemented for
+supervise-daemon. For mor einformation on these settings, please check
+the man page.
+
+## OpenRC 0.50
+
+This is a bug fix release which fixes a significant performance issue on
+musl libc systems.
+
+## OpenRC 0.49
+
+This release adds support for glibc's builtin 
+strlcpy, strlcat etc functions, which will be in posix next.
+Also, it fixes completions.
+
+
+## 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 xystems, we do
+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.
@@ -97,7 +221,7 @@ using modules-load in  your dependencies.
 
 The consolefont, keymaps, numlock and procfs service scripts no longer
 have a dependency on localmount.
-If you are a linux user and are still separaating / from /usr,
+If you are a linux user and are still separating / from /usr,
 you will need to add the following line to the appropriate conf.d files:
 
 rc_need="localmount"

README.md

@@ -4,65 +4,21 @@ OpenRC README
 OpenRC is a dependency-based init system that works with the
 system-provided init program, normally `/sbin/init`.
 
-## Installation
+## building and installing
 
-OpenRC requires GNU make.
-
-Once you have GNU Make installed, the default OpenRC installation can be
-executed using this command:
-
-`make install`
-
-## Configuration
-
-You may wish to configure the installation by passing one or more of the
-below arguments to the make command
-
-```
-PROGLDFLAGS=-static
-LIBNAME=lib64
-DESTDIR=/tmp/openrc-image
-MKBASHCOMP=no
-MKNET=no
-MKPAM=pam
-MKPREFIX=yes
-MKPKGCONFIG=no
-MKSELINUX=yes
-MKSTATICLIBS=no
-MKSYSVINIT=yes
-MKTERMCAP=ncurses
-MKTERMCAP=termcap
-MKZSHCOMP=no
-PKG_PREFIX=/usr/pkg
-LOCAL_PREFIX=/usr/local
-PREFIX=/usr/local
-BRANDING=\"Gentoo/$(uname -s)\"
-SH=/bin/sh
-```
+OpenRC uses the  [meson](http://mesonbuild.com) build system, so use the
+usual methods for this build system to build and install.
 
 ## Notes
 
 We don't support building a static OpenRC with PAM.
 
-You may need to use `PROGLDFLAGS=-Wl,-Bstatic` on glibc instead of just `-static`.
-
-If you are building OpenRC for a Gentoo Prefix installation, add `MKPREFIX=yes`.
-
 `PKG_PREFIX` should be set to where packages install to by default.
 
 `LOCAL_PREFIX` should be set to where user maintained packages are.
 Only set `LOCAL_PREFIX` if different from `PKG_PREFIX`.
 
-`PREFIX` should be set when OpenRC is not installed to /.
-
-If any of the following files exist then we do not overwrite them
-
-```
-/etc/devd.conf
-/etc/rc
-/etc/rc.shutdown
-/etc/conf.d/*
-```
+`ROOTPREFIX` should be set when the root path is different from '/'.
 
 `rc` and `rc.shutdown` are the hooks from the BSD init into OpenRC.
 
@@ -76,18 +32,21 @@ Obviously, if you're installing this onto a system that does not use
 OpenRC by default then you may wish to backup the above listed files,
 remove them and then install so that the OS hooks into OpenRC.
 
+## Discussions
+
+We are testing [discussions](https://github.com/OpenRC/openrc/discussions), so
+feel free to open topics there.
+
 ## Reporting Bugs
 
-Please report issues on our github bug tracker [1].
+Please report bugs on our [bug tracker](http://github.com/OpenRC/openrc/issues).
 
-Better yet, if you can contribute code, please feel free to submit pull
-requests [2].
+If you can contribute code , please feel free to do so by opening
+[pull requests](https://github.com/OpenRC/openrc/pulls).
 
 ## IRC Channel
 
-We have an official irc channel, #openrc on freenode, feel free to join
-us there.
+We have an official irc channel, #openrc on the libera network.
+Please connect your irc client to irc.libera.chat and join #openrc on
+that network.
 
-[1]	https://github.com/openrc/openrc/issues
-
-[2]	https://github.com/openrc/openrc/pulls

bash-completion/Makefile

@@ -1,11 +0,0 @@
-DIR=	${BASHCOMPDIR}
-CONF=	openrc \
-		openrc-service-script \
-		rc-service \
-		rc-status \
-		rc-update \
-
-MK=	../mk
-include ${MK}/os.mk
-
-include ${MK}/scripts.mk

bash-completion/meson.build

@@ -0,0 +1,12 @@
+if get_option('bash-completions')
+bash_completions = [
+  'openrc',
+  'openrc-service-script',
+  'rc-service',
+  'rc-status',
+  'rc-update',
+  ]
+
+install_data(bash_completions,
+  install_dir : get_option('datadir') / 'bash-completion/completions')
+endif

bash-completion/openrc

@@ -1,10 +1,10 @@
 # Copyright (c) 2017 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+# https://github.com/OpenRC/openrc/blob/HEAD/AUTHORS
 #
 # This file is part of OpenRC. It is subject to the license terms in
 # the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.
 

bash-completion/openrc-service-script

@@ -1,10 +1,10 @@
 # Copyright (c) 2017 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+# https://github.com/OpenRC/openrc/blob/HEAD/AUTHORS
 #
 # This file is part of OpenRC. It is subject to the license terms in
 # the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.
 

bash-completion/rc-service

@@ -1,10 +1,10 @@
 # Copyright (c) 2017 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+# https://github.com/OpenRC/openrc/blob/HEAD/AUTHORS
 #
 # This file is part of OpenRC. It is subject to the license terms in
 # the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.
 
@@ -85,29 +85,26 @@ _rc_service()
 	else
 		# no option was typed
 		if [[ ${COMP_CWORD} -eq 1 ]]; then			  # if first word typed
-			words="$(rc-service --list | grep ^${cur})"		  # complete for init scripts
-			COMPREPLY=($(for i in ${words} ; do \
-			[[ ${i} == ${cur}* ]] && echo ${i} ; \
+			# 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
-		words="$(rc-service --list | grep ^${cur})"
-		COMPREPLY=($(for i in ${words} ; do \
-			[[ ${i} == ${cur}* ]] && echo ${i} ; \
+		COMPREPLY=($(for i in $(rc-service --list) ; do \
+			[[ ${i} == "${cur}"* ]] && echo ${i} ; \
 		done))
 		return 0
 	fi

bash-completion/rc-status

@@ -1,10 +1,10 @@
 # Copyright (c) 2017 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+# https://github.com/OpenRC/openrc/blob/HEAD/AUTHORS
 #
 # This file is part of OpenRC. It is subject to the license terms in
 # the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.
 

bash-completion/rc-update

@@ -1,10 +1,10 @@
 # Copyright (c) 2017 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+# https://github.com/OpenRC/openrc/blob/HEAD/AUTHORS
 #
 # This file is part of OpenRC. It is subject to the license terms in
 # the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.
 

ci/cirrus.sh

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

ci/travis.sh

@@ -1,11 +1,11 @@
 #!/bin/bash
 # Copyright (c) 2007-2018 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+# https://github.com/OpenRC/openrc/blob/HEAD/AUTHORS
 #
 # This file is part of OpenRC. It is subject to the license terms in
 # the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.
 

conf.d/Makefile

@@ -1,20 +0,0 @@
-include ../mk/net.mk
-
-DIR=	${CONFDIR}
-CONF=	bootmisc fsck hostname localmount netmount swap urandom ${CONF-${OS}}
-
-ifeq (${MKNET},yes)
-CONF+= network staticroute
-endif
-
-MK=	../mk
-include ${MK}/os.mk
-
-CONF-FreeBSD=	ipfw modules moused powerd rarpd savecore syscons
-
-CONF-Linux=	agetty consolefont devfs dmesg hwclock keymaps killprocs modules \
-	mtab net-online
-
-CONF-NetBSD=	moused rarpd savecore
-
-include ${MK}/scripts.mk

conf.d/cgroups

@@ -0,0 +1,2 @@
+# override cgroup mount options
+#cgroup_opts=nodev,noexec,nosuid

conf.d/fsck

@@ -8,7 +8,7 @@
 # We can also specify the passno in /etc/fstab to check
 # If you multiplex fsck (ie ln -s fsck /etc/init.d/fsck.late) then you can
 # do an fsck outside of the normal scope, say for /home.
-# Here are some exampes:-
+# Here are some examples:-
 #fsck_passno="=1 =2"
 #fsck_passno=">1"
 #fsck_passno="<2"

conf.d/hostname

@@ -1,2 +1,2 @@
-# Set to the hostname of this machine
+# Hostname fallback if /etc/hostname does not exist
 hostname="localhost"

conf.d/ipfw

@@ -1,6 +1,6 @@
 # ipfw provides a stateful firewall.
 # This means we allow everything out, and if we have a connection we allow it
-# back in. This is very flexable and quite secure.
+# back in. This is very flexible and quite secure.
 
 # For ease of use, we allow auth and ssh ports through as well.
 # To override the list of allowed ports

conf.d/killprocs

@@ -4,3 +4,8 @@
 # The setting is called killall5_opts because the options here are meant
 # to be identical to those you could pass to killall5.
 killall5_opts=""
+
+# If you need to delay after each kill attempt during shutdown, set the amount
+# of time you need to delay here. This gets passed directly to sleep in
+# the shell.
+# kill_delay=0

conf.d/meson.build

@@ -0,0 +1,62 @@
+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)

conf.d/network

@@ -1,5 +1,5 @@
 # Assign static IP addresses and run custom scripts per interface.
-# Seperate commands with ;
+# Separate commands with ;
 # Prefix with ! to run a shell script.
 # Use \$int to represent the interface
 #ifconfig_eth0="192.168.0.10 netmask 255.255.255.0"

conf.d/powerd

@@ -3,5 +3,5 @@
 powerd_ac_mode="maximum"
 #powerd_battery_mode="minimum"
 
-# Addiditonal arguments for powerd - see the man page for details
+# Additional arguments for powerd - see the man page for details
 powerd_args=""

conf.d/seedrng

@@ -0,0 +1,14 @@
+# The convention in this file is to show the default settings commented out.
+#
+# Sometimes you want to have urandom start before "localmount" (say for crypt
+# swap), so you will need to customize this behavior.  If you have /var on a
+# separate partition, make sure paths under /var are adjusted to point to
+# locations on your root device.
+#
+# Set skip_credit to yes or true if you do not want seed files to actually
+# credit the random number generator. For example, you should set this if you
+# plan to replicate the file system image without removing the contents of
+# ${seed_dir}.
+#
+# seed_dir=/var/lib/seedrng
+# skip_credit=no

conf.d/swclock

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

etc/.gitignore

@@ -1,2 +0,0 @@
-rc
-rc.shutdown

etc/Makefile

@@ -1,23 +0,0 @@
-DIR=	${SYSCONFDIR}
-SRCS=	rc.in rc.shutdown.in
-BIN=	${BIN-${OS}}
-CONF=	rc.conf ${BIN-${OS}}
-
-MK=	../mk
-include ${MK}/os.mk
-
-SED_EXTRA-FreeBSD=	-e 's:@TERM@:cons25:g'
-BIN-FreeBSD=		rc rc.shutdown rc.devd
-CONF-FreeBSD=		devd.conf
-
-SED_EXTRA-Linux=	-e 's:@TERM@:wsvt25:g'
-BIN-Linux=
-CONF-Linux=
-
-SED_EXTRA-NetBSD=	-e 's:@TERM@:wsvt25:g'
-BIN-NetBSD=		rc rc.shutdown
-CONF-NetBSD=
-
-SED_EXTRA=	${SED_EXTRA-${OS}}
-
-include ${MK}/scripts.mk

etc/meson.build

@@ -0,0 +1,44 @@
+etc_conf_data = configuration_data()
+if os == 'FreeBSD'
+  etc_conf_data.set('TERM', 'cons25')
+elif os == 'Linux'
+  etc_conf_data.set('TERM', 'wsvt25')
+endif
+
+etc_conf_common = [
+  'rc.conf',
+  ]
+
+etc_bin_FreeBSD = [
+  'rc.devd',
+  ]
+
+etc_conf_FreeBSD = [
+  'devd.conf',
+  ]
+
+etc_bin_NetBSD =  [
+  'rc.in',
+  'rc.shutdown.in',
+  ]
+
+install_data(etc_conf_common,
+  install_dir : get_option('sysconfdir'))
+
+  if os == 'FreeBSD'
+  install_data(etc_bin_FreeBSD,
+    install_dir : get_option('sysconfdir'),
+    install_mode: 'rwxr-xr-x')
+  install_data(etc_conf_FreeBSD,
+    install_dir : get_option('sysconfdir'))
+endif
+
+if os == 'FreeBSD' or os == 'NetBSD'
+  foreach file : etc_bin_NetBSD
+    configure_file(input : file,
+      output : '@BASENAME@',
+      configuration : etc_conf_data,
+      install_dir: get_option('sysconfdir'),
+      install_mode: 'rwxr-xr-x')
+  endforeach
+endif

etc/rc.conf

@@ -88,8 +88,8 @@
 # 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"
+# 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.
@@ -97,8 +97,8 @@
 
 # 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
+# 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.
@@ -116,10 +116,13 @@
 
 # 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"
+# 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.
-#SSD_IONICELEVEL="2:2"
+#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
@@ -196,7 +199,7 @@ rc_tty_number=12
 # 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"
+#rc_cgroup_mode="unified"
 
 # This is a list of controllers which should be enabled for cgroups version 2
 # when hybrid mode is being used.
@@ -288,7 +291,9 @@ rc_tty_number=12
 # To perform this cleanup manually for a stopped service, you can
 # execute cgroup_cleanup with /etc/init.d/<service> cgroup_cleanup or
 # rc-service <service> cgroup_cleanup.
-# The process followed in this cleanup is the following:
+# If the kernel includes support for cgroup2's cgroup.kill, this is used
+# to reliably teardown the cgroup.
+# If this fails, the process followed in this cleanup is the following:
 # 1. send stopsig (sigterm if it isn't set) to all processes left in the
 # cgroup immediately followed by sigcont.
 # 2. Send sighup to all processes in the cgroup if rc_send_sighup is

etc/rc.devd

@@ -1,11 +1,11 @@
 #!/bin/sh
 # Copyright (c) 2007-2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+# https://github.com/OpenRC/openrc/blob/HEAD/AUTHORS
 #
 # This file is part of OpenRC. It is subject to the license terms in
 # the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 #    except according to the terms contained in the LICENSE file.
 
@@ -26,7 +26,7 @@ getmedia() {
 if [ ! -e /etc/init.d/"$1" -a ! -e /usr/local/init.d/"$1" ]; then
 	base=${1%%.*}
 	if [ "${base}" = "net" ]; then
-		# We only create links for pyhsical interfaces
+		# We only create links for physical interfaces
 		[ -n "$(getmedia ${1#*.})" ] || exit 1
 		base="net.lo0"
 	fi

etc/rc.in

@@ -1,11 +1,11 @@
 #!/bin/sh
 # Copyright (c) 2007-2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+# https://github.com/OpenRC/openrc/blob/HEAD/AUTHORS
 #
 # This file is part of OpenRC. It is subject to the license terms in
 # the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 #    except according to the terms contained in the LICENSE file.
 

etc/rc.shutdown.in

@@ -1,11 +1,11 @@
 #!/bin/sh
 # Copyright (c) 2007-2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+# https://github.com/OpenRC/openrc/blob/HEAD/AUTHORS
 #
 # This file is part of OpenRC. It is subject to the license terms in
 # the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 #    except according to the terms contained in the LICENSE file.
 

init.d/.gitignore

@@ -1,51 +0,0 @@
-agetty
-binfmt
-cgroups
-modules-load
-bootmisc
-fsck
-hostname
-local
-localmount
-loopback
-moused
-netmount
-network
-root
-savecache
-swap
-sysctl
-urandom
-devfs
-dmesg
-hwclock
-consolefont
-keymaps
-killprocs
-modules
-mount-ro
-mtab
-net-online
-numlock
-osclock
-procfs
-s6-svscan
-staticroute
-sysfs
-devdb
-hostid
-newsyslog
-pf
-rarpd
-rc-enabled
-rpcbind
-runsvdir
-savecore
-save-keymaps
-save-termencoding
-swap-blk
-swclock
-syslogd
-termencoding
-ttys
-wscons

init.d/Makefile

@@ -1,37 +0,0 @@
-include ../mk/net.mk
-
-DIR=	${INITDIR}
-SRCS=	bootmisc.in fsck.in hostname.in local.in localmount.in loopback.in \
-	netmount.in osclock.in root.in savecache.in swap.in swclock.in \
-	sysctl.in runsvdir.in urandom.in s6-svscan.in ${SRCS-${OS}}
-BIN=	${OBJS}
-
-# Are we installing our network scripts?
-ifeq (${MKNET},yes)
-SRCS+= network.in staticroute.in
-endif
-
-MK=	../mk
-include ${MK}/os.mk
-
-# Generic BSD scripts
-SRCS-FreeBSD=	hostid.in modules.in moused.in newsyslog.in pf.in rarpd.in \
-		rc-enabled.in rpcbind.in savecore.in syslogd.in
-# These are FreeBSD specific
-SRCS-FreeBSD+=	adjkerntz.in devd.in dumpon.in encswap.in ipfw.in \
-		mixer.in nscd.in powerd.in syscons.in
-
-SRCS-Linux=	agetty.in binfmt.in devfs.in cgroups.in dmesg.in hwclock.in \
-	consolefont.in keymaps.in killprocs.in modules.in \
-	mount-ro.in mtab.in numlock.in procfs.in net-online.in save-keymaps.in \
-	save-termencoding.in sysfs.in termencoding.in
-
-# Generic BSD scripts
-SRCS-NetBSD=	hostid.in moused.in newsyslog.in pf.in rarpd.in rc-enabled.in \
-		rpcbind.in savecore.in syslogd.in
-# These are NetBSD specific
-SRCS-NetBSD+=	devdb.in swap-blk.in ttys.in wscons.in
-
-include ${MK}/scripts.mk
-
-_installafter_: realinstall

init.d/adjkerntz.in

@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # Copyright (c) 2007-2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+# https://github.com/OpenRC/openrc/blob/HEAD/AUTHORS
 #
 # This file is part of OpenRC. It is subject to the license terms in
 # the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.
 

init.d/agetty.in

@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # Copyright (c) 2017 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+# https://github.com/OpenRC/openrc/blob/HEAD/AUTHORS
 #
 # This file is part of OpenRC. It is subject to the license terms in
 # the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.
 
@@ -25,7 +25,7 @@ depend() {
 }
 
 start_pre() {
-	if [ -z "$port" ]; then
+	if [ "$port" = "$RC_SVCNAME" ]; then
 		eerror "${RC_SVCNAME} cannot be started directly. You must create"
 		eerror "symbolic links to it for the ports you want to start"
 		eerror "agetty on and add those to the appropriate runlevels."

init.d/binfmt.in

@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # Copyright (c) 2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+# https://github.com/OpenRC/openrc/blob/HEAD/AUTHORS
 #
 # This file is part of OpenRC. It is subject to the license terms in
 # the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.
 

init.d/bootmisc.in

@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # Copyright (c) 2007-2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+# https://github.com/OpenRC/openrc/blob/HEAD/AUTHORS
 #
 # This file is part of OpenRC. It is subject to the license terms in
 # the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.
 
@@ -113,8 +113,10 @@ migrate_to_run()
  		rm $src
  	elif [ ! -L $src -a -d $src ]; then
  		ebegin "Migrating $src to $dst"
- 		cp -a $src/* $dst/
- 		rm -rf $src
+ 		if ! rmdir $src 2>/dev/null; then
+ 			cp -a $src/* $dst/
+ 			rm -rf $src
+ 		fi
  		eend $?
  	fi
  	# If $src doesn't exist at all, just run this
@@ -224,7 +226,7 @@ start()
 			case "$RC_SYS" in
 				VSERVER|OPENVZ|LXC|SYSTEMD-NSPAWN) ;;
 				*)
-					if yesno ${previous_dmesg:-no}; then
+					if yesno ${previous_dmesg:-no} && [ -e /var/log/dmesg ]; then
 						mv /var/log/dmesg /var/log/dmesg.old
 					fi
 					dmesg > /var/log/dmesg

init.d/cgroups.in

@@ -1,17 +1,17 @@
 #!@SBINDIR@/openrc-run
 # Copyright (c) 2017 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+# https://github.com/OpenRC/openrc/blob/HEAD/AUTHORS
 #
 # This file is part of OpenRC. It is subject to the license terms in
 # the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.
 
 description="Mount the control groups."
 
-cgroup_opts=nodev,noexec,nosuid
+: "${cgroup_opts:="nodev,noexec,nosuid"}"
 
 depend()
 {
@@ -87,7 +87,7 @@ cgroup2_controllers()
 	[ ! -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
+	case "${rc_cgroup_mode:-unified}" in
 		unified)
 			echo "+${x}"  > "${cgroup_path}/cgroup.subtree_control"
 			;;
@@ -128,7 +128,7 @@ cgroups_unified()
 
 mount_cgroups()
 {
-	case "${rc_cgroup_mode:-hybrid}" in
+	case "${rc_cgroup_mode:-unified}" in
 	hybrid) cgroups_hybrid ;;
 	legacy) cgroups_legacy ;;
 	unified) cgroups_unified ;;

init.d/consolefont.in

@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # Copyright (c) 2007-2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+# https://github.com/OpenRC/openrc/blob/HEAD/AUTHORS
 #
 # This file is part of OpenRC. It is subject to the license terms in
 # the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.
 

init.d/devd.in

@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # Copyright (c) 2007-2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+# https://github.com/OpenRC/openrc/blob/HEAD/AUTHORS
 #
 # This file is part of OpenRC. It is subject to the license terms in
 # the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.
 

init.d/devdb.in

@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # Copyright (c) 2008-2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+# https://github.com/OpenRC/openrc/blob/HEAD/AUTHORS
 #
 # This file is part of OpenRC. It is subject to the license terms in
 # the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.
 

init.d/devfs.in

@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # Copyright (c) 2007-2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+# https://github.com/OpenRC/openrc/blob/HEAD/AUTHORS
 #
 # This file is part of OpenRC. It is subject to the license terms in
 # the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.
 
@@ -24,8 +24,9 @@ mount_dev()
 	action=--mount
 	conf_d_dir="${RC_SERVICE%/*/*}/conf.d"
 	msg=Mounting
-	# Some devices require exec, Bug #92921
-	mountopts="exec,nosuid,mode=0755"
+	# Some devices require exec, https://bugs.gentoo.org/92921
+	# Users with such requirements can use an fstab entry for /dev
+	mountopts="noexec,nosuid,mode=0755"
 	if yesno ${skip_mount_dev:-no} ; then
 		einfo "/dev will not be mounted due to user request"
 		return 0

init.d/dmesg.in

@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # Copyright (c) 2007-2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+# https://github.com/OpenRC/openrc/blob/HEAD/AUTHORS
 #
 # This file is part of OpenRC. It is subject to the license terms in
 # the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.
 

init.d/dumpon.in

@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # Copyright (c) 2007-2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+# https://github.com/OpenRC/openrc/blob/HEAD/AUTHORS
 #
 # This file is part of OpenRC. It is subject to the license terms in
 # the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.
 

init.d/fsck.in

@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # Copyright (c) 2007-2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+# https://github.com/OpenRC/openrc/blob/HEAD/AUTHORS
 #
 # This file is part of OpenRC. It is subject to the license terms in
 # the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.
 
@@ -106,7 +106,7 @@ start()
 			_abort
 		fi;;
 	4)	if [ "$RC_UNAME" = Linux ]; then
-			ewend 1 "Fileystem errors left uncorrected, aborting"
+			ewend 1 "Filesystem errors left uncorrected, aborting"
 			_abort
 		else
 		 	ewend 1 "Filesystems repaired, but reboot needed"

init.d/hostid.in

@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # Copyright (c) 2007-2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+# https://github.com/OpenRC/openrc/blob/HEAD/AUTHORS
 #
 # This file is part of OpenRC. It is subject to the license terms in
 # the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.
 

init.d/hostname.in

@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # Copyright (c) 2007-2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+# https://github.com/OpenRC/openrc/blob/HEAD/AUTHORS
 #
 # This file is part of OpenRC. It is subject to the license terms in
 # the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.
 
@@ -19,20 +19,18 @@ depend()
 
 start()
 {
-	local h source x
-	if [ -s /etc/hostname ] && [ -r /etc/hostname ]; then
-		read h x </etc/hostname
-		source="from /etc/hostname"
-	else
-		# HOSTNAME variable used to be defined in caps in conf.d/hostname.
-		# It is also a magic variable in bash.
-		h=${hostname:-${HOSTNAME}} # checkbashisms: false positive (HOSTNAME var)
+	local h source
+	if read -r h _ 2> /dev/null < @SYSCONFDIR@/hostname; then
+		source="@SYSCONFDIR@/hostname"
+	elif [ -n "${hostname}" ]; then
+		h=${hostname}
+		source="@SYSCONFDIR@/conf.d/${RC_SVCNAME}"
 	fi
 	if [ -z "$h" ]; then
 		einfo "Using default system hostname"
 		return 0
 	fi
-	ebegin "Setting hostname to $h $source"
+	ebegin "Setting hostname to $h from $source"
 	hostname "$h"
 	eend $? "Failed to set the hostname"
 }

init.d/hwclock.in

@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # Copyright (c) 2007-2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+# https://github.com/OpenRC/openrc/blob/HEAD/AUTHORS
 #
 # This file is part of OpenRC. It is subject to the license terms in
 # the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.
 
@@ -72,7 +72,7 @@ get_noadjfile()
 {
 	if ! yesno $clock_adjfile; then
 		# Some implementations don't handle adjustments
-		if LC_ALL=C hwclock --help 2>&1 | grep -q "\-\-noadjfile"; then
+		if LC_ALL=C hwclock --help 2>&1 | grep -q -e "--noadjfile"; then
 			echo --noadjfile
 		fi
 	fi

init.d/ipfw.in

@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # Copyright (c) 2007-2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+# https://github.com/OpenRC/openrc/blob/HEAD/AUTHORS
 #
 # This file is part of OpenRC. It is subject to the license terms in
 # the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.
 
@@ -122,7 +122,7 @@ start() {
 		ipfw add deny { tcp or udp } from any to any $p in
 	done
 
-	# Broadcasts and muticasts
+	# Broadcasts and multicasts
 	ipfw add deny ip from any to 255.255.255.255
 	ipfw add deny ip from any to 224.0.0.0/24
 

init.d/keymaps.in

@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # Copyright (c) 2007-2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+# https://github.com/OpenRC/openrc/blob/HEAD/AUTHORS
 #
 # This file is part of OpenRC. It is subject to the license terms in
 # the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.
 
@@ -42,7 +42,7 @@ start()
 	fi
 
 	local wkeys= kmode="-a" msg="ASCII"
-	if yesno $unicode; then
+	if yesno ${unicode:-yes}; then
 		kmode="-u"
 		msg="UTF-8"
 	fi

init.d/killprocs.in

@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # Copyright (c) 2007-2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+# https://github.com/OpenRC/openrc/blob/HEAD/AUTHORS
 #
 # This file is part of OpenRC. It is subject to the license terms in
 # the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.
 
@@ -20,8 +20,10 @@ start()
 {
 	ebegin "Terminating remaining processes"
 	kill_all 15 ${killall5_opts}
+	sleep ${kill_delay:-0}
 	eend 0
 	ebegin "Killing remaining processes"
+	sleep ${kill_delay:-0}
 	kill_all 9 ${killall5_opts}
 	eend 0
 }

init.d/local.in

@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # Copyright (c) 2007-2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+# https://github.com/OpenRC/openrc/blob/HEAD/AUTHORS
 #
 # This file is part of OpenRC. It is subject to the license terms in
 # the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.
 

init.d/localmount.in

@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # Copyright (c) 2007-2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+# https://github.com/OpenRC/openrc/blob/HEAD/AUTHORS
 #
 # This file is part of OpenRC. It is subject to the license terms in
 # the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.
 
@@ -13,9 +13,9 @@ description="Mounts disks and swap according to /etc/fstab."
 
 depend()
 {
-	need fsck
-	use lvm modules root
-	after clock lvm modules root
+	need fsck root
+	use lvm modules
+	after clock lvm modules
 	keyword -docker -jail -lxc -prefix -systemd-nspawn -vserver
 }
 

init.d/loopback.in

@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # Copyright (c) 2013-2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+# https://github.com/OpenRC/openrc/blob/HEAD/AUTHORS
 #
 # This file is part of OpenRC. It is subject to the license terms in
 # the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.
 

init.d/meson.build

@@ -0,0 +1,101 @@
+init_d_dir = get_option('sysconfdir') / 'init.d'
+
+init_common =  [
+  'bootmisc.in',
+  'fsck.in',
+  'hostname.in',
+  'local.in',
+  'localmount.in',
+  'loopback.in',
+  'netmount.in',
+  'osclock.in',
+  'root.in',
+  'savecache.in',
+  'swap.in',
+  'swclock.in',
+  'sysctl.in',
+  'runsvdir.in',
+  's6-svscan.in',
+  ]
+
+if get_option('newnet')
+  init_common = init_common + [
+    'network.in',
+    'staticroute.in',
+    ]
+endif
+
+init_Linux =  [
+  'agetty.in',
+  'binfmt.in',
+  'cgroups.in',
+  'consolefont.in',
+  'devfs.in',
+  'dmesg.in',
+  'hwclock.in',
+  'keymaps.in',
+  'killprocs.in',
+  'modules.in',
+  'mount-ro.in',
+  'mtab.in',
+  'numlock.in',
+  'procfs.in',
+  'net-online.in',
+  'save-keymaps.in',
+  'save-termencoding.in',
+  'seedrng.in',
+  'sysfs.in',
+  'termencoding.in',
+  ]
+
+init_BSD =  [
+  'hostid.in',
+  'moused.in',
+  'newsyslog.in',
+  'pf.in',
+  'rarpd.in',
+  'rc-enabled.in',
+  'rpcbind.in',
+  'savecore.in',
+  'syslogd.in',
+  'urandom.in',
+  ]
+
+init_FreeBSD =  [
+  'adjkerntz.in',
+  'devd.in',
+  'dumpon.in',
+  'encswap.in',
+  'ipfw.in',
+  'modules.in',
+  'mixer.in',
+  'nscd.in',
+  'powerd.in',
+  'syscons.in',
+  ]
+
+init_NetBSD =  [
+  'devdb.in',
+  'swap-blk.in',
+  'ttys.in',
+  'wscons.in',
+  ]
+
+init_data = init_common
+if os == 'Dragonfly'
+  init_data = init_data + init_BSD
+elif os == 'FreeBSD' or os == 'Gnu-kFreeBSD'
+  init_data = init_data + init_BSD + init_FreeBSD
+elif os == 'Linux'
+  init_data = init_data + init_Linux
+elif os == 'NetBSD'
+  init_data = init_data + init_BSD + init_NetBSD
+  endif
+
+foreach init_d_file : init_data
+  configure_file(input : init_d_file,
+    output : '@BASENAME@',
+    configuration : init_d_conf_data,
+    install_dir: init_d_dir,
+    install_mode: 'rwxr-xr-x')
+endforeach

init.d/mixer.in

@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # Copyright (c) 2007-2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+# https://github.com/OpenRC/openrc/blob/HEAD/AUTHORS
 #
 # This file is part of OpenRC. It is subject to the license terms in
 # the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.
 

init.d/modules.in

@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # Copyright (c) 2007-2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+# https://github.com/OpenRC/openrc/blob/HEAD/AUTHORS
 #
 # This file is part of OpenRC. It is subject to the license terms in
 # the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.
 
@@ -41,25 +41,25 @@ find_modfiles()
 
 load_modules()
 {
-	local file m modules rc x
+	local file m _modules rc x
 	file=$1
 	[ -z "$file" ] && return 0
 	while read m x; do
 		case $m in
 			\;*) continue ;;
 			\#*) continue ;;
-			*) modules="$modules $m"
+			*) _modules="$_modules $m"
 			;;
 		esac
 	done < $file
-	for x in $modules; do
+	for x in $_modules; do
 		ebegin "Loading module $x"
 		case "$RC_UNAME" in
 			FreeBSD) kldload "$x"; rc=$? ;;
-			Linux) modprobe --first-time -q --use-blacklist "$x"; rc=$? ;;
+			Linux) modprobe --first-time --use-blacklist --verbose "$x"; rc=$? ;;
 			*) ;;
 		esac
-		eend $rc "Failed to load $x"
+		eend
 	done
 	return 0
 }
@@ -80,9 +80,10 @@ FreeBSD_modules()
 	for x in $modules; do
 		ebegin "Loading module $x"
 		kldload "$x"
-		eend $? "Failed to load $x" && : $(( cnt += 1 ))
+		eend && : $(( cnt += 1 ))
 	done
 	einfo "Autoloaded $cnt module(s)"
+	return 0
 }
 
 Linux_modules()
@@ -122,6 +123,7 @@ Linux_modules()
 		eval modprobe --first-time --use-blacklist --verbose "$x" "$args"
 	done
 	[ -n "$list" ] && eend
+	return 0
 }
 
 start()

init.d/mount-ro.in

@@ -1,15 +1,15 @@
 #!@SBINDIR@/openrc-run
 # Copyright (c) 2007-2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+# https://github.com/OpenRC/openrc/blob/HEAD/AUTHORS
 #
 # This file is part of OpenRC. It is subject to the license terms in
 # the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.
 
-description="Re-mount filesytems read-only for a clean reboot."
+description="Re-mount filesystems read-only for a clean reboot."
 
 depend()
 {

init.d/moused.in

@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # Copyright (c) 2007-2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+# https://github.com/OpenRC/openrc/blob/HEAD/AUTHORS
 #
 # This file is part of OpenRC. It is subject to the license terms in
 # the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.
 

init.d/mtab.in

@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # Copyright (c) 2007-2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+# https://github.com/OpenRC/openrc/blob/HEAD/AUTHORS
 #
 # This file is part of OpenRC. It is subject to the license terms in
 # the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.
 

init.d/net-online.in

@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # Copyright (c) 2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+# https://github.com/OpenRC/openrc/blob/HEAD/AUTHORS
 #
 # This file is part of OpenRC. It is subject to the license terms in
 # the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.
 
@@ -68,6 +68,7 @@ start ()
 			ping -c 1 $ping_test_host > /dev/null 2>&1
 			rc=$?
 			[ $rc -eq 0 ] && break
+			sleep 1
 			: $((timeout -= 1))
 		done
 	fi

init.d/netmount.in

@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # Copyright (c) 2007-2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+# https://github.com/OpenRC/openrc/blob/HEAD/AUTHORS
 #
 # This file is part of OpenRC. It is subject to the license terms in
 # the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.
 

init.d/network.in

@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # Copyright (c) 2009-2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+# https://github.com/OpenRC/openrc/blob/HEAD/AUTHORS
 #
 # This file is part of OpenRC. It is subject to the license terms in
 # the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.
 

init.d/newsyslog.in

@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # Copyright (c) 2007-2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+# https://github.com/OpenRC/openrc/blob/HEAD/AUTHORS
 #
 # This file is part of OpenRC. It is subject to the license terms in
 # the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.
 

init.d/nscd.in

@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # Copyright (c) 2007-2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+# https://github.com/OpenRC/openrc/blob/HEAD/AUTHORS
 #
 # This file is part of OpenRC. It is subject to the license terms in
 # the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.
 

init.d/numlock.in

@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # Copyright (c) 2007-2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+# https://github.com/OpenRC/openrc/blob/HEAD/AUTHORS
 #
 # This file is part of OpenRC. It is subject to the license terms in
 # the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.
 

init.d/osclock.in

@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # Copyright (c) 2014-2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+# https://github.com/OpenRC/openrc/blob/HEAD/AUTHORS
 #
 # This file is part of OpenRC. It is subject to the license terms in
 # the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.
 

init.d/pf.in

@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # Copyright (c) 2007-2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+# https://github.com/OpenRC/openrc/blob/HEAD/AUTHORS
 #
 # This file is part of OpenRC. It is subject to the license terms in
 # the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.
 

init.d/powerd.in

@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # Copyright (c) 2007-2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+# https://github.com/OpenRC/openrc/blob/HEAD/AUTHORS
 #
 # This file is part of OpenRC. It is subject to the license terms in
 # the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.
 

init.d/procfs.in

@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # Copyright (c) 2007-2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+# https://github.com/OpenRC/openrc/blob/HEAD/AUTHORS
 #
 # This file is part of OpenRC. It is subject to the license terms in
 # the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.
 

init.d/rarpd.in

@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # Copyright (c) 2007-2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+# https://github.com/OpenRC/openrc/blob/HEAD/AUTHORS
 #
 # This file is part of OpenRC. It is subject to the license terms in
 # the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.
 

init.d/rc-enabled.in

@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # Copyright (c) 2007-2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+# https://github.com/OpenRC/openrc/blob/HEAD/AUTHORS
 #
 # This file is part of OpenRC. It is subject to the license terms in
 # the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.
 

init.d/root.in

@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # Copyright (c) 2007-2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+# https://github.com/OpenRC/openrc/blob/HEAD/AUTHORS
 #
 # This file is part of OpenRC. It is subject to the license terms in
 # the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.
 
@@ -49,9 +49,7 @@ start()
 	local mountpoint
 	for mountpoint in $(fstabinfo); do
 		case "${mountpoint}" in
-			/)
-			;;
-			/*)
+			/*) # Don't remount swap etc.
 				mountinfo -q "${mountpoint}" && \
 					fstabinfo --remount "${mountpoint}"
 			;;

init.d/rpcbind.in

@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # Copyright (c) 2007-2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+# https://github.com/OpenRC/openrc/blob/HEAD/AUTHORS
 #
 # This file is part of OpenRC. It is subject to the license terms in
 # the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.
 

init.d/runsvdir.in

@@ -1,17 +1,17 @@
 #!@SBINDIR@/openrc-run
 # Copyright (c) 2016 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+# https://github.com/OpenRC/openrc/blob/HEAD/AUTHORS
 #
 # This file is part of OpenRC. It is subject to the license terms in
 # the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.
 
+supervisor=supervise-daemon
 command=/usr/bin/runsvdir
-command_background=yes
-pidfile=/var/run/runsvdir.pid
+pidfile="/var/run/${RC_SVCNAME}.pid"
 command_args="-P $RC_SVCDIR/sv 'log: ...........................................................................................................................................................................................................................................................................................................................................................................................................'"
 
 start_pre()

init.d/s6-svscan.in

@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # Copyright (c) 2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+# https://github.com/OpenRC/openrc/blob/HEAD/AUTHORS
 #
 # This file is part of OpenRC. It is subject to the license terms in
 # the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.
 
@@ -21,9 +21,13 @@ depend()
 
 start_pre()
 {
-	einfo "Creating s6 scan directory"
-	checkpath -d -m 0755 "$RC_SVCDIR"/s6-scan
-	return $?
+	if [ ! -e "$command" ]; then
+		eerror "$command is missing (please install s6)"
+	else
+		einfo "Creating s6 scan directory"
+		checkpath -d -m 0755 "$RC_SVCDIR"/s6-scan
+	fi
+	return
 }
 
 stop_post()

init.d/save-keymaps.in

@@ -3,7 +3,7 @@
 #
 # This file is part of OpenRC. It is subject to the license terms in
 # the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.
 

init.d/save-termencoding.in

@@ -3,7 +3,7 @@
 #
 # This file is part of OpenRC. It is subject to the license terms in
 # the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.
 
@@ -25,7 +25,7 @@ start()
 	# Save the encoding for use immediately at boot
 	if checkpath -W "$RC_LIBEXECDIR"; then
 		mkdir -p "$RC_LIBEXECDIR"/console
-		if yesno ${unicode:-${UNICODE}}; then
+		if yesno ${unicode:-yes}; then
 			echo "" > "$RC_LIBEXECDIR"/console/unicode
 		else
 			rm -f "$RC_LIBEXECDIR"/console/unicode

init.d/savecache.in

@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # Copyright (c) 2007-2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+# https://github.com/OpenRC/openrc/blob/HEAD/AUTHORS
 #
 # This file is part of OpenRC. It is subject to the license terms in
 # the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.
 

init.d/savecore.in

@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # Copyright (c) 2007-2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+# https://github.com/OpenRC/openrc/blob/HEAD/AUTHORS
 #
 # This file is part of OpenRC. It is subject to the license terms in
 # the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.
 

init.d/seedrng.in

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

init.d/staticroute.in

@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # Copyright (c) 2009-2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+# https://github.com/OpenRC/openrc/blob/HEAD/AUTHORS
 #
 # This file is part of OpenRC. It is subject to the license terms in
 # the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.
 

init.d/swap-blk.in

@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # Copyright (c) 2007-2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+# https://github.com/OpenRC/openrc/blob/HEAD/AUTHORS
 #
 # This file is part of OpenRC. It is subject to the license terms in
 # the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.
 

init.d/swap.in

@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # Copyright (c) 2007-2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+# https://github.com/OpenRC/openrc/blob/HEAD/AUTHORS
 #
 # This file is part of OpenRC. It is subject to the license terms in
 # the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.
 

init.d/swclock.in

@@ -1,15 +1,16 @@
 #!@SBINDIR@/openrc-run
 # Copyright (c) 2009-2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+# https://github.com/OpenRC/openrc/blob/HEAD/AUTHORS
 #
 # This file is part of OpenRC. It is subject to the license terms in
 # the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.
 
 description="Sets the local clock to the mtime of a given file."
+swclock_file="${swclock_file:-/var/lib/misc/openrc-shutdowntime}"
 
 depend()
 {
@@ -22,7 +23,7 @@ depend()
 start()
 {
 	ebegin "Setting the local clock based on last shutdown time"
-	if ! swclock 2> /dev/null; then
+	if ! swclock "${swclock_file}" 2> /dev/null; then
 	swclock --warn @SBINDIR@/openrc-run
 	fi
 	eend $?
@@ -31,6 +32,6 @@ start()
 stop()
 {
 	ebegin "Saving the shutdown time"
-	swclock --save
+	swclock --save "${swclock_file}"
 	eend $?
 }

init.d/syscons.in

@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # Copyright (c) 2007-2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+# https://github.com/OpenRC/openrc/blob/HEAD/AUTHORS
 #
 # This file is part of OpenRC. It is subject to the license terms in
 # the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.
 

init.d/sysctl.in

@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # Copyright (c) 2007-2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+# https://github.com/OpenRC/openrc/blob/HEAD/AUTHORS
 #
 # This file is part of OpenRC. It is subject to the license terms in
 # the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.
 

init.d/sysfs.in

@@ -1,11 +1,11 @@
 #!@SBINDIR@/openrc-run
 # Copyright (c) 2007-2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+# https://github.com/OpenRC/openrc/blob/HEAD/AUTHORS
 #
 # This file is part of OpenRC. It is subject to the license terms in
 # the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.