Copyright update

This change was never discussed in the bug on the bug tracker. It is thus being removed.

This reverts commit 6b78f4c8e0.

ChangeLog

@@ -1,990 +0,0 @@
-commit bb4c14999c569781c7289269949b205955f376bb
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Date:   Tue Feb 3 10:53:48 2015 -0600
-
-    Add nfsclient to netmount use dependencies
-    
-    X-Gentoo-Bug: 537996
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=537996
-
-commit 252422dcf0c408742cdb039a8a7eb1732ea15b78
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Date:   Wed Feb 4 21:59:14 2015 -0600
-
-    start openrc-0.13.9
-
-commit a3a64ac94eaadb38dcb78f8c88437d8a1335fa07
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Date:   Sun Jan 18 09:45:32 2015 -0600
-
-    update ChangeLog
-
-commit 1a2f45a4c540c5ff29b8615e7241c60f36637608
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Date:   Sun Jan 18 09:12:58 2015 -0600
-
-    tmpfiles.dev: pass --boot to tmpfiles.sh so kmod works properly
-
-commit 34b55f31b357af37b999bc3e619c332fc5be1938
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Date:   Sun Jan 18 09:31:53 2015 -0600
-
-    start work on 0.13.8
-
-commit e0c746e938f7f22dc270cd0802ccfd2803ca7a8c
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Date:   Thu Jan 15 09:34:01 2015 -0600
-
-    Create ChangeLog
-
-commit 50329eee7a126dd1e961d8fb823e5f35f515a143
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Date:   Mon Jan 12 14:37:10 2015 -0600
-
-    Add description for cgroup_cleanup
-    
-    X-Gentoo-Bug: 535184
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=535184
-
-commit fb81028121471c32bbcc88a61956baa7264ff090
-Author: Doug Freed <dwfreed@mtu.edu>
-Date:   Mon Jan 12 09:10:29 2015 -0600
-
-    fix double free of pidfile
-    
-    This fixes a double free of the pidfile variable. For discussion of this
-    issue, see the bug.
-    
-    X-Gentoo-Bug: 531600
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=531600
-
-commit 50e99aa30aee155865842e0a198fda473b647096
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Date:   Mon Dec 8 09:47:42 2014 -0600
-
-    Do not call the shell to evaluate CHANGELOG_LIMIT
-    
-    The git log command understands dates such as "1 year ago", so there is
-    no need to use the date command.
-
-commit b177b7924250058d1ad9f8d758dcf8182099341d
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Date:   Sun Dec 7 17:16:48 2014 -0600
-
-    Add target to create ChangeLog
-    
-    This was added by request because some users are requesting a ChangeLog.
-    
-    This fixes #29.
-
-commit 7009f6687289753e6b8207c32c1294fbe48b65c2
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Date:   Tue Jan 13 00:45:19 2015 -0600
-
-    start working on 0.13.7
-
-commit 2eb0ea9afbba584fc4c5ee0feefa9ae6a3d3278d
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Date:   Sun Nov 23 10:28:21 2014 -0600
-
-    Make sysfs behave like netmount and localmount
-    
-    sysfs now mounts all related sysfs file systems and returns success,
-    like netmount and localmount.
-    
-    Also, we now check to make sure the cgroups are not mounted before we
-    mount them.
-    
-    X-Gentoo-Bug: 530138
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=530138
-
-commit 534031fc7ac3795cc42ea6f54b7ee1c304ee53de
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Date:   Sun Nov 23 21:57:44 2014 -0600
-
-    Start work on 0.13.6
-
-commit 6b85d4288c9409f8870396b8026862463e732bf8
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Date:   Thu Nov 20 10:55:53 2014 -0600
-
-    devfs: optionally add missing symbolic links
-    
-    If symbolic links for /dev/{fd,stdin,stdout,stderr,core} do not exist
-    once /dev is mounted, we should create them.
-
-commit dec899b946281c7c12829f3300d533f40e468c20
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Date:   Thu Nov 20 11:06:03 2014 -0600
-
-    Start work on 0.13.5
-
-commit c9f6e2a6c8ca4e258f1b577010586668759b361a
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Date:   Thu Nov 6 14:38:17 2014 -0600
-
-    netmount: unmount nfs file systems
-
-commit e1a4aef3e551371a83a38eb1a275f10b0e9e165e
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Date:   Thu Nov 6 14:43:02 2014 -0600
-
-    start work on 0.13.4
-
-commit cb2c45a3c092de617fa037089599e624a758aea9
-Author: Alexander Vershilov <alexander.vershilov@gmail.com>
-Date:   Wed Oct 29 23:16:35 2014 +0300
-
-    Fix incorrect handling of chroot option.
-    Fixes #28.
-    
-    X-Gentoo-Bug: #527370
-    X-Gentoo-Bug-Url: https://bugs.gentoo.org/show_bug.cgi?id=527370
-
-commit d92eca3988a1756e12c22c99a5e17f525ebffc6c
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Date:   Sat Nov 1 18:31:20 2014 -0500
-
-    Start work on 0.13.3
-
-commit 5bdd08e0e74bb071e775c706cf88b7bd7c48a572
-Author: Johan Bergström <bugs@bergstroem.nu>
-Date:   Thu Oct 23 09:59:57 2014 +1100
-
-    Pass ncurses cflags to build
-    
-    Fixes #25
-    Note from William Hubbs:
-    The original patch overwrote CFLAGS. I modified this patch to add the
-    ncurses cflags to CPPFLAGS instead of overwriting CFLAGS.
-
-commit 8a68dc899e93ff925fac8417148cebbdaa975849
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Date:   Fri Oct 24 10:44:14 2014 -0500
-
-    Fix compile errors created by bundling queue.h
-
-commit 2d1e2552857c51b424704d214c3226d9b2a89ec6
-Author: Anthony G. Basile <blueness@gentoo.org>
-Date:   Thu Oct 23 19:56:19 2014 -0400
-
-    helpers.h, start-stop-daemon.c: remove uneeded macros
-    
-    TAILQ_CONCAT, TAILQ_FOREACH_SAFE and LIST_FOREACH_SAFE are defined
-    in our bundled queue.h and are no longer required.
-
-commit 6f9fd30edb7f9938cff5efcf33d4f867c9b94def
-Author: Anthony G. Basile <blueness@gentoo.org>
-Date:   Thu Oct 23 18:33:27 2014 -0400
-
-    Bundle <sys/queue.h> from NetBSD
-    
-    We are bundling this to allow building on musl-based systems since musl
-    does not include <sys/queue.h>.
-
-commit e0c32c23dc00d7aff79614129614944f4b1fde92
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Date:   Thu Oct 23 18:47:04 2014 -0500
-
-    Fix all tests for GNU/kFreeBSD
-    
-    It is necessary to check for both the kernel and c library because
-    __FreeBSD_kernel is also defined on native FreeBSD [1].
-    
-    [1] http://sourceforge.net/p/predef/wiki/OperatingSystems/
-
-commit 4777035d53cc56444865cbeb287e2b5e73d7e901
-Author: Gabriele Giacone <1o5g4r8o@gmail.com>
-Date:   Wed Oct 22 15:02:51 2014 -0500
-
-    Fix rc_svcdir for GNU/Hurd
-
-commit f049b535b3dfb4becd62143289a0f7804329c72d
-Author: Svante Signell <svante.signell@gmail.com>
-Date:   Wed Oct 22 14:59:01 2014 -0500
-
-    fix defines for GNU/Hurd
-
-commit 4ba30c5a1bb0571e7d79f30c29525f206bed12e5
-Author: Svante Signell <svante.signell@gmail.com>
-Date:   Wed Oct 22 14:25:00 2014 -0500
-
-    add missing files for GNU/Hurd
-
-commit 91734d20be62dfbf7f637df576b70c9f04bae73d
-Author: Gabriele Giacone <1o5g4r8o@gmail.com>
-Date:   Tue Oct 21 21:17:52 2014 -0500
-
-    Fix rc_svcdir for GNU/kFreeBSD
-
-commit b4194fef43c05cb7c601a2c454687eebf6e77e99
-Author: Gabriele Giacone <1o5g4r8o@gmail.com>
-Date:   Tue Oct 21 02:24:12 2014 -0500
-
-    Add missing files for GNU/kFreeBSD
-
-commit 5f23128f303b98ec882a3afaf7d98087f452a938
-Author: Svante Signell <svante.signell@gmail.com>
-Date:   Tue Oct 21 01:53:37 2014 -0500
-
-    Fix GNU/kFreeBSD port
-    
-    Check for __FreeBSD_kernel instead of __GLIBC__ in source files.
-    
-    note from William Hubbs:
-    I was told this is a better check for GNU/kFreeBSD than checking the
-    C  library the source is being compiled against.
-    GNU/kFreeBSD than checking which library we are using.
-
-commit a634534167f4fb66464568a837ba22a5e0c97410
-Author: Anthony G. Basile <blueness@gentoo.org>
-Date:   Wed Oct 22 07:46:49 2014 -0400
-
-    einfo.h, rc.h.in: simplify __BEGIN_DECLS logic
-    
-    There is no need to redefine __BEGIN_DECLS and __END_DECLS.
-    We simplify the logic here and avoid undefining these macros.
-
-commit f77006b58e3fffb80208804dae75a69a29414e95
-Author: Anthony G. Basile <blueness@gentoo.org>
-Date:   Tue Oct 21 09:31:07 2014 -0400
-
-    einfo.h, rc.h.in: ensure __BEGIN_DECLS is defined
-    
-    Some Standard C Libraries, like musl, don't define __BEGIN_DECLS
-    or __END_DECLS.  We add some ifdef magic to ensure these are
-    available.
-
-commit ef22f78a480e4f6efb1ae7a9bef0b2ef9c456cd3
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Date:   Mon Oct 20 15:52:11 2014 -0500
-
-    Update news file wrt chroot variable
-
-commit 735dc45c392821fbb278ed9cbdefbf8b07b2c750
-Author: Alexander Vershilov <alexander.vershilov@gmail.com>
-Date:   Sun Oct 19 19:41:36 2014 -0500
-
-    librc:look for the pid file in a chroot if defined
-    
-    X-Gentoo-Bug: 524388
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=524388
-
-commit 0d3fdd3769be9801b800f89ee8ce9d1b816434db
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Date:   Sun Oct 19 19:36:57 2014 -0500
-
-    runscript.sh: add chroot support
-    
-    This adds support for a chroot variable which will be passed to the
-    start-stop-daemon --chroot switch to runscript.sh when starting a
-    daemon. This also needs to be saved so it can be used in locating the
-    pid file when stopping the daemon.
-    
-    X-Gentoo-Bug: 524388
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=524388
-
-commit 5a1a94b2cc7a5ab8e6a7bc75e503d2dd2377558a
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Date:   Mon Oct 20 15:28:13 2014 -0500
-
-    Add NEWS file
-
-commit a76e5a827c23616760e8aab8870239b66c9fda59
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Date:   Wed Oct 1 17:14:25 2014 -0500
-
-    add back nfs and nfs4 file systems
-    
-    Fix gentoo bug #427996 correctly.
-    We should attempt to mount the file systems, but not try to start the
-    daemons. The previous fix removed mounting the file systems as well as
-    starting the daemons.
-    
-    X-Gentoo-Bug: 508574
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=508574
-
-commit b964de828731b5989fb1117822016cacbfe1ad8a
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Date:   Fri Sep 19 17:23:55 2014 -0500
-
-    man: Document start_inactive and in_background_fake
-
-commit 2c1051ad3fc6d39a6201b676f94b055d00265813
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Date:   Sat Sep 20 16:51:30 2014 -0500
-
-    typo fix
-
-commit a2187e897e3c0fc9a29adb0b81a57f2b718e74c5
-Author: Roy Marples <roy@marples.name>
-Date:   Thu Sep 11 13:26:58 2014 -0500
-
-    Use exception-based approach for cgroup/ulimit setup
-    
-    Note from William Hubbs:
-    I spoke with Roy about this, and he pointed out that user-defined
-    functions may need the limits applied, so it is better to go with a
-    method that uses exceptions to determine which functions apply the
-    limits.
-    
-    X-Gentoo-Bug: 522408
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=522408
-
-commit e8043fe378a410dfa78b1e14162a94cc859a5f69
-Author: Rick Farina (ZeroChaos) <sidhayn@gmail.com>
-Date:   Mon Oct 6 11:15:44 2014 -0500
-
-    localmount: unmount aufs branches
-
-commit 082fd53d9e634318e87e2cb1f2ccc7bf12bf09df
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Date:   Thu Sep 11 12:02:51 2014 -0500
-
-    runscript: move verbose mode setting near debug setting
-
-commit 61fd8b29961650a0132b9cfece80bdf7d16cd05c
-Author: Joe M <joe9mail@gmail.com>
-Date:   Fri Aug 29 09:10:58 2014 -0500
-
-    savecache: check permissions on the correct directory
-
-commit 43d727dc3f17bc9a1d020ed2a5684d4a26bb620a
-Author: Andrew Gregory <andrew.gregory.8@gmail.com>
-Date:   Mon Aug 25 15:46:28 2014 -0400
-
-    tmpfiles.sh: add support for C action
-    
-    Recursively copies files or directories.  Added by systemd in 849958d1.
-
-commit b8e52583ca590d0f956acea0ec558e84495e3818
-Author: Andrew Gregory <andrew.gregory.8@gmail.com>
-Date:   Mon Aug 25 15:37:45 2014 -0400
-
-    tmpfiles.sh: add support for + modifier
-    
-    systemd added support for b+, c+, p+, and L+ in 2e78fa79 and 1554afae to
-    remove the target path if it already exists.
-
-commit 1a7af5bbde0108d5d997d96af7e513eb362d71c5
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Date:   Mon Oct 13 11:43:20 2014 -0500
-
-    Start work on 0.13.2
-
-commit 785b61e8725f26b7d7c66b00e6e87597dd7bd735
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Date:   Fri Aug 22 12:41:55 2014 -0500
-
-    cgroups: fix cgroup subsystem mounting
-    
-    Originally, we aborted all of the cgroup setup if /sys/fs/cgroup/openrc
-    was already mounted. This  caused an issue in lxc containers, so we
-    should always allow the subsystems to be mounted.
-    
-    X-Gentoo-Bug: 520606
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=520606
-
-commit 54ed42503fbae45eb1fa6cf8c09ca1e34c8002cd
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Date:   Fri Aug 22 14:18:33 2014 -0500
-
-    start work on 0.13.1
-
-commit c60ef5c381e9edc7e30be9dcc9cc7e123515452e
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Date:   Sun Aug 17 11:23:52 2014 -0500
-
-    mtab: add verbose level deprecation warnings
-
-commit bee3f8463cbc372c344541077924ddd45ca62ef1
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Date:   Sun Aug 17 00:11:14 2014 -0500
-
-    README: Clarify devfs changes
-    
-    I was informed that the previous explanation of the devfs changes could
-    be interpreted to mean that we mount a second /dev on top of the one
-    that was mounted by the kernel or initramfs. This change makes it clear
-    that is not the case.
-
-commit 72b7b32502ff149c0f0f8a7833cfd213f6cf933e
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Date:   Sat Aug 16 17:16:20 2014 -0500
-
-    README: add notes about devfs changes
-
-commit 645f7b6947d9fc44fbece0931a3ddb10d3d79b27
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Date:   Sat Aug 16 15:07:48 2014 -0500
-
-    adjust deprecation schedule for mtab
-    
-    - Quiet the deprecation messages forr now
-    - update the feature removal schedule to reflect that it will be removed
-      in 2.0.
-
-commit 1b26d547a50e2554483bdbfd288fae75fd76bfa0
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Date:   Thu Aug 14 13:50:48 2014 -0500
-
-    Deprecate the mtab service script
-    
-    The mtab service script is no longer needed on modern Linux systems, so
-    we can remove it in 1.0. However, we need to set a deprecation notice
-    first.
-
-commit c8018d04a7b238b57a3d74a68e2af02af395f510
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Date:   Wed Aug 13 15:26:37 2014 -0500
-
-    tmpfiles: fix relabel to run restorecon before chown and chmod
-
-commit 6f080e9c1a2a9b9c308cdc03f9cf782c4ce4d440
-Author: Jason Zaman <jason@perfinion.com>
-Date:   Wed Aug 13 10:50:34 2014 +0400
-
-    tmpfiles: Move relabelling before any other calls for device nodes
-    
-    Device nodes are normally never device_t so this type does not
-    have many permissions. After the mknod, the device should have
-    its label corrected before any other operations (like chmod).
-
-commit 2c265e13c60be0ed583a871ca12a22e4d379a7c0
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Date:   Mon Aug 11 13:17:33 2014 -0500
-
-    README: expand information about rc and runscript deprecation
-
-commit 24d82d9ff1ca1ba7085814f8f6530124c117aa5f
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Date:   Mon Aug 11 12:57:23 2014 -0500
-
-    rc.conf: document rc_verbose
-
-commit d1e71b07afd4b900894ce4ea45f94010c70e32cc
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Date:   Mon Aug 11 12:29:04 2014 -0500
-
-    Show rc and runscript deprecation warnings in verbose mode
-    
-    These messages are being changed for this release to show in verbose
-    mode because of the number of times they display.
-
-commit 7b744befac2049eb6372a7f0c5420c740aa0a4ea
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Date:   Sun Aug 10 17:15:05 2014 -0500
-
-    bootmisc: do not run the clean_run function in an LXC container
-
-commit faaaab4bf540b4df011abea5985963dbc9e1646a
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Date:   Sun Aug 10 13:00:39 2014 -0500
-
-    hwclock: fix comments about the usage of clock_hctosys
-    
-    The clock_hctosys variable should be set to YES if you are not using NTP to
-    synchronize your system time; it doesn't have anything to do with the
-    kernel configuration.
-
-commit d29db70efb2adfbd200ba4a03fa78653e97893a6
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Date:   Wed Aug 6 22:01:30 2014 -0500
-
-    sysctl.linux.in: use the --system option
-    
-    According to the sysctl man page, the --system option causes sysctl to
-    process all system configuration files, which include the following:
-    
-    /run/sysctl.d/*.conf
-    /etc/sysctl.d/*.conf
-    /usr/local/lib/sysctl.d/*.conf
-    /usr/lib/sysctl.d/*.conf
-    /lib/sysctl.d/*.conf
-    /etc/sysctl.conf
-    
-    X-Gentoo-Bug: 484796
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=484796
-
-commit 6a337ff6c531d9d7310253b67b3e95d1ce5d214c
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Date:   Fri Aug 8 14:49:00 2014 -0500
-
-    devfs: several small clarifications
-    
-    - Rename the static_dev switch in conf.d/devfs to skip_mount_dev since
-      this is a better description of what the switch does.
-    
-    - Clarify the error messages in the devfs service script based on the
-      new name of the switch.
-
-commit 647e08eb9166d23d0c64f0c8767d93a06bd21a40
-Author: Jason Zaman <jason@perfinion.com>
-Date:   Wed Aug 6 02:12:35 2014 +0400
-
-    tmpfiles.sh: do not use install
-    
-    install is in /usr which causes problems if /usr is not mounted.
-    Instead, checkpath and "mkdir -p" can do everything required and are
-    both available before /usr is mounted.
-    Since checkpath also handles selinux labels correctly,
-    _restorecon after is not required.
-    
-    X-Gentoo-Bug: 503408
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=503408
-
-commit 2624a8c8a7030180f9548a6e2fba5b0a82c5f046
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Date:   Mon Jul 28 10:41:24 2014 -0500
-
-    checkpath: apply ownership to all paths given on command line
-    
-    The stat structure was not being initialized correctly in do_check. This
-    was causing the owner adjustment to be skipped if the first path had the
-    correct owner.
-    
-    Also, the "correcting owner" message should always be printed when the
-    owner is being changed.
-    
-    X-Gentoo-Bug: 518042
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=518042
-
-commit 275714bdc74c363ca1612b2b6b97f74f7a62b50c
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Date:   Fri Jul 25 11:04:57 2014 -0500
-
-    checkpath: style fix
-
-commit e3bfb68aece9378a0669c2893285808100fd5ea6
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Date:   Wed Jul 23 16:19:25 2014 -0500
-
-    hwclock: always set the kernel's timezone
-    
-    The hwclock service should set the time zone regardless of the setting
-    of the clock_hctosys variable. This needs to be done to prevent issues
-    when the system time is being synchronized using ntp.
-    
-    X-Gentoo-Bug: 434410
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=434410
-
-commit 1f7582c78b2697c3f2617a4a89afabaf3550b0fb
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Date:   Sat Jul 19 13:03:00 2014 -0500
-
-    src/librc/librc-daemon.c: style fix
-
-commit cc1bc6a4cec772c50a1b5232655ff34370d204b1
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Date:   Sat Jul 19 12:59:35 2014 -0500
-
-    src/rc/Makefile: typo fix
-
-commit 40f42ced21b1c0c99780b801d28fafd91a858f90
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Date:   Thu Jul 17 23:10:28 2014 -0500
-
-    rc-status: fix infinite  loop when using stacked runlevels
-    
-    Remove the recursive call in print_stacked_services which was causing an
-    infinite loop when using stacked runlevels.
-    I would like to thank Doug Freed and Jason Zaman for assisting with
-    tracking this down.
-    
-    X-Gentoo-Bug: 514972
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=514972
-
-commit 1a1d53335b2e6e3240b738ba1f81de64e552c337
-Author: Jason Zaman <jason@perfinion.com>
-Date:   Thu Jul 17 03:07:19 2014 +0400
-
-    devfs: fix restorecon ebegin message to match sys
-    
-    X-Gentoo-Bug: 516956
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=516956
-
-commit 99939b9839fb45093fe193e06139eab4a95637da
-Author: Jason Zaman <jason@perfinion.com>
-Date:   Thu Jul 17 03:07:18 2014 +0400
-
-    sysfs: restorecon after mounting /sys
-    
-    X-Gentoo-Bug: 516956
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=516956
-
-commit 89907b60bac51db2cda1afe4555676577ef498a8
-Author: Jason Zaman <jason@perfinion.com>
-Date:   Thu Jul 17 00:46:25 2014 +0400
-
-    move the selinux_setup function into rc-selinux
-    
-    X-Gentoo-Bug: 516956
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=516956
-
-commit a94a9740d545817294cc431180db0f22fc923b13
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Date:   Wed Jul 16 15:03:11 2014 -0500
-
-    checkpath: style fixes
-
-commit 8b8edc29705b843988b97242942a409241c182eb
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Date:   Wed Jul 16 14:48:03 2014 -0500
-
-    style fixes
-
-commit 010c2ab18b4be2068237cf0db97e9348bba65ac6
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Date:   Wed Jul 16 14:14:37 2014 -0500
-
-    Rename SELinux source files
-    
-    The name rc-selinux-util.* is a bit long, so I renamed the source files
-    to rc-selinux.*
-    
-    X-Gentoo-Bug: 516956
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=516956
-
-commit 9c689542c3246e793310db938374bc97600435e6
-Author: Jason Zaman <jason@perfinion.com>
-Date:   Tue Jul 15 22:27:34 2014 +0400
-
-    checkpath: restore the SELinux context
-    
-    X-Gentoo-Bug: 516956
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=516956
-
-commit 525d7140b12a8e259f9d919f24148e369e9ff7d1
-Author: Jason Zaman <jason@perfinion.com>
-Date:   Tue Jul 15 22:27:33 2014 +0400
-
-    devfs: fix SELinux contexts
-    
-    SELinux contexts in /dev need to be fixed after it is mounted
-    
-    X-Gentoo-Bug: 516956
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=516956
-
-commit 4f784bd46923486773edcd7749246a21bd419e6b
-Author: Jason Zaman <jason@perfinion.com>
-Date:   Tue Jul 15 22:27:32 2014 +0400
-
-    tmpfiles: set the proper SELinux context
-    
-    Restore the label on the created file / dir based on the policy
-    fcontexts.
-    
-    X-Gentoo-Bug: 516956
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=516956
-
-commit 4a1afa694cd8ebd6591d5a825ee35e4f57c98469
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Date:   Tue Jul 15 11:38:02 2014 -0500
-
-    Add SELinux support to the build system
-    
-    X-Gentoo-Bug: 516956
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=516956
-
-commit 25c229cf830c8e822a206f2e08f9c94964a47aa9
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Date:   Mon Jul 14 15:58:50 2014 -0500
-
-    sysfs.in: fix indentation
-
-commit 71d6d61b28c4c0f285ec51459551d900dfa4ea71
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Date:   Sun Jul 13 14:12:36 2014 -0500
-
-    checkpath: fix logic for the writable option
-    
-    The -W option does not need an argument of its own; it can take the
-    first path after all other options are processed on the command line.
-    
-    Also, move the processing for the -W option out of the switch so it will
-    be in the same loop as the other processing.
-
-commit 40141244e349e6e1d2dfb9ebfbcbf62f68d33a9d
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Date:   Sun Jul 13 11:15:26 2014 -0500
-
-    man/openrc-run.8: more updates and clarifications for checkpath
-    
-    X-Gentoo-Bug: 500606
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=500606
-
-commit d59737afb159d993916836903d9e670a1334c93a
-Author: Alexander V Vershilov <qnikst@gentoo.org>
-Date:   Sun Feb 16 04:08:23 2014 +0400
-
-    man/openrc.8: update checkpath documentation
-    
-    X-GENTOO-BUG: 500606
-    X-GENTOO-BUG-URL: https://bugs.gentoo.org/show_bug.cgi?id=500606
-
-commit f66f41c4f03d8077bdaa047a7a93f6c92c0a69de
-Author: Alexander V Vershilov <qnikst@gentoo.org>
-Date:   Fri Jul 11 16:33:42 2014 -0500
-
-    typo fix
-
-commit d80482c2f4ec35a880ee099eeb3983b255d65e8f
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Date:   Fri Jul 11 15:23:38 2014 -0500
-
-    checkpath: fix error message in previous commit
-
-commit d0040aff0aa033fd5d5c40480008e98ee5e1f11a
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Date:   Fri Jul 11 14:50:20 2014 -0500
-
-    checkpath: report an error if required options were not specified
-    
-    Before this commit, not specifying -d, -f, -p or -W in a checkpath
-    command meant the command exited successfully but actually did nothing.
-    
-    This is an error condition, so report it as such.
-
-commit 75e06d85584fc3ebfa26fbca97ea60b687247bb0
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Date:   Thu Jul 10 05:18:00 2014 -0500
-
-    Style Fixes
-
-commit 1a44be0f16a7a1de8a176e7c656f8513494e0e64
-Author: Alexander V Vershilov <qnikst@gentoo.org>
-Date:   Sun Feb 16 04:27:52 2014 +0400
-
-    cgroups: only run cgroup setup when starting a service
-    
-    Status call should not set limits as it requires root permissions,
-    also this is not safe, as current process may reach limitation.
-    
-    Solution is to set limits and move process to service cgroup only
-    on start.
-    
-    X-GENTOO-BUG: 500364
-    X-GENTOO-BUG-URL: https://bugs.gentoo.org/show_bug.cgi?id=500364
-
-commit f265ddde971d0fdb97a4f14b4cc96140be7b4628
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Date:   Thu Jul 10 09:04:04 2014 -0500
-
-    FEATURE_REMOVAL_SCHEDULE: add entry for local_start/stop
-
-commit 57b9e601a97fac3a044ec5d7e5f11b6219c892b7
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Date:   Sat Jul 5 14:30:33 2014 -0500
-
-    init.d/local: bring functioning more in line with how sysctl works
-    
-    - remove the has_executables variable since it isn't used.
-    - Convert the conditional calls to ewend/vewend to a single call to veend.
-    - Always call eend after all scripts are executed passing the appropriate
-    error code.
-    
-    Because of this change, you will see only an overall status when
-    starting or stopping local unless you are using verbose mode.
-
-commit c1de8c09bf4895c6108d297fcebd63046e49e614
-Author: Thomas D <whissi@whissi.de>
-Date:   Tue Jun 10 15:23:17 2014 +0200
-
-    Add support for verbose "local" service runscript
-    
-    With this patch, the "local" service runscript will be verbose like the
-    "sysctl" service when 'rc_verbose="yes"' is set.
-    
-    Example output successful start:
-    
-     * Stopping local ...
-     *   Executing "/etc/local.d/00will-stop.stop" ...                  [ ok ]
-     * Starting local ...
-     *   Executing "/etc/local.d/00will-start.start" ...                [ ok ]
-     *   Executing "/etc/local.d/01 test.start" ...                     [ ok ]
-    
-    Example output with failing executables:
-    
-     * Stopping local ...
-     *   Executing "/etc/local.d/00will-stop.stop" ...                  [ ok ]
-     *   Executing "/etc/local.d/will-fail.stop" ...
-    mount: can't find foo in /etc/fstab
-     *   Execution of "/etc/local.d/will-fail.stop" failed.             [ !! ]
-     * Starting local ...
-     *   Executing "/etc/local.d/00will-start.start" ...                [ ok ]
-     *   Executing "/etc/local.d/01 test.start" ...                     [ ok ]
-     *   Executing "/etc/local.d/will-fail2.start" ...
-    mount: can't find bar in /etc/fstab
-     *   Execution of "/etc/local.d/will-fail2.start" failed.           [ !! ]
-     *   Executing "/etc/local.d/will-fail.start" ...
-    mount: can't find foo in /etc/fstab
-     *   Execution of "/etc/local.d/will-fail.start" failed.            [ !! ]
-    
-    X-Gentoo-Bug: 489274
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=489274
-
-commit 143f1c64c13e4930e3880a393b7253d6fbc0ed58
-Author: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
-Date:   Wed Jul 2 11:45:14 2014 +0300
-
-    sysctl.Linux.in: remove -lxc from keywords
-    
-    certain tunables can be set independently for each container
-    
-    X-Gentoo-Bug: 516050
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=516050
-
-commit b4b34d909c36898095a0036f90a328838137e3a4
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Date:   Tue Jul 1 07:14:31 2014 -0500
-
-    Schedule removal of the opts variable from service scripts
-
-commit 56112a6f1f176696e5f39a86fe4b52017ccdd04c
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Date:   Mon Jun 30 20:30:39 2014 -0500
-
-    sysfs: Do not mount openrc cgroup if it is already mounted
-    
-    We were not checking to see if /sys/fs/cgroup/openrc was already mounted
-    before we mounted it. This fixes that issue.
-    Thanks to Robin Johnson <robbat2@gentoo.org> for pointing this out.
-
-commit 09d81e86f210acf5270ea4bd0fa7319a49f88131
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Date:   Mon Jun 23 20:26:18 2014 -0500
-
-    Make history a separate document
-    
-    Move the additional history information from Daniel Robbins' wiki
-    page along with the history from README to a separate file,
-    README.history.
-    
-    X-Gentoo-Bug: 513024
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/513024
-
-commit 23cb55d843b165d5508f330287ed329358fc85dc
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Date:   Sat Jun 21 01:53:17 2014 -0500
-
-    man/start-stop-daemon.8: correct argument from --nice to --nicelevel
-    
-    X-Gentoo-Bug: 510648
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=510648
-
-commit 094bc17cb0ad75da189ebf1a8242a378928a1eef
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Date:   Fri Jun 20 19:39:07 2014 -0500
-
-    tmpfiles.sh: fix comment processing
-    
-    If you happened to format a comment with no white space after the '#',
-    it was not being processed.
-    
-    Reported-by: consus@gmx.com
-    X-Gentoo-Bug: 511804
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=511804
-
-commit 6126700a0723efa4ef1e299da0f58498f742c3a1
-Author: Sven Vermeulen <sven.vermeulen@siphos.be>
-Date:   Sat Apr 19 21:18:18 2014 +0200
-
-    SELinux filesystem is at /sys/fs/selinux
-    
-    The SELinux filesystem has been moved to /sys/fs/selinux for quite some
-    time. We kept supporting /selinux for backwards compatibility, but it's
-    time to move forward on this.
-    
-    X-Gentoo-Bug: 511718
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=511718
-    Signed-off-by: Sven Vermeulen <sven.vermeulen@siphos.be>
-
-commit 19cccb2e9416311b85fcad3c15d4d988fed2f954
-Author: Robin H. Johnson <robbat2@gentoo.org>
-Date:   Sun May 25 23:51:37 2014 -0700
-
-    sh/tmpfiles.sh: license under 2-clause BSD
-    
-    As the author of our tmpfiles.sh script, I hereby license it under
-    2-clause BSD, like the rest of openrc.
-    
-    Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-commit 9eb9b28d3e3b6725559fb38101ae869c1e4530ce
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Date:   Fri Jun 20 16:01:47 2014 -0500
-
-    librc: filter out container processes on OpenVZ host
-    
-    Thanks to info and testing done by Daniel Robbins <drobbins@funtoo.org>,
-    there is now a fix for this. Below is his description of the steps
-    OpenRC needed to use.
-    
-    1) See if /proc/<pid>/status exists
-    2) If it does, see if it has a "envID:" field
-    3) If it does, see if "envID:" is set to "0"
-    4) If so, then it's one of the host's processes and should be a
-    candidate for the list. Otherwise, it is one of the container's
-    processes and should be ignored.
-    
-    This should fix the bug and allow start-stop-daemon to work properly on
-    OpenVZ hosts.
-    
-    X-Gentoo-Bug: 376817
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=376817
-
-commit a817915632f7f2162e7c3740d204989f6cfde554
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Date:   Wed Apr 9 19:27:12 2014 -0500
-
-    README.busybox: document incompatibility with built-in ip applet
-
-commit 20d7b83150b18b0eca550d9bb2e1d5fb0acbbd89
-Author: Andrew Gregory <andrew.gregory.8@gmail.com>
-Date:   Wed Mar 26 12:14:08 2014 -0400
-
-    tmpfiles.dev: remove --remove option
-    
-    For compatibility with systemd.
-    
-    Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com>
-
-commit 686ee62a79e12ad73581ef4e151baad21b624935
-Author: Andrew Gregory <andrew.gregory.8@gmail.com>
-Date:   Wed Mar 26 12:13:20 2014 -0400
-
-    tmpfiles: add support for --boot option
-    
-    For compatibility with systemd-tmpfiles.
-    
-    Fixes #17
-    
-    Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com>
-
-commit c081633762dc66235fe385eedcc2cdf6bff83391
-Author: Andrew Gregory <andrew.gregory.8@gmail.com>
-Date:   Thu Mar 27 11:02:47 2014 -0400
-
-    tmpfiles: ignore all files starting with systemd-
-    
-    systemd recently moved creation of /run/nologin to systemd-nologin.conf
-    
-    Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com>
-
-commit e0e1f2a4da376d9d05487ec23922c1ca356cbbc6
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Date:   Fri Mar 14 22:18:25 2014 -0500
-
-    rc.conf: typo fix
-
-commit 7fb209a6fc3512d3437bbb175853f1f01393b74d
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Date:   Thu Mar 13 15:27:40 2014 -0500
-
-    conf.d/hwclock: typo fix
-
-commit d0186d422c3bb75ac2977dfe7d1f8f97c3ce5c3b
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Date:   Sun Mar 9 15:35:41 2014 -0500
-
-    rc.conf: document rc_nocolor setting

FEATURE-REMOVAL-SCHEDULE

@@ -5,9 +5,29 @@ removed, it should also be removed from this file.
 
 ---------------------------
 
+What: oldnet ADSL rp-pppoe mode
+
+When: undecided
+
+Why: Replaced by the oldnet PPP module
+
+Who:  Robin H. Johnson <robbat2@gentoo.org>
+
+---------------------------
+
+What: oldnet /etc/conf.d/wireless
+
+When: undecided
+
+Why: All configuration moved to /etc/conf.d/net
+
+Who:  Robin H. Johnson <robbat2@gentoo.org>
+
+---------------------------
+
 What: Service pause action
 
-When: 1.0
+When: Removed already, compatbility warning in place.
 
 Why: ...
 
@@ -15,9 +35,9 @@ Who:
 
 ---------------------------
 
-What: start-stop-daemon options --startas, --chuid , --oknodo
+What: Service --startas, --chuid , --oknodo
 
-When: 1.0
+When: undecided
 
 Why: Obsolete or replaced by other options.
 	 --startas => use --name or --exec
@@ -27,46 +47,3 @@ Why: Obsolete or replaced by other options.
 Who:
 
 ---------------------------
-
-What: runscript and rc symbolic links
-
-When: 1.0
-
-Why: Deprecated in favor of openrc-run and openrc due to naming
-	 conflicts with other software.
-
-Who:
-
----------------------------
-
-What: support for the opts variable in service scripts
-
-When: 1.0
-
-Why: Depprecated in favor of extra_commands, extra_started_commands
-	 and extra_stopped_commands.
-
-Who:
-
----------------------------
-
-What: support for local_start and local_stop
-
-When: 1.0
-
-Why: Depprecated in favor of executable scripts in @SYSCONFDIR@/local.d
-
-Who:
-
----------------------------
-
-What: the mtab service script
-
-When: make warnings more visible in 1.0, remove in 2.0
-
-Why: /etc/mtab should be a symbolic link to /proc/self/mounts on modern
-	 Linux systems
-
-Who:
-
----------------------------

Makefile.inc

@@ -1,3 +1,3 @@
 NAME=		openrc
-VERSION=	0.13.9
+VERSION=	0.12.4
 PKG=		${NAME}-${VERSION}

NEWS

@@ -1,44 +0,0 @@
-OpenRC NEWS
-
-This file will contain a list of notable changes for each release.
-
-OpenRC-0.13.2
-=============
-
-A chroot variable has been added to the service script variables.
-This fixes the support for running a service in a chroot.
-This is documented in man 8 openrc-run.
-
-The netmount service now mounts nfs file systems.
-This change was made to correct a fix for an earlier bug.
-
-OpenRC-0.13
-===========
-
-/sbin/rc was renamed to /sbin/openrc and /sbin/runscript was renamed to
-/sbin/openrc-run due to naming conflicts with other software.
-
-Backward compatible symbolic links are currently in place so your
-system will keep working if you are using the old names; however, it is
-strongly advised that you migrate to the new names because the symbolic
-links will be removed in the future.
-Warnings have been added to assist with this migration; however, due to the
-level of noise they produce, they only appear in verbose mode in this release.
-
-The devfs script now handles the initial mounting and setup of the
-/dev directory. If /dev has already been mounted by the kernel or an
-initramfs, devfs will remount /dev with the correct mount options
-instead of mounting a second /dev over the existing mount point.
-
-It attempts to mount /dev from fstab first if an entry exists there. If
-it doesn't it attempts to mount devtmpfs if it is configured in the
-kernel. If not, it attempts to mount tmpfs.
-If none of these is available, an error message is displayed and static
-/dev is assumed.
-
-OpenRC-0.12
-===========
-
-The net.* scripts, originally from Gentoo Linux, have
-been removed. If you need these scripts, look for a package called
-netifrc, which is maintained by them.

README

@@ -57,6 +57,10 @@ init.d.misc is not installed by default as the scripts will need
 tweaking on a per distro basis. They are also non essential to the operation
 of the system.
 
+As of OpenRC-0.12, the net.* scripts, originally from Gentoo Linux, have
+been removed. If you need these scripts, look for a package called
+netifrc, which is maintained by them.
+
 Reporting Bugs
 --------------
 Since Gentoo Linux is hosting OpenRC development, Bugs should go to
@@ -64,3 +68,25 @@ the Gentoo Bugzilla:
 	http://bugs.gentoo.org/
 They should be filed under the "Gentoo Hosted Projects" product and
 the "openrc" component.
+
+
+History - by Roy Marples
+------------------------
+I became a Gentoo/Linux developer in 2004 and wrote the modular network
+scripts for the Gentoo baselayout package. baselayout is a collection of
+bash scripts to bring up your computer and its services.
+Then towards the end of 2005 I found myself as the primary maintainer
+for baselayout.
+
+At the start of 2007, baselayout-2 is announced to the world, re-writing the
+core of baselayout in C and allowing POSIX sh init scripts instead of
+forcing the use of bash. By Mid 2007 I have re-written everything, including
+init scripts, and alpha and pre baselayout-2 snapshots where put into Gentoo.
+Towards the end of 2007 I retired as a Gentoo developer for reasons I won't
+go into here. baselayout-2 was still in the pre stage, and aside from the
+fbsd users, it was masked everywhere. However, I also desired to keep the
+baselayout-2 project alive, but outside of Gentoo and into other projects
+such as FreeBSD.
+
+As such, the Gentoo Council have allowed the creation of OpenRC under the
+2 clause BSD license, managed by me as an external project.

README.busybox

@@ -8,24 +8,21 @@ counterparts. Since it is possible to configure busybox to not include
 these applets or to prefer the standalone counterparts, OpenRC does not
 attempt to support the busybox applets.
 
-For now, it is recommended that you disable the following busybox
+All of these apply to busybox 1.20.2, which is the current version of
-configuration settings for best results with OpenRC.
+busybox as of this writing.
 
-CONFIG_START_STOP_DAEMON -- The start-stop-daemon applet is not compatible with
+1. The start-stop-daemon applet is not compatible with start-stop-daemon
-start-stop-daemon in OpenRC.
+in OpenRC. Please make sure CONFIG_START_STOP_DAEMON is not set to y in
+the configuration file you use to build busybox.
 
-CONFIG_MOUNT -- The mount applet does not support the -O [no]_netdev options to
+2. The -O option for the mount applet does not support the [no]_netdev
-skip over or include network file systems when the -a option is present.
+options from util-linux for handling network file systems.
 
-CONFIG_UMOUNT -- The umount applet does not support the -O option along with -a.
+3. The umount applet does not support the -O option from util-linux.
 
-CONFIG_SWAPONOFF -- The swapon applet does not support the -e option
+4. The swapon applet does not support the -e option from util-linux.
-or recognize the nofail option in fstab.
 
-CONFIG_SETFONT -- The setfont applet does not support the -u option from kbd.
+5. the setfont applet does not support the -u option from kbd.
-
-CONFIG_IP -- The ip applet  doesn't support the "scope" modifier for
-"ip route add" and "ip address add".
 
 There is work to get most of these supported by busybox, so this file
 will be updated as things change.

README.history

@@ -1,55 +0,0 @@
-This history of OpenRC was written by Daniel Robbins, Roy Marples, William
-Hubbs and others.
-
-The Gentoo modular init scripts were developed by Daniel Robbins for Gentoo
-Linux 1.0_rc6 during most of 2001 and released in September 2001. After their
-development, the dependency-based init script system was maintained by a
-number of senior developers, starting with Azarah (Martin Schlemmer), with
-migration to the new init system assisted by Woodchip (Donnie Davies) who
-converted all ebuild init scripts to work with the new system. As Grant
-Goodyear notes: 
-
-"My recollection is that one of woodchip's more impressive early feats
-was the complete replacement of all of the init scripts in Portage
-for Gentoo Linux 1.0_rc6. Through 1.0_rc5 Gentoo had used fairly
-standard rc scripts modified from Stampede Linux, but for 1.0_rc6 Daniel
-Robbins (drobbins) and Martin Schlemmer (azarah) had created a new
-dependency-based init script system that is still used today. Within a
-span of days Donny rewrote every single init script in the Portage tree
-and committed new masked packages to await the release of 1.0_rc6. Thanks to
-woodchip (and drobbins and azarah, of course) the
-transition to the new init scripts was nearly painless." [1] 
-
-Roy Marples became a Gentoo/Linux developer in 2004 and wrote the modular
-network scripts for the Gentoo baselayout package. Towards the end of 2005,
-he became the primary maintainer for baselayout and the init scripts. 
-
-At the start of 2007, He announced the ongoing development of
-baselayout-2, containing a rewritten core coded in C and allowing POSIX sh
-init scripts instead of forcing the use of bash. By mid 2007, He had
-re-implemented the Gentoo init script design created by Daniel Robbins,
-using an entirely new code base. Alpha and pre-release baselayout-2
-snapshots were added to Gentoo's Portage tree as an optional component.
-
-Toward the end of 2007, Roy retired as a Gentoo developer.
-Baselayout-2 was still in the pre stage, and aside from the gentoo-fbsd
-users, it was masked. However, He desired to keep the baselayout-2
-project moving forward as an independent project. The Gentoo Council
-permitted Him to release OpenRC under the 2-clause BSD license,
-managed by him as an external project. 
-
-Around mid-2010, Roy decided to no longer maintain OpenRC. At this
-point, he transferred development back to Gentoo.
-
-William Hubbs, and several other Gentoo developers,  started working on
-OpenRC around this point and brought OpenRC-0.8.x to Gentoo Linux's stable
-tree in 2011.
-
-In 2013 the OpenRC team became independent from Gentoo again and moved primary
-development to github.
-
-Daniel Robbins continues to maintain an independent, forked
-version of OpenRC for Funtoo Linux, which includes a Funtoo-specific network
-configuration system. 
-
-[1] http://www.gentoo.org/news/en/gwn/20040426-newsletter.xml

conf.d/Makefile

@@ -15,7 +15,7 @@ include ${MK}/os.mk
 
 CONF-FreeBSD=	ipfw moused powerd rarpd savecore syscons
 
-CONF-Linux=	consolefont devfs dmesg hwclock keymaps killprocs modules
+CONF-Linux=	consolefont dmesg hwclock keymaps killprocs modules
 
 CONF-NetBSD=	moused rarpd savecore
 

conf.d/devfs

@@ -1,8 +0,0 @@
-# OpenRC will attempt each of the following in succession to mount /dev.
-#
-# 1. If there is an entry for /dev in fstab, it will be used.
-# 2. If devtmpfs is defined in the kernel, it will be used.
-# 3. If tmpfs is defined in the kernel, it will be used.
-#
-# Set this to yes if you do not want OpenRC to attempt to mount /dev.
-# skip_mount_dev="NO"

conf.d/hostname

@@ -1,2 +1,18 @@
-# Set to the hostname of this machine
+# Set to the fully qualified domain name (e.g. "mybox.example.com") of this
+# machine, if it has one, otherwise set to the machine name (e.g. "mybox").
+# This hostname will be automatically added to /etc/hosts for the 127.0.0.1 and
+# ::1 addresses.
+
 hostname="localhost"
+
+# If your local system has other aliases for your local interfaces, you can
+# add them here. These will also be added to /etc/hosts for 127.0.0.1 and ::1:
+# Add aliases for other hosts to /etc/hosts directly. The networking scripts
+# automatically generate the localhost lines only.
+
+#aliases="mybox server1"
+
+# Set to the NIS domain name of this machine, if it has one, otherwise leave
+# commented out.
+
+#nisdomainname="localdomain.com"

conf.d/hwclock

@@ -7,8 +7,8 @@ clock="UTC"
 # If you want the hwclock script to set the system time (software clock)
 # to match the current hardware clock during bootup, leave this
 # commented out.
-# However, you can set this to "NO" if you are running a modern kernel
+# However, you can set this to "NO" ifyou are running a modern kernel
-# and using NTP to synchronize your system clock.
+# with CONFIG_RTC_HCTOSYS set to y and your hardware clock set to UTC.
 #clock_hctosys="YES"
 
 # If you do not want to set the hardware clock to the current system

conf.d/keymaps

@@ -18,6 +18,6 @@ extended_keymaps=""
 # For a list of valid sets, run `dumpkeys --help`
 dumpkeys_charset=""
 
-# Some fonts map AltGr-E to the currency symbol instead of the Euro.
+# Some fonts map AltGr-E to the currency symbol ¤ instead of the Euro €
 # To fix this, set to "yes"
 fix_euro="NO"

conf.d/network.GNU-kFreeBSD.in

@@ -1,4 +0,0 @@
-
-# You can assign a default route
-#defaultroute="192.168.0.1"
-#defaultroute6="2001:a:b:c"

conf.d/network.GNU.in

@@ -1,4 +0,0 @@
-
-# You can assign a default route
-#defaultroute="gw 192.168.0.1"
-#defaultroute6="gw 2001:a:b:c"

conf.d/staticroute.GNU-kFreeBSD.in

@@ -1,5 +0,0 @@
-# Separate multiple routes using ; or new lines.
-
-# Example static routes. See route(8) for syntax.
-#staticroute="net 192.168.0.0 10.73.1.1 netmask 255.255.255.0
-#net 192.168.1.0 10.73.1.1 netmask 255.255.255.0"

conf.d/staticroute.GNU.in

@@ -1,7 +0,0 @@
-# Separate multiple routes using ; or new lines.
-# /etc/route.conf(5) takes precedence over this configuration.
-
-# Example static routes. See route(8) for syntax.
-# FIXME: "net ..." not supported
-#staticroute="net 192.168.0.0 -netmask 255.255.255.0 --address 10.73.1.1
-#net 192.168.1.0 -netmask 255.255.255.0 --address 10.73.1.1"

etc/rc.conf.GNU

@@ -1,14 +0,0 @@
-##############################################################################
-# GNU/Hurd SPECIFIC OPTIONS
-
-# This is the subsystem type. Valid options on GNU/Hurd:
-# ""        - nothing special
-# "subhurd" - Hurd subhurds (to be checked)
-# If this is commented out, automatic detection will be used.
-#
-# This should be set to the value representing the environment this file is
-# PRESENTLY in, not the virtualization the environment is capable of.
-#rc_sys=""
-# This is the number of tty's used in most of the rc-scripts (like
-# consolefont, numlock, etc ...)
-#rc_tty_number=6?

etc/rc.conf.in

@@ -51,10 +51,6 @@
 # The default value is: /var/log/rc.log
 #rc_log_path="/var/log/rc.log"
 
-# If you want verbose output for OpenRC, set this to yes. If you want
-# verbose output for service foo only, set it to yes in /etc/conf.d/foo.
-#rc_verbose=no
-
 # By default we filter the environment for our running scripts. To allow other
 # variables through, add them here. Use a * to allow all variables through.
 #rc_env_allow="VAR1 VAR2"
@@ -77,10 +73,6 @@
 #rc_crashed_stop=NO
 #rc_crashed_start=YES
 
-# Set rc_nocolor to yes if you do not want colors displayed in OpenRC
-# output.
-#rc_nocolor=NO
-
 ##############################################################################
 # MISC CONFIGURATION VARIABLES
 # There variables are shared between many init scripts
@@ -94,7 +86,7 @@
 
 # Below is the default list of network fstypes.
 #
-# afs ceph cifs coda davfs fuse fuse.sshfs gfs glusterfs lustre ncpfs
+# afs cifs coda davfs fuse fuse.sshfs gfs glusterfs lustre ncpfs
 # nfs nfs4 ocfs2 shfs smbfs
 #
 # If you would like to add to this list, you can do so by adding your

init.d.misc/avahi-dnsconfd.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@SBINDIR@/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d.misc/avahid.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@SBINDIR@/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d.misc/dbus.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@SBINDIR@/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d.misc/dhcpcd.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@SBINDIR@/runscript
 # Copyright (c) 2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d.misc/dnsmasq.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@SBINDIR@/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d.misc/hald.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@SBINDIR@/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d.misc/named.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@SBINDIR@/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d.misc/ntpd.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@SBINDIR@/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d.misc/openvpn.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@SBINDIR@/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
@@ -53,7 +53,7 @@ start_pre()
 			eend $?
 		fi
 	else
-		if command -v kldload >/dev/null 2>&1; then
+		if type kldload >/dev/null 2>&1; then
 			# Hammer the modules home by default
 			sysctl -a | grep -q '\.tun\.' || kldload if_tun
 			sysctl -a | grep -q '\.tap\.' || kldload if_tap

init.d.misc/polkitd.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@SBINDIR@/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d.misc/sshd.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@SBINDIR@/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d.misc/wpa_supplicant.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@SBINDIR@/runscript
 # Copyright (c) 2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d/.gitignore

@@ -3,8 +3,9 @@ fsck
 hostname
 local
 localmount
-loopback
 moused
+net.lo
+net.lo0
 netmount
 network
 root
@@ -40,5 +41,4 @@ syslogd
 termencoding
 ttys
 wscons
-tmpfiles.dev
 tmpfiles.setup

init.d/Makefile

@@ -1,7 +1,7 @@
 include ../mk/net.mk
 
 DIR=	${INITDIR}
-SRCS=	bootmisc.in fsck.in hostname.in local.in localmount.in loopback.in \
+SRCS=	bootmisc.in fsck.in hostname.in local.in localmount.in \
 	netmount.in root.in savecache.in swap.in swapfiles.in \
 	tmpfiles.setup.in swclock.in sysctl.in urandom.in ${SRCS-${OS}}
 BIN=	${OBJS}

init.d/adjkerntz.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@SBINDIR@/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d/bootmisc.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@SBINDIR@/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
@@ -6,7 +6,7 @@ depend()
 {
 	need localmount
 	before logger
-	after clock root sysctl
+	after clock sysctl
 	keyword -prefix -timeout
 }
 
@@ -68,7 +68,7 @@ cleanup_var_run_dir()
 	do
 		# Clean stale sockets
 		if [ -S "$x" ]; then
-			if command -v fuser >/dev/null 2>&1; then
+			if type fuser >/dev/null 2>&1; then
 				fuser "$x" >/dev/null 2>&1 || rm -- "$x"
 			else
 				rm -- "$x"
@@ -117,7 +117,7 @@ migrate_to_run()
 
 clean_run()
 {
-	[ "$RC_SYS" = VSERVER -o "$RC_SYS" = LXC ] && return 0
+	[ "$RC_SYS" = VSERVER ] && return 0
 	local dir
 	dir=$(mktemp -d)
 	mount --bind / $dir
@@ -129,9 +129,7 @@ clean_run()
 start()
 {
 	# Remove any added console dirs
-	if checkpath -W "$RC_LIBEXECDIR"; then
+	rm -rf "$RC_LIBEXECDIR"/console/*
-		rm -rf "$RC_LIBEXECDIR"/console/*
-	fi
 
 	local logw=false runw=false extra=
 	# Ensure that our basic dirs exist

init.d/consolefont.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@SBINDIR@/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d/devd.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@SBINDIR@/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d/devdb.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@SBINDIR@/runscript
 # Copyright (c) 2008 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d/devfs.in

@@ -1,86 +1,21 @@
-#!@SBINDIR@/openrc-run
+#!@SBINDIR@/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
-description="Set up the /dev directory"
+description="Mount system critical filesystems in /dev."
 
-depend()
+depend() {
-{
+	use dev-mount
-	provide dev-mount
 	before dev
 	keyword -prefix -vserver -lxc
 }
 
-mount_dev()
+start() {
-{
+	# Mount required stuff as user may not have then in /etc/fstab
-	local action=--mount devfstype msg=Mounting
-	# Some devices require exec, Bug #92921
-	local mountopts="exec,nosuid,mode=0755"
-	if yesno ${skip_mount_dev:-no} ; then
-		einfo "/dev will not be mounted due to user request"
-		return 0
-	fi
-	if mountinfo -q /dev; then
-		action=--remount
-		mountopts="remount,$mountopts"
-		msg=Remounting
-	fi
-	if fstabinfo -q /dev; then
-		ebegin "$msg /dev according to @SYSCONFDIR@/fstab"
-		fstabinfo -q $action /dev
-		eend $?
-		return 0
-	fi
-	if grep -q devtmpfs /proc/filesystems; then
-		devfstype=devtmpfs
-		mountopts="$mountopts,size=10M"
-	elif grep -q tmpfs /proc/filesystems; then
-		devfstype=tmpfs
-		mountopts="$mountopts,size=10M"
-	fi
-	if [ -n "$devfstype" ]; then
-		ebegin "$msg $devfstype on /dev"
-		mount -n -t $devfstype -o $mountopts dev /dev
-		eend $?
-	else
-		ewarn "This kernel does not have devtmpfs or tmpfs support, and there"
-		ewarn "is no entry for /dev in fstab."
-		ewarn "This means /dev will not be mounted."
-		ewarn "To avoid this message, set CONFIG_DEVTMPFS or CONFIG_TMPFS to y"
-		ewarn "in your kernel configuration or see @SYSCONFDIR@/conf.d/devfs"
-	fi
-	return 0
-}
-
-seed_dev()
-{
-	# Seed /dev with some things that we know we need
-
-	# creating /dev/console, /dev/tty and /dev/tty1 to be able to write
-	# to $CONSOLE with/without bootsplash before udevd creates it
-	[ -c /dev/console ] || mknod -m 600 /dev/console c 5 1
-	[ -c /dev/tty1 ] || mknod -m 620 /dev/tty1 c 4 1
-	[ -c /dev/tty ] || mknod -m 666 /dev/tty c 5 0
-
-	# udevd will dup its stdin/stdout/stderr to /dev/null
-	# and we do not want a file which gets buffered in ram
-	[ -c /dev/null ] || mknod -m 666 /dev/null c 1 3
-
-	# so udev can add its start-message to dmesg
-	[ -c /dev/kmsg ] || mknod -m 660 /dev/kmsg c 1 11
-
-	# extra symbolic links not provided by default
-	[ -e /dev/fd ] || ln -snf /proc/self/fd /dev/fd
-	[ -e /dev/stdin ] || ln -snf /proc/self/fd/0 /dev/stdin
-	[ -e /dev/stdout ] || ln -snf /proc/self/fd/1 /dev/stdout
-	[ -e /dev/stderr ] || ln -snf /proc/self/fd/2 /dev/stderr
-	[ -e /proc/kcore ] && ln -snf /proc/kcore /dev/core
-
-	# Mount required directories as user may not have them in /etc/fstab
 	for x in \
 		"mqueue /dev/mqueue 1777 ,nodev mqueue" \
 		"devpts /dev/pts 0755 ,gid=5,mode=0620 devpts" \
-		"tmpfs /dev/shm 1777 ,nodev,mode=1777 shm" \
+		"tmpfs /dev/shm 1777 ,nodev shm" \
 	; do
 		set -- $x
 		grep -Eq "[[:space:]]+$1$" /proc/filesystems || continue
@@ -99,23 +34,5 @@ seed_dev()
 			eend $?
 		fi
 	done
-}
-
-restorecon_dev()
-{
-	if [ -x /sbin/restorecon ]; then
-		ebegin "Restoring SELinux contexts in /dev"
-		restorecon -rF /dev >/dev/null 2>&1
-		eend $?
-	fi
-
-	return 0
-}
-
-start()
-{
-	mount_dev
-	seed_dev
-	restorecon_dev
 	return 0
 }

init.d/dmesg.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@SBINDIR@/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d/dumpon.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@SBINDIR@/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d/encswap.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@SBINDIR@/runscript
 # Copyright 1992-2012 FreeBSD Project
 # Released under the 2-clause BSD license
 

init.d/fsck.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@SBINDIR@/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d/hostid.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@SBINDIR@/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
@@ -40,7 +40,7 @@ reset()
 {
 	local uuid= x="[0-9a-f]" y="$x$x$x$x"
 
-	if command -v kenv >/dev/null 2>&1; then
+	if type kenv >/dev/null 2>&1; then
 		uuid=$(kenv smbios.system.uuid 2>/dev/null)
 	fi
 	case "$uuid" in

init.d/hostname.in

@@ -1,19 +1,43 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
-# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
+# Copyright (c) 2009-2015 Funtoo Technologies
 # Released under the 2-clause BSD license.
 
 description="Sets the hostname of the machine."
 
 depend() {
-	keyword -prefix -lxc
+	need root
 }
 
 start()
 {
-	# HOSTNAME variable used to be defined in caps in conf.d/hostname.
+	hostname=${hostname-${HOSTNAME-localhost}}
-	# It is also a magic variable in bash.
+	out=$hostname
-	hostname=${hostname-${HOSTNAME-localhost}} # checkbashisms: false positive
+	short=${hostname%%.*}
+	if [ "$short" != "$hostname" ]; then
+		out="$out $short"
+	fi
+	if [ "$nisdomainname" != "" ]; then
+		ebegin "Setting NIS domain name to $nisdomainname"
+		nisdomainname $nisdomainname
+		eend $? "Failed to set the NIS domain name"
+	fi
+	if [ "$short" != "localhost" ]; then
+		out="$out localhost"
+	fi
+	if [ "$hostname" != "localhost.localdomain" ]; then
+		out="$out localhost.localdomain"
+	fi
+	[ -n "$aliases" ] && out="$out $aliases"
+	ebegin "Configuring /etc/hosts"
+	[ -e /etc/hosts ] && sed -i -e '/[[:space:]]*127.0.0.1[[:space:]]/d' -e '/[[:space:]]*::1[[:space:]]/d' /etc/hosts
+	cat <<END >> /etc/hosts
+127.0.0.1	$out
+::1		$out
+END
+	chmod 0644 /etc/hosts
+	eend $?
+	[ "$RC_SYS" = "LXC" ] && return 0
 	ebegin "Setting hostname to $hostname"
-	hostname "$hostname"
+	hostname "$short"
 	eend $? "Failed to set the hostname"
 }

init.d/hwclock.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@SBINDIR@/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
@@ -83,17 +83,22 @@ start()
 		fi
 	fi
 
-	# Always set the kernel's time zone.
-	_hwclock --systz $utc_cmd $clock_args
-	: $(( retval += $? ))
-
 	if [ -e /etc/adjtime ] && yesno $clock_adjfile; then
 		_hwclock --adjust $utc_cmd
 		: $(( retval += $? ))
 	fi
 
-	if yesno ${clock_hctosys:-YES}; then
+	# If setting UTC, don't bother to run hwclock when first booting
-		_hwclock --hctosys $utc_cmd $clock_args
+	# as that's the default
+	if [ "$PREVLEVEL" != N -o \
+		"$utc_cmd" != --utc -o \
+		-n "$clock_args" ];
+	then
+		if yesno ${clock_hctosys:-YES}; then
+			_hwclock --hctosys $utc_cmd $clock_args
+		else
+			_hwclock --systz $utc_cmd $clock_args
+		fi
 		: $(( retval += $? ))
 	fi
 

init.d/ipfw.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@SBINDIR@/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d/keymaps.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@SBINDIR@/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d/killprocs.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@SBINDIR@/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d/local.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@SBINDIR@/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
@@ -12,73 +12,40 @@ depend()
 
 start()
 {
-	ebegin "Starting local"
+	einfo "Starting local"
 
-	local file has_errors=0 retval
+	local file
-	eindent
+	for file in @SYSCONFDIR@/local.d/*.start ; do
-	for file in @SYSCONFDIR@/local.d/*.start; do
+		[ -x "$file" ] && "$file"
-		if [ -x "${file}" ]; then
-			vebegin "Executing \"${file}\""
-			"${file}" 2>&1 >/dev/null
-			retval=$?
-			if [ ${retval} -ne 0 ]; then
-				has_errors=1
-			fi
-			veend ${retval} "Execution of \"${file}\" failed."
-		fi
 	done
-	eoutdent
 
-	if command -v local_start >/dev/null 2>&1; then
+	if type local_start >/dev/null 2>&1; then
-		ewarn "\"@SYSCONFDIR@/conf.d/local\" should be removed."
+		ewarn "@SYSCONFDIR@/conf.d/local should be removed."
 		ewarn "Please move the code from the local_start function"
-		ewarn "to executable scripts with an .start extension"
+		ewarn "to scripts with an .start extension"
-		ewarn "in \"@SYSCONFDIR@/local.d\""
+		ewarn "in @SYSCONFDIR@/local.d"
 		local_start
 	fi
 
-	eend ${has_errors}
+	eend 0
-
-	# We have to end with a zero exit code, because a failed execution
-	# of an executable @SYSCONFDIR@/local.d/*.start file shouldn't result in
-	# marking the local service as failed. Otherwise we are unable to
-	# execute any executable @SYSCONFDIR@/local.d/*.stop file, because a failed
-	# marked service cannot be stopped (and the stop function would
-	# actually call the executable @SYSCONFDIR@/local.d/*.stop file(s)).
-	return 0
 }
 
 stop()
 {
-	ebegin "Stopping local"
+	einfo "Stopping local"
 
-	local file has_errors=0 retval
+	local file
-	eindent
 	for file in @SYSCONFDIR@/local.d/*.stop; do
-		if [ -x "${file}" ]; then
+		[ -x "$file" ] && "$file"
-			vebegin "Executing \"${file}\""
-			"${file}" 2>&1 >/dev/null
-			retval=$?
-			if [ ${retval} -ne 0 ]; then
-				has_errors=1
-			fi
-			veend ${retval} "Execution of \"${file}\" failed."
-		fi
 	done
-	eoutdent
 
-	if command -v local_stop >/dev/null 2>&1; then
+	if type local_start >/dev/null 2>&1; then
-		ewarn "\"@SYSCONFDIR@/conf.d/local\" should be removed."
+		ewarn "@SYSCONFDIR@/conf.d/local should be removed."
 		ewarn "Please move the code from the local_stop function"
-		ewarn "to executable scripts with an .stop extension"
+		ewarn "to scripts with an .stop extension"
-		ewarn "in \"@SYSCONFDIR@/local.d\""
+		ewarn "in @SYSCONFDIR@/local.d"
 		local_stop
 	fi
 
-	eend ${has_errors}
+	eend 0
-
-	# An executable @SYSCONFDIR@/local.d/*.stop file which failed with a
-	# non-zero exit status is not a reason to mark this service
-	# as failed, therefore we have to end with a zero exit code.
-	return 0
 }

init.d/localmount.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@SBINDIR@/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
@@ -59,35 +59,10 @@ stop()
 	no_umounts_r="^($no_umounts_r)$"
 
 	# Flush all pending disk writes now
-	sync
+	sync; sync
 
 	. "$RC_LIBEXECDIR"/sh/rc-mount.sh
 
-	if [ "$RC_UNAME" = Linux ] && [ -d /sys/fs/aufs ] ; then
-		#if / is aufs we remount it noxino during shutdown
-		if mountinfo -q -f '^aufs$' / ; then
-			mount -o remount,noxino,rw /
-			sync
-		fi
-
-		local aufs_branch aufs_mount_dir aufs_mount_point aufs_si_dir aufs_si_id
-		for aufs_si_dir in /sys/fs/aufs/*; do
-			aufs_mount_dir=${aufs_si_dir#/sys/fs/aufs/}
-			aufs_si_id="$(printf "%s" $aufs_mount_dir | sed 's/_/=/g')"
-			aufs_mount_point="$(mountinfo -o ${aufs_si_id})"
-			for x in $aufs_si_dir/br[0-9][0-9][0-9]; do
-				aufs_branch=$(sed 's/=.*//g' $x)
-				eindent
-				if ! mount -o "remount,del:$aufs_branch" "$aufs_mount_point" > /dev/null 2>&1; then
-					ewarn "Failed to remove branch $aufs_branch from aufs \
-						$aufs_mount_point"
-				fi
-				eoutdent
-				sync
-			done
-		done
-	fi
-
 	# Umount loop devices
 	einfo "Unmounting loop devices"
 	eindent

init.d/loopback.in

@@ -1,35 +0,0 @@
-#!@SBINDIR@/openrc-run
-# Copyright (c) 2013 William Hubbs <w.d.hubbs@gmail.com>
-# Released under the 2-clause BSD license.
-
-description="Configures the loopback interface."
-
-depend()
-{
-	keyword -jail -prefix -vserver
-}
-
-start()
-{
-	if [ "$RC_UNAME" = Linux ]; then
-		ebegin "Bringing up network interface lo"
-		if command -v ip > /dev/null 2>&1; then
-			ip addr add 127.0.0.1/8 dev lo brd + scope host
-			ip route add 127.0.0.0/8 dev lo scope host
-			ip link set lo up
-		else
-			ifconfig lo 127.0.0.1 netmask 255.0.0.0
-			route add -net 127.0.0.0 netmask 255.0.0.0 gw 127.0.0.1
-		fi
-	else
-		ebegin "Bringing up network interface lo0"
-		ifconfig lo0 127.0.0.1 netmask 255.0.0.0
-		route -q add -inet 127.0.0.0 -netmask 255.0.0.0 127.0.0.1
-	fi
-	eend $?
-}
-
-stop()
-{
-	return 0
-}

init.d/mixer.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@SBINDIR@/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d/modules.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@SBINDIR@/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d/mount-ro.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@SBINDIR@/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
@@ -15,7 +15,7 @@ start()
 	local ret=0
 
 	# Flush all pending disk writes now
-	sync
+	sync; sync
 
 	ebegin "Remounting remaining filesystems read-only"
 	# We need the do_unmount function

init.d/moused.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@SBINDIR@/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d/mtab.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@SBINDIR@/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
@@ -12,16 +12,13 @@ depend()
 
 start()
 {
-	if [ -L /etc/mtab ]; then
+	if [ -L /etc/mtab ]
+	then
+		einfo "Skipping mtab update (mtab is a symbolic link)"
 		return 0
 	fi
 
 	ebegin "Updating /etc/mtab"
-	vewarn "The support for updating /etc/mtab as a file is"
-	vewarn "deprecated and will be removed in the future."
-	vewarn "Please run the following command as root on your system."
-	vewarn
-	vewarn "ln -snf /proc/self/mounts /etc/mtab"
 	if ! echo 2>/dev/null >/etc/mtab; then
 		ewend 1 "/etc/mtab is not updateable"
 		return 0

init.d/netmount.in

@@ -1,13 +1,16 @@
-#!@SBINDIR@/openrc-run
+#!@SBINDIR@/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
-description="Mounts network shares according to /etc/fstab."
+description="Mounts network shares, other than NFS, according to /etc/fstab."
+# We skip all NFS shares in this script because they require extra
+# daemons to be running on the client in order to work correctly.
+# It is best to allow nfs-utils to handle all nfs shares.
 
 depend()
 {
 	config /etc/fstab
-	use afc-client amd nfsclient autofs openvpn
+	use afc-client amd autofs openvpn
 	use dns
 	keyword -jail -prefix -vserver -lxc
 }
@@ -16,6 +19,11 @@ start()
 {
 	local x= fs= rc=
 	for x in $net_fs_list $extra_net_fs_list; do
+		case "$x" in
+			nfs|nfs4)
+			continue
+			;;
+		esac
 		fs="$fs${fs:+,}$x"
 	done
 
@@ -38,7 +46,14 @@ stop()
 	. "$RC_LIBEXECDIR"/sh/rc-mount.sh
 
 	for x in $net_fs_list $extra_net_fs_list; do
-		fs="$fs${fs:+,}$x"
+		case "$x" in
+			nfs|nfs4)
+				continue
+				;;
+			*)
+				fs="$fs${fs:+,}$x"
+				;;
+		esac
 	done
 	if [ -n "$fs" ]; then
 		umount -at $fs || eerror "Failed to simply unmount filesystems"
@@ -47,7 +62,14 @@ stop()
 	eindent
 	fs=
 	for x in $net_fs_list $extra_net_fs_list; do
-		fs="$fs${fs:+|}$x"
+		case "$x" in
+			nfs|nfs4)
+				continue
+				;;
+			*)
+				fs="$fs${fs:+|}$x"
+				;;
+		esac
 	done
 	[ -n "$fs" ] && fs="^($fs)$"
 	do_unmount umount ${fs:+--fstype-regex} $fs --netdev

init.d/network.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@SBINDIR@/runscript
 # Copyright (c) 2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
@@ -46,11 +46,7 @@ sys_interfaces()
 		local w= rest= i= cmd=$1
 		while read w rest; do
 			i=${w%%:*}
-			case "$i" in
+			[ "$i" != "$w" ] || continue
-				"$w") continue ;;
-				lo|lo0) continue ;;
-				*) ;;
-			esac
 			if [ "$cmd" = u ]; then
 				ifconfig "$i" | grep -q "[ ]*UP" || continue
 			fi

init.d/newsyslog.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@SBINDIR@/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d/nscd.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@SBINDIR@/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d/numlock.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@SBINDIR@/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d/pf.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@SBINDIR@/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
@@ -17,7 +17,7 @@ depend() {
 start()
 {
 	ebegin "Starting $name"
-	if command -v kldload >/dev/null 2>&1; then
+	if type kldload >/dev/null 2>&1; then
 		kldload pf 2>/dev/null
 	fi
 	pfctl -q -F all

init.d/powerd.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@SBINDIR@/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d/procfs.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@SBINDIR@/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
@@ -61,10 +61,10 @@ start()
 	fi
 
 	# Setup Kernel Support for SELinux
-	if [ -d /sys/fs/selinux ] && ! mountinfo -q /sys/fs/selinux; then
+	if [ -d /selinux ] && ! mountinfo -q /selinux; then
 		if grep -qs selinuxfs /proc/filesystems; then
 			ebegin "Mounting SELinux filesystem"
-			mount -t selinuxfs selinuxfs /sys/fs/selinux
+			mount -t selinuxfs selinuxfs /selinux
 			eend $?
 		fi
 	fi

init.d/rarpd.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@SBINDIR@/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d/rc-enabled.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@SBINDIR@/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d/root.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@SBINDIR@/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d/rpcbind.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@SBINDIR@/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d/savecache.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@SBINDIR@/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
@@ -13,8 +13,8 @@ start()
 			return 1
 		fi
 	fi
-	if ! checkpath -W "$RC_LIBEXECDIR"/cache; then
+	if ! checkpath -W "$RC_LIBEXECDIR"; then
-		ewarn "WARNING: ${RC_LIBEXECDIR}/cache is not writable!"
+		ewarn "WARNING: ${RC_LIBEXECDIR} is not writable!"
 		if ! yesno "${RC_GOINGDOWN}"; then
 			ewarn "Unable to save deptree cache"
 			return 1

init.d/savecore.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@SBINDIR@/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d/staticroute.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@SBINDIR@/runscript
 # Copyright (c) 2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d/swap-blk.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@SBINDIR@/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d/swap.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@SBINDIR@/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d/swapfiles.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@SBINDIR@/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d/swclock.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@SBINDIR@/runscript
 # Copyright (c) 2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
@@ -17,7 +17,7 @@ start()
 {
 	ebegin "Setting the local clock based on last shutdown time"
 	if ! swclock 2> /dev/null; then
-	swclock --warn @SBINDIR@/openrc-run
+	swclock --warn @SBINDIR@/runscript
 	fi
 	eend $?
 }

init.d/syscons.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@SBINDIR@/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d/sysctl.BSD.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@SBINDIR@/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d/sysctl.GNU-kFreeBSD.in

@@ -1,31 +0,0 @@
-#!@SBINDIR@/openrc-run
-# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
-
-depend()
-{
-	before bootmisc logger
-	keyword -prefix
-}
-
-start()
-{
-	[ -e /etc/sysctl.conf ] || return 0
-	local retval=0 var= comments= conf=
-	ebegin "Configuring kernel parameters"
-	eindent
-	for conf in @SYSCONFDIR@/sysctl.conf @SYSCONFDIR@/sysctl.d/*.conf; do
-		if [ -r "$conf" ]; then
-			vebegin "applying $conf"
-			while read var comments; do
-				case "$var" in
-				""|"#"*) continue;;
-				esac
-				sysctl -w "$var" >/dev/null || retval=1
-			done < "$conf"
-			veend $retval
-		fi
-	done
-	eoutdent
-	eend $retval "Some errors were encountered"
-}

init.d/sysctl.GNU.in

@@ -1,32 +0,0 @@
-#!@PREFIX@/sbin/runscript
-# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
-#FIXME: Modify for GNU/Hurd
-
-depend()
-{
-	before bootmisc logger
-	keyword -prefix
-}
-
-start()
-{
-	[ -e /etc/sysctl.conf ] || return 0
-	local retval=0 var= comments= conf=
-	ebegin "Configuring kernel parameters"
-	eindent
-	for conf in @SYSCONFDIR@/sysctl.conf @SYSCONFDIR@/sysctl.d/*.conf; do
-		if [ -r "$conf" ]; then
-			vebegin "applying $conf"
-			while read var comments; do
-				case "$var" in
-				""|"#"*) continue;;
-				esac
-				sysctl -w "$var" >/dev/null || retval=1
-			done < "$conf"
-			veend $retval
-		fi
-	done
-	eoutdent
-	eend $retval "Some errors were encountered"
-}

init.d/sysctl.Linux.in

@@ -1,16 +1,42 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
 depend()
 {
 	before bootmisc logger
-	keyword -prefix -vserver
+	keyword -lxc -vserver
 }
 
 start()
 {
+	local conf= retval=0 err errs
+
 	ebegin "Configuring kernel parameters"
-	sysctl --system
+	eindent
-	eend $? "Unable to configure some kernel parameters"
+
+	# default sysctl System V max shared memory to 1/4 of RAM:
+	mem_bytes=`awk '/MemTotal:/ { printf "%0.f",$2 * 1024}' /proc/meminfo`
+	mem_max=`expr $mem_bytes / 4`
+	page_size=`getconf PAGE_SIZE`
+	shmall=`expr $mem_bytes / $page_size`
+	sysctl kernel.shmmax=$mem_max > /dev/null
+	sysctl kernel.shmall=$shmall > /dev/null
+
+	for conf in @SYSCONFDIR@/sysctl.conf @SYSCONFDIR@/sysctl.d/*.conf; do
+		if [ -r "$conf" ]; then
+			vebegin "applying $conf"
+			if ! err=$(sysctl -p "$conf" 2>&1 >/dev/null) ; then
+				errs="${errs} ${err}"
+				sysctl -e -p "${conf}" >/dev/null
+			fi
+			veend $? || retval=1
+		fi
+	done
+
+	eoutdent
+	if [ ${retval} -eq 0 ] && [ -n "${errs}" ] ; then
+		ewarn "Unknown keys:${errs}"
+	fi
+	eend $retval "Some errors were encountered: ${errs}"
 }

init.d/sysfs.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@SBINDIR@/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
@@ -99,22 +99,19 @@ mount_misc()
 
 mount_cgroups()
 {
-	mountinfo -q /sys/fs/cgroup || return 0
+		mountinfo -q /sys/fs/cgroup || return 0
 
-	if ! mountinfo -q /sys/fs/cgroup/openrc; then
+	local agent="@LIBEXECDIR@/sh/cgroup-release-agent.sh"
-		local agent="@LIBEXECDIR@/sh/cgroup-release-agent.sh"
+	mkdir /sys/fs/cgroup/openrc
-		mkdir /sys/fs/cgroup/openrc
+	mount -n -t cgroup \
-		mount -n -t cgroup \
+		-o none,${sysfs_opts},name=openrc,release_agent="$agent" \
-			-o none,${sysfs_opts},name=openrc,release_agent="$agent" \
+		openrc /sys/fs/cgroup/openrc
-			openrc /sys/fs/cgroup/openrc
+	echo 1 > /sys/fs/cgroup/openrc/notify_on_release
-		echo 1 > /sys/fs/cgroup/openrc/notify_on_release
-	fi
 
 	yesno ${rc_controller_cgroups:-YES} && [ -e /proc/cgroups ] || return 0
 	while read name hier groups enabled rest; do
 		case "${enabled}" in
-			1)	mountinfo -q /sys/fs/cgroup/${name} && continue
+			1)	mkdir /sys/fs/cgroup/${name}
-				mkdir /sys/fs/cgroup/${name}
 				mount -n -t cgroup -o ${sysfs_opts},${name} \
 					${name} /sys/fs/cgroup/${name}
 				;;
@@ -122,21 +119,18 @@ mount_cgroups()
 	done < /proc/cgroups
 }
 
-restorecon_sys()
-{
-	if [ -x /sbin/restorecon ]; then
-		ebegin "Restoring SELinux contexts in /sys"
-		restorecon -F /sys/devices/system/cpu/online >/dev/null 2>&1
-		restorecon -rF /sys/fs/cgroup >/dev/null 2>&1
-		eend $?
-	fi
-}
-
 start()
 {
+	local retval
 	mount_sys
-	mount_misc
+	retval=$?
-	mount_cgroups
+	if [ $retval -eq 0 ]; then
-	restorecon_sys
+		mount_misc
-	return 0
+		retval=$?
+	fi
+	if [ $retval -eq 0 ]; then
+		mount_cgroups
+		retval=$?
+	fi
+	return $retval
 }

init.d/syslogd.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@SBINDIR@/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d/termencoding.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@SBINDIR@/runscript
 # Copyright (c) 2008-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d/tmpfiles.dev.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@SBINDIR@/runscript
 # Copyright 1999-2012 Gentoo Foundation
 # Released under the 2-clause BSD license.
 
@@ -14,7 +14,7 @@ depend()
 start()
 {
 	ebegin "setting up tmpfiles.d entries for /dev"
-	@LIBEXECDIR@/sh/tmpfiles.sh --prefix=/dev --create --boot ${tmpfiles_opts}
+	@LIBEXECDIR@/sh/tmpfiles.sh --prefix=/dev --create ${tmpfiles_opts}
 	eend $?
 	return 0
 }

init.d/tmpfiles.setup.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@SBINDIR@/runscript
 # Copyright 1999-2012 Gentoo Foundation
 # Released under the 2-clause BSD license.
 

init.d/ttys.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@SBINDIR@/runscript
 # Copyright (c) 2008 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d/urandom.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@SBINDIR@/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

init.d/wscons.in

@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+#!@SBINDIR@/runscript
 # Copyright (c) 2008-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 

man/Makefile

@@ -1,7 +1,7 @@
 MAN3=		einfo.3 \
 		rc_config.3 rc_deptree.3 rc_find_pids.3 rc_plugin_hook.3 \
 		rc_runlevel.3 rc_service.3 rc_stringlist.3
-MAN8=		rc-service.8 rc-status.8 rc-update.8 openrc.8 openrc-run.8 \
+MAN8=		rc-service.8 rc-status.8 rc-update.8 rc.8 runscript.8 \
 		service.8 start-stop-daemon.8
 
 # Handy macro to create symlinks

man/einfo.3

@@ -105,8 +105,7 @@ and
 respectively, but only work when
 .Va EINFO_VERBOSE
 is true. You can also make the
-.Fn einfo ,
+.Fn einfo
-.Fn ewarn ,
 and
 .Fn ebegin
 functions silent by setting
@@ -185,12 +184,6 @@ when set to true makes the
 and
 .Fn einfon
 family of functions quiet, so nothing is printed.
-.Va EERROR_QUIET
-when set to true makes the
-.Fn eerror
-and
-.Fn eerrorn
-family of functions quiet, so nothing is printed.
 .Pp
 .Va EINFO_VERBOSE
 when set to true makes the

man/rc-service.8

@@ -63,7 +63,7 @@ otherwise -1.
 .Fl r , -resolve
 does the same and also prints the full path of the service to stdout.
 .Sh SEE ALSO
-.Xr openrc 8 ,
+.Xr rc 8 ,
 .Xr stdout 3
 .Sh AUTHORS
 .An Roy Marples <roy@marples.name>

man/rc-status.8

@@ -66,7 +66,7 @@ exits 0, except when checking for crashed services and it doesn't find any.
 tries to list services within each runlevel in the presently resolved
 dependency order if the dependency tree is available.
 .Sh SEE ALSO
-.Xr openrc 8 ,
+.Xr rc 8 ,
 .Xr rc-update 8
 .Sh AUTHORS
 .An Roy Marples <roy@marples.name>

man/rc-update.8

@@ -21,7 +21,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd Jan 13, 2014
+.Dd May 2, 2009
 .Dt RC-UPDATE 8 SMM
 .Os OpenRC
 .Sh NAME
@@ -35,7 +35,6 @@
 .Op Ar runlevel ...
 .Nm
 .Op Fl s , -stack
-.Op Fl a , -all
 .Ar delete
 .Ar service
 .Op Ar runlevel ...
@@ -54,8 +53,7 @@ All services must reside in the
 or
 .Pa /usr/local/etc/init.d
 directories.
-They must also be standard OpenRC scripts, meaning they must use
+They must also conform to the OpenRC runscript standard.
-openrc-run.
 .Pp
 .Bl -tag -width "Fl a , -delete service"
 .It Ar add Ar service
@@ -87,16 +85,8 @@ If the
 .Fl s , -stack
 option is given then we either add or remove the runlevel from the runlevel.
 This allows inheritance of runlevels.
-
-If the
-.Fl a, -all
-option is given, we remove the service from all runlevels. This is
-useful, for example, to clean up the dangling symlinks after a service
-is removed.
 .Sh SEE ALSO
-.Xr openrc 8 ,
+.Xr rc 8 ,
-.Xr openrc-run 8 ,
 .Xr rc-status 8
 .Sh AUTHORS
 .An Roy Marples <roy@marples.name>
-.An The OpenRC Team <openrc@gentoo.org>

man/rc.8

@@ -22,10 +22,10 @@
 .\" SUCH DAMAGE.
 .\"
 .Dd May 2, 2009
-.Dt OPENRC 8 SMM
+.Dt RC 8 SMM
 .Os OpenRC
 .Sh NAME
-.Nm openrc
+.Nm rc
 .Nd stops and starts services for the specified runlevel
 .Sh SYNOPSIS
 .Nm

man/rc_deptree.3

@@ -107,6 +107,6 @@ when done.
 .Xr malloc 3 ,
 .Xr free 3 ,
 .Xr rc_stringlist_free 3 ,
-.Xr openrc-run 8
+.Xr runscript 8
 .Sh AUTHORS
 .An Roy Marples <roy@marples.name>

man/rc_plugin_hook.3

@@ -44,7 +44,7 @@ is set to the name of the runlevel or name of the service.
 Plugins can affect the parent environment by writing NULL separated strings to
 .Va rc_environ_fd .
 .Sh SEE ALSO
-.Xr openrc 8 ,
+.Xr rc 8 ,
-.Xr openrc-run 8
+.Xr runscript 8
 .Sh AUTHORS
 .An Roy Marples <roy@marples.name>

man/rc_service.3

@@ -141,7 +141,7 @@ is lost.
 returns a list of extra commands the
 .Fa service
 supports beyond the default ones. See
-.Nm openrc-run
+.Nm runscript
 for default commands.
 .Pp
 .Fn rc_service_plugable

man/runscript.8

@@ -22,10 +22,10 @@
 .\" SUCH DAMAGE.
 .\"
 .Dd December 31, 2011
-.Dt openrc-run 8 SMM
+.Dt RUNSCRIPT 8 SMM
 .Os OpenRC
 .Sh NAME
-.Nm openrc-run
+.Nm runscript
 .Nd a means of hooking shell commands into a service
 .Sh SYNOPSIS
 .Nm
@@ -47,7 +47,7 @@ and finally the script itself. At this point
 then runs the command given.
 .Pp
 Commands are defined as shell functions within the script. Here is a list of
-some functions that all scripts have by default:
+some functions that all runscripts have by default:
 .Bl -tag -width "RC_DEFAULTLEVEL"
 .It Ar describe
 Describes what the service does and each command the service defines.
@@ -60,12 +60,12 @@ First we ensure that any services that depend on us are stopped. If any
 services that need us fail to stop then we exit with a suitable error,
 otherwise call the supplied stop function if it exists.
 .It Ar restart
-Stops and starts the service, including dependencies. This cannot be
+Stop and start the service, including dependencies. This cannot be
 overridden. See the description of the RC_CMD variable below for the
 method to make your service behave differently when restart is being
 executed.
 .It Ar status
-Shows the status of the service. The return code matches the status, with the
+Show the status of the service. The return code matches the status, with the
 exception of "started" returning 0 to match standard command behaviour.
 .It Ar zap
 Resets the service state to stopped and removes all saved data about the
@@ -88,8 +88,8 @@ Output from any non OpenRC commands is not affected.
 .It Fl v , -verbose
 Turns on any extra informational output the service generates.
 .It Fl Z , -dry-run
-Shows which services would be stopped and/or started without actually stopping
+Shows what services would be stopped and/or started without actually starting
-or starting them.
+or stopping them.
 .El
 .Pp
 The following variables affect the service script:
@@ -120,9 +120,6 @@ Set this to "true", "yes" or "1" (case-insensitive) to force the daemon into
 the background. This implies the "--make-pidfile" and "--pidfile" option of
 .Xr start-stop-daemon 8
 so the pidfile variable must be set.
-.It Ar chroot
-.Xr start-stop-daemon 8
-will chroot into this path before writing the pid file or starting the daemon.
 .It Ar pidfile
 Pidfile to use for the above defined command.
 .It Ar name
@@ -134,12 +131,6 @@ timeout in seconds or multiple signal/timeout pairs (like SIGTERM/5).
 A list of directories which must exist for the service to start.
 .It Ar required_files
 A list of files which must exist for the service to start.
-.It Ar start_inactive
-Set to yes to have the service marked inactive when it starts. This is
-used along with in_background_fake to support re-entrant services.
-.It Ar in_background_fake
-Space separated list of commands which should always succeed when
-in_background is yes.
 .El
 .Sh DEPENDENCIES
 You should define a
@@ -330,36 +321,16 @@ Mark the service as inactive.
 .Op Fl f , -file
 .Op Fl p , -pipe
 .Op Fl m , -mode Ar mode
-.Op Fl o , -owner Ar owner
+.Op Fl o , owner Ar owner
-.Op Fl W , -writable
-.Op Fl q , -quiet
 .Ar path ...
 .Xc
-If -d, -f or -p is specified, checkpath checks to see if the path
+Checks to see if the path exists, is of the right type, owned by the right
-exists, is the right type and has the correct owner and access modes. If
+people and has the correct access modes. If not, then it corrects the path.
-any of these tests fail, the path is created and set up as specified. If
+.It Ic checkpath
-more than one of -d, -f or -p are specified, the last one will be used.
+.Op Fl W , -writable
-
+.Ar path
-The argument to -m is a three or four digit octal number. If this option
+.Xc
-is not provided, the value defaults to 0644 for files and 0775 for
+checks to see if the path is writable.
-directories.
-
-The argument to -o is a representation of the user and/or group which
-should own the path. The user and group can be represented numerically
-or with names, and are separated by a colon.
-
-The truncate options (-D and -F) cause the directory or file to be
-cleared of all contents.
-
-If -W is specified, checkpath checks to see if the first path given on
-the command line is writable.  This is different from how the test
-command in the shell works, because it also checks to make sure the file
-system is not read only.
-
-Also, the -d, -f or -p options should not be specified along with this option.
-
-The -q option suppresses all informational output. If it is specified
-twice, all error messages are suppressed as well.
 .It Ic yesno Ar value
 If
 .Ar value
@@ -371,10 +342,8 @@ sets the following environment variables for use in the service scripts:
 .Bl -tag -width "RC_DEFAULTLEVEL"
 .It Va RC_SVCNAME
 Name of the service.
-.It Va RC_SERVICE
-Full path to the service.
 .It Va RC_RUNLEVEL
-Current runlevel that OpenRC is in. Note that, in OpenRC, the reboot
+Current runlevel that rc is in. Note that, in OpenRC, the reboot
 runlevel is mapped to the shutdown runlevel. This was done because most
 services do not need to know if a system is shutting down or rebooting.
 If you are writing a service that does need to know this, see the
@@ -398,15 +367,6 @@ The result of `uname -s`.
 This contains the name of the command the service script is executing, such
 as start, stop, restart etc. One example of using this is to make a
 service script behave differently when restart is being executed.
-.It Va RC_GOINGDOWN
-This variable contains YES if the system is going into single user mode
-or shutting down.
-.It Va RC_LIBEXECDIR
-The value of libexecdir which OpenRC was configured with during build
-time.
-.It Va RC_NO_UMOUNTS
-This variable is used by plugins to contain a list of directories which
-should not be unmounted.
 .El
 .Sh FILES
 .Pp
@@ -451,7 +411,7 @@ rc_keyword="!-prefix"
 .Pp
 An example service script for foo.
 .Bd -literal -offset indent
-#!/sbin/openrc-run
+#!/sbin/runscript
 command=/usr/bin/foo
 command_args="${foo_args} --bar"
 pidfile=/var/run/foo.pid
@@ -511,7 +471,7 @@ start_pre()
 		# stop_post.
 	fi
     # Ensure that our dirs are correct
-    checkpath --directory --owner foo:foo --mode 0775 \\
+    checkpath --dir --owner foo:foo --mode 0664 \\
 	/var/run/foo /var/cache/foo
 }
 
@@ -576,7 +536,7 @@ Instead we return 1 to be compliant with Gentoo baselayout.
 Users are encouraged to use the is_newer_than function which returns correctly.
 .Sh SEE ALSO
 .Xr einfo 3 ,
-.Xr openrc 8 ,
+.Xr rc 8 ,
 .Xr rc-status 8 ,
 .Xr rc-update 8 ,
 .Xr rc_plugin_hook 3 ,

man/start-stop-daemon.8

@@ -139,7 +139,7 @@ option.
 Modifies the IO scheduling priority of the daemon.
 Class can be 0 for none, 1 for real time, 2 for best effort and 3 for idle.
 Data can be from 0 to 7 inclusive.
-.It Fl N , -nicelevel Ar level
+.It Fl N , -nice Ar level
 Modifies the scheduling priority of the daemon.
 .It Fl 1 , -stdout Ar logfile
 Redirect the standard output of the process to logfile when started with

mk/dist.mk

@@ -8,17 +8,12 @@ DISTFILE?=	${DISTPREFIX}.tar.bz2
 
 CLEANFILES+=	${NAME}-*.tar.bz2
 
-CHANGELOG_LIMIT?= --after="1 year ago"
-
 _SNAP_SH=	date -u +%Y%m%d%H%M
 _SNAP:=		$(shell ${_SNAP_SH})
 SNAP=		${_SNAP}
 SNAPDIR=	${DISTPREFIX}-${SNAP}
 SNAPFILE=	${SNAPDIR}.tar.bz2
 
-changelog:
-	git log ${CHANGELOG_LIMIT} --format=medium > ChangeLog
-
 dist:
 	git archive --prefix=${DISTPREFIX}/ ${GITREF} | bzip2 > ${DISTFILE}