openrc-0.7.0 upstream merge

openrc-0.6.8
Unprivileged users (such as services for example) should not be able view who is logged into system.
2011-01-20 14:00:29 -07:00 · 2010-12-16 11:17:34 +01:00 · 2010-12-16 10:04:46 +01:00 · 2010-12-03 20:06:34 -07:00 · 2010-11-26 17:02:16 -07:00 · 2010-11-26 16:59:28 -07:00
301 changed files with 9088 additions and 6497 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,16 +1 @@
 *.bz2
-
-*.diff
-*.patch
-*.orig
-*.rej
-
-core
-.gdb_history
-.gdbinit
-
-.depend
-*.a
-*.o
-*.So
-lib*.so
--- a/990
+++ b/990
@@ -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
--- a/90
+++ b/90
@@ -5,9 +5,50 @@ removed, it should also be removed from this file.

 ---------------------------

+What: rc_sys automatic detection code
+      - Functions for removal: rc_sys_v1, rc_sys_v2
+
+When: 2011/03/01
+
+Why: The original automatic sub-system detection is flawed in that it cannot
+	 safely detect some variables (Using cgroups confused it to think you were
+	 using LXC, and Prefix cannot be detect by definition). Also, almost all of
+	 the detection requires that /proc is available and readable. During early
+	 boot, /proc may not be mounted yet, leading to mis-detection. The readable
+	 condition can also fail under some hardened kernels when running as an
+	 unprivileged user.
+
+	 The new rc_sys_v2 function uses the rc_sys variable from rc.conf. After
+	 the removal, the contents of the rc_sys_v2 function will move into the
+	 rc_sys function.
+
+Who:  Robin H. Johnson <robbat2@gentoo.org>
+
+---------------------------
+
+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 +56,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 +68,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:
-
---------------------------
--- a/26
+++ b/26
@@ -1,16 +1,26 @@
 # OpenRC Makefile
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# All rights reserved. Released under the 2-clause BSD license.

 include Makefile.inc

-SUBDIR=		conf.d etc init.d local.d man scripts sh src sysctl.d
+SUBDIR=		conf.d etc init.d man scripts sh src
+
+# Build our old net foo or not
+_OLDNET_SH=	case "${MKOLDNET}" in \
+		[Yy][Ee][Ss]) echo "net doc";; \
+		*) echo "";; \
+		esac
+_OLDNET!=	${_OLDNET_SH}
+SUBDIR+=	${_OLDNET}$(shell ${_OLDNET_SH})

 # Build pkgconfig or not
-MKPKGCONFIG?=	yes
-ifeq (${MKPKGCONFIG},yes)
-SUBDIR+=	pkgconfig
-endif
+_PKGCONFIG_SH=	case "${MKPKGCONFIG}" in \
+		[Yy][Ee][Ss]|"") echo "pkgconfig";; \
+		*) echo "";; \
+		esac
+_PKGCONFIG!=	${_PKGCONFIG_SH}
+SUBDIR+=	${_PKGCONFIG}$(shell ${_PKGCONFIG_SH})

 # We need to ensure that runlevels is done last
 SUBDIR+=	runlevels
@@ -25,10 +35,6 @@ include ${MK}/dist.mk
 include ${MK}/git.mk

 _installafter:
-ifeq (${MKPREFIX},yes)
 	${INSTALL} -d ${DESTDIR}/${LIBEXECDIR}/init.d
-else ifneq (${OS},Linux)
-	${INSTALL} -d ${DESTDIR}/${LIBEXECDIR}/init.d
-endif
 	${INSTALL} -d ${DESTDIR}/${LIBEXECDIR}/tmp
 	${ECHO} "${VERSION}${GITVER}" > ${DESTDIR}/${LIBEXECDIR}/version
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -1,3 +1,3 @@
 NAME=		openrc
-VERSION=	0.13.9
+VERSION=	0.7.0
 PKG=		${NAME}-${VERSION}
--- a/44
+++ b/44
@@ -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.
--- a/69
+++ b/69
@@ -1,24 +1,21 @@
 OpenRC README
-
+=============

 Installation
 ------------
+
 make install
-Yup, that simple. Works with GNU make.
+Yup, that simple. Works with GNU make and BSD make.

 You may wish to tweak the installation with the below arguments
 PROGLDFLAGS=-static
 LIBNAME=lib64
 DESTDIR=/tmp/openrc-image
-MKNET=no
 MKPAM=pam
-MKPREFIX=yes
 MKPKGCONFIG=no
-MKSELINUX=yes
-MKSTATICLIBS=no
 MKTERMCAP=ncurses
 MKTERMCAP=termcap
-MKTOOLS=yes
+MKOLDNET=yes
 PKG_PREFIX=/usr/pkg
 LOCAL_PREFIX=/usr/local
 PREFIX=/usr/local
@@ -27,8 +24,6 @@ We don't support building a static OpenRC with PAM.
 You may need to use PROGLDFLAGS=-Wl,-Bstatic on glibc instead of just -static.
 If you debug memory under valgrind, add -DDEBUG_MEMORY to your CPPFLAGS
 so that all malloc memory should be freed at exit.
-If you are building OpenRC for a Gentoo Prefix installation, add
-MKPREFIX=yes.

 You can also brand OpenRC if you so wish like so
 BRANDING=\"Gentoo/$(uname -s)\"
@@ -58,9 +53,53 @@ tweaking on a per distro basis. They are also non essential to the operation
 of the system.

 Reporting Bugs
--------------
-Since Gentoo Linux is hosting OpenRC development, Bugs should go to
-the Gentoo Bugzilla:
-	http://bugs.gentoo.org/
-They should be filed under the "Gentoo Hosted Projects" product and
-the "openrc" component.
+
+If you installed OpenRC from your chosen distribution, you should report
+bugs directly to them. For example, if you use Gentoo and emerged OpenRC
+then you should reports bugs to http://bugs.gentoo.org.
+
+History - by Daniel Robbins
+---------------------------
+
+The Gentoo modular network scripts were created by Daniel Robbins for
+Gentoo Linux 1.0_rc6, in development during most of 2001 and released
+in September 2001. After their development, the dependency-based initscript
+system was maintained by a number of senior developers (add names here....
+need to look at baselayout cvs logs.)
+
+excerpt from http://www.gentoo.org/news/en/gwn/20040426-newsletter.xml
+by Grant Goodyear:
+
+"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."
+
+Roy Marples became a Gentoo/Linux developer in 2004 and maintained the modular
+network scripts for the Gentoo baselayout package.  Then towards the end of
+2005, he became the the primary maintainer for baselayout.
+
+At the start of 2007, Roy Marples announced the ongoing development of
+baselayout-2, containing a rewritten initscript code in C and allowing POSIX sh
+init scripts instead of forcing the use of bash. By Mid 2007 Roy Marples had
+re-implemented the Gentoo initscript 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.
+
+Towards the end of 2007, Roy Marples retired as a Gentoo developer Baselayout-2
+was still in the pre stage, and aside from the fbsd users, it was masked
+everywhere. However, Roy Marples desired to keep the baselayout-2 project
+alive, but outside of Gentoo and into other projects such as FreeBSD.
+
+As such, the Gentoo Council permitted Roy Marples to release OpenRC under the 2
+clause BSD license, managed by him as an external project. Around mid-2010, Roy
+Marples decided to no longer maintain OpenRC. At this point, he transferred
+development back to Gentoo, which continues to maintain the scripts. In
+addition, Daniel Robbins continues to maintain an independent version OpenRC
+for Funtoo Linux, which includes a Funtoo-specific network configuration
+system.
--- a/README.busybox
+++ b/README.busybox
@@ -1,31 +0,0 @@
-Using Busybox as your Default Shell
-----------------------------------
-
-
-If you have/bin/sh linked to busybox, you need to be aware of several
-incompatibilities between busybox's applets and the standalone
-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
-configuration settings for best results with OpenRC.
-
-CONFIG_START_STOP_DAEMON -- The start-stop-daemon applet is not compatible with
-start-stop-daemon in OpenRC.
-
-CONFIG_MOUNT -- The mount applet does not support the -O [no]_netdev options to
-skip over or include network file systems when the -a option is present.
-
-CONFIG_UMOUNT -- The umount applet does not support the -O option along with -a.
-
-CONFIG_SWAPONOFF -- The swapon applet does not support the -e option
-or recognize the nofail option in fstab.
-
-CONFIG_SETFONT -- The setfont applet does not support the -u option from kbd.
-
-CONFIG_IP -- The ip applet  doesn't support the "scope" modifier for
-"ip route add" and "ip address add".
-
-There is work to get most of these supported by busybox, so this file
-will be updated as things change.
--- a/README.history
+++ b/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
--- a/README.newnet
+++ b/README.newnet
--- a/51
+++ b/51
@@ -32,54 +32,3 @@ void foo(int c)

 	return ret;
 }
-
-##################
-# COMMIT MESSAGES #
-##################
-
-The following is an example of a correctly formatted git commit message
-for this repository. Most of this information came from this blog post
-[1], so I would like to thank the author.
-
-### cut here ###
-Capitalized, short (50 chars or less) summary
-
-More detailed explanatory text, if necessary.  Wrap it to about 72
-characters or so.  In some contexts, the first line is treated as the
-subject of an email and the rest of the text as the body.  The blank
-line separating the summary from the body is critical (unless you omit
-the body entirely); tools like rebase can get confused if you run the
-two together.
-
-Write your commit message in the imperative: "Fix bug" and not "Fixed
-bug."  This convention matches up with commit messages generated by
-commands like git merge and git revert.
-
-Further paragraphs come after blank lines.
-
- Bullet points are okay, too
-
- Typically a hyphen or asterisk is used for the bullet, preceded by a
-  single space, with blank lines in between, but conventions vary here
-
- Use a hanging indent
-
-Reported-by: User Name <email>
-X-[Distro]-Bug: BugID
-X-[Distro]-Bug-URL: URL for the bug (on the distribution's web site typically)
-### cut here ###
-
-If you did not write the code and the patch does not include authorship
-information in a format git can use, please use the --author option of the
-git commit command to make the authorship correct.
-
-The Reported-by tag is required if the person who reported the bug is
-different from the author and committer.
-
-  The X-[Distro]-Bug/Bug-URL tags are required if this commit is related
-  to a bug reported to us by a specific distribution   of linux or a
-  *BSD. Also, [Distro] should be replaced with the name of the
-  distribution, e.g. X-Gentoo-Bug.
-
-[1] http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
-
--- a/16
+++ b/16
@@ -1,21 +1,7 @@
- ensure all forks block, restore and unblock signals. needs review
+- ensure all forks block, restore and unblock signals. needs review 

 - add support somehow for optional translations

 - oldnet[bridging]: Review setting of bridge configuration on dynamic interface add

 - Document rc-depend binary.
-
- _ifindex is not a reliable means of calculating metrics:
-	_ifindex is used for calculating metrics for new devices but has a major
-	problem: Since it's only the nth entry in /proc/net/dev
-	And devices may be removed from that file, and reordered, you won't always
-	get the same result.
-	If you do:
-	- add eth0 - _ifindex (eth0=0)
-	- add vlan1 - _ifindex (eth0=0,vlan1=1)
-	- add vlan2 - _ifindex (eth0=0,vlan1=1,vlan2=2)
-	- rem vlan1 - _ifindex (eth0=0,vlan2=1)
-	- add vlan3 - _ifindex (eth0=0,vlan2=1,vlan3=2)
-	Now your routing table has entries for both vlan2 and vlan3 with a metric of 2.
-
--- a/conf.d/Makefile
+++ b/conf.d/Makefile
@@ -1,28 +1,19 @@
-include ../mk/net.mk
-
 DIR=	${CONFDIR}
-CONF=	bootmisc fsck hostname localmount netmount urandom tmpfiles \
-		${CONF-${OS}}
+CONF=	bootmisc fsck hostname local localmount network staticroute urandom

-ifeq (${MKNET},yes)
-CONF+= network staticroute
 TARGETS+=	network staticroute
 CLEANFILES+=	network staticroute
-endif

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

-network: network.in network${SFX}
-	cat $^ > $@
+SOS?=	BSD

-staticroute: staticroute${SFX}
-	cp $@${SFX} $@
+network: network.in network.${SOS}
+	cp $@.in $@
+	[ -e $@.${SOS} ] && cat $@.${SOS} >> $@ || true
+
+staticroute: staticroute.${SOS}
+	cp $@.${SOS} $@
--- a/conf.d/Makefile.FreeBSD
+++ b/conf.d/Makefile.FreeBSD
@@ -0,0 +1 @@
+CONF+=	ipfw moused powerd rarpd savecore syscons
--- a/conf.d/Makefile.Linux
+++ b/conf.d/Makefile.Linux
@@ -0,0 +1,2 @@
+CONF+=	consolefont dmesg hwclock keymaps modules
+SOS=	Linux
--- a/conf.d/Makefile.NetBSD
+++ b/conf.d/Makefile.NetBSD
@@ -0,0 +1 @@
+CONF+=	moused rarpd savecore
--- a/conf.d/adjkerntz
+++ b/conf.d/adjkerntz
@@ -1,10 +1,10 @@
 # Set CLOCK to "UTC" if your system clock is set to UTC (also known as
-# Greenwich Mean Time).  If your clock is set to the local time, then
-# set CLOCK to "local".  Note that if you dual boot with Windows, then
+# Greenwich Mean Time).  If your clock is set to the local time, then 
+# set CLOCK to "local".  Note that if you dual boot with Windows, then 
 # you should set it to "local".
 clock="UTC"

-# If you want to set the Hardware Clock to the current System Time
+# If you want to set the Hardware Clock to the current System Time 
 # during shutdown, then say "YES" here.
 # You normally don't need to do this if you run a ntp daemon.
 clock_systohc="NO"
--- a/conf.d/bootmisc
+++ b/conf.d/bootmisc
@@ -4,7 +4,3 @@ clean_tmp_dirs="/tmp"
 # Should we wipe the tmp paths completely or just selectively remove known
 # locks / files / etc... ?
 wipe_tmp="YES"
-
-# Write the initial dmesg log into /var/log/dmesg after boot
-# This may be useful if you need the kernel boot log afterwards
-log_dmesg="YES"
--- a/conf.d/consolefont
+++ b/conf.d/consolefont
@@ -1,10 +1,9 @@
-# The consolefont service is not activated by default. If you need to
-# use it, you should run "rc-update add consolefont boot" as root.
-#
 # consolefont specifies the default font that you'd like Linux to use on the
 # console.  You can find a good selection of fonts in /usr/share/consolefonts;
 # you shouldn't specify the trailing ".psf.gz", just the font name below.
 # To use the default console font, comment out the CONSOLEFONT setting below.
+# This setting is used by the /etc/init.d/consolefont script (NOTE: if you do
+# not want to use it, run "rc-update del consolefont" as root).
 consolefont="default8x16"

 # consoletranslation is the charset map file to use.  Leave commented to use
--- a/conf.d/devfs
+++ b/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"
--- a/conf.d/dmesg
+++ b/conf.d/dmesg
@@ -1,3 +1,3 @@
 # Sets the level at which logging of messages is done to the
-# console.  See dmesg(1) for more info.
+# console.  See dmesg(8) for more info.
 dmesg_level="1"
--- a/conf.d/fsck
+++ b/conf.d/fsck
@@ -13,13 +13,6 @@
 #fsck_passno=">1"
 #fsck_passno="<2"

-# If passno is not enough granularity, you can also specify mountpoints to
-# check. This should NOT be used for the default non-multiplexed fsck, or your
-# system might not be checked. Additionally, it is mutually exclusive with
-# the fsck_passno setting.
-#fsck_mnt=""
-#fsck_mnt="/home"
-
 # Most modern fs's don't require a full fsck on boot, but for those that do
 # it may be advisable to skip this when running on battery.
 # WARNING: Do not turn this off if you have any JFS partitions.
--- a/conf.d/hwclock
+++ b/conf.d/hwclock
@@ -1,19 +1,13 @@
 # Set CLOCK to "UTC" if your Hardware Clock is set to UTC (also known as
-# Greenwich Mean Time).  If that clock is set to the local time, then
-# set CLOCK to "local".  Note that if you dual boot with Windows, then
+# Greenwich Mean Time).  If that clock is set to the local time, then 
+# set CLOCK to "local".  Note that if you dual boot with Windows, then 
 # you should set it to "local".
 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
-# and using NTP to synchronize your system clock.
-#clock_hctosys="YES"
-
-# If you do not want to set the hardware clock to the current system
-# time (software clock) during shutdown, set this to no.
-#clock_systohc="YES"
+# If you want to set the Hardware Clock to the current System Time 
+# (software clock) during shutdown, then say "YES" here.
+# You normally don't need to do this if you run a ntp daemon.
+clock_systohc="NO"

 # If you wish to pass any other arguments to hwclock during bootup,
 # you may do so here. Alpha users may wish to use --arc or --srm here.
--- a/conf.d/keymaps
+++ b/conf.d/keymaps
@@ -1,23 +1,21 @@
-# Use keymap to specify the default console keymap.  There is a complete tree
+# Use KEYMAP to specify the default console keymap.  There is a complete tree
 # of keymaps in /usr/share/keymaps to choose from.
 keymap="us"

 # Should we first load the 'windowkeys' console keymap?  Most x86 users will
 # say "yes" here.  Note that non-x86 users should leave it as "no".
-# Loading this keymap will enable VT switching (like ALT+Left/Right)
-# using the special windows keys on the linux console.
 windowkeys="NO"

 # The maps to load for extended keyboards.  Most users will leave this as is.
 extended_keymaps=""
 #extended_keymaps="backspace keypad euro2"

-# Tell dumpkeys(1) to interpret character action codes to be
+# Tell dumpkeys(1) to interpret character action codes to be 
 # from the specified character set.
 # This only matters if you set unicode="yes" in /etc/rc.conf.
 # 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"
--- a/conf.d/killprocs
+++ b/conf.d/killprocs
@@ -1,3 +0,0 @@
-# If you wish to pass any options to killall5 during shutdown,
-# you should do so here.
-killall5_opts=""
--- a/conf.d/local
+++ b/conf.d/local
@@ -0,0 +1,18 @@
+# Here is where you can put anything you need to start
+# that there is not an init script for.
+
+local_start() {
+	# This is a good place to load any misc programs
+	# on startup (use &>/dev/null to hide output)
+
+	# We should always return 0
+	return 0
+}
+
+local_stop() {
+	# This is a good place to unload any misc.
+	# programs you started above.
+	
+	# We should always return 0
+	return 0
+}
--- a/conf.d/modules
+++ b/conf.d/modules
@@ -1,10 +1,8 @@
 # You can define a list modules for a specific kernel version,
 # a released kernel version, a main kernel version or just a list.
-# The most specific versioned variable will take precedence.
 #modules_2_6_23_gentoo_r5="ieee1394 ohci1394"
 #modules_2_6_23="tun ieee1394"
 #modules_2_6="tun"
-#modules_2="ipv6"
 #modules="ohci1394"

 # You can give modules a different name when they load - the new name
@@ -12,12 +10,10 @@
 #modules="dummy:dummy1"

 # Give the modules some arguments if needed, per version if necessary.
-# Again, the most specific versioned variable will take precedence.
 #module_ieee1394_args="debug"
-#module_ieee1394_args_2_6_23_gentoo_r5="debug2"
-#module_ieee1394_args_2_6_23="debug3"
-#module_ieee1394_args_2_6="debug4"
-#module_ieee1394_args_2="debug5"
+#module_ieee1394_args_2_6_23_gentoo_r5="ieee1394 ohci1394"
+#module_ieee1394_args_2_6_23="tun ieee1394"
+#module_ieee1394_args_2_6="tun"

 # You should consult your kernel documentation and configuration
 # for a list of modules and their options.
--- a/conf.d/moused
+++ b/conf.d/moused
@@ -11,6 +11,6 @@

 # You can also multiplex the init script for each device like so
 #   ln -s moused /etc/init.d/moused.ums0
-# This enables you to have a config file per mouse (forces moused_device
+# This enables you to have a config file per mouse (forces moused_device 
 # to ums0 in this case) and control each mouse.
 # devd can also start and stop these mice, which laptop users will find handy.
--- a/conf.d/net
+++ b/conf.d/net
@@ -0,0 +1,4 @@
+# This blank configuration will automatically use DHCP for any net.*
+# scripts in /etc/init.d.  To create a more complete configuration,
+# please review /usr/share/doc/openrc/net.example and save your configuration
+# in /etc/conf.d/net (this file :]!).
--- a/conf.d/netmount
+++ b/conf.d/netmount
@@ -1,40 +0,0 @@
-# You will need to set the dependencies in the netmount script to match
-# the network configuration tools you are using. This should be done in
-# this file by following the examples below, and not by changing the
-# service script itself.
-#
-# Each of these examples is meant to be used separately. So, for
-# example, do not set rc_need to something like "net.eth0 dhcpcd".
-#
-# If you are using newnet and configuring your interfaces with static
-# addresses with the network script, you  should use this setting.
-#
-#rc_need="network"
-#
-# If you are using oldnet, you must list the specific net.* services you
-# need.
-#
-# This example assumes all of your netmounts can be reached on
-# eth0.
-#
-#rc_need="net.eth0"
-#
-# This example assumes some of your netmounts are on eth1 and some
-# are on eth2.
-#
-#rc_need="net.eth1 net.eth2"
-#
-# If you are using a dynamic network management tool like
-# networkmanager, dhcpcd in standalone mode, wicd, badvpn-ncd, etc, to
-# manage the network interfaces with the routes to your netmounts, you
-# should list that tool.
-#
-#rc_need="networkmanager"
-#rc_need="dhcpcd"
-#rc_need="wicd"
-#
-# The default setting is designed to be backward compatible with our
-# current setup, but you are highly discouraged from using this. In
-# other words, please change it to be more suited to your system.
-#
-rc_need="net"
--- a/conf.d/network.BSD.in
+++ b/conf.d/network.BSD.in
--- a/conf.d/network.GNU-kFreeBSD.in
+++ b/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"
--- a/conf.d/network.GNU.in
+++ b/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"
--- a/conf.d/network.Linux.in
+++ b/conf.d/network.Linux.in
--- a/conf.d/network.in
+++ b/conf.d/network.in
@@ -7,7 +7,7 @@
 # You also have ifup_eth0 and ifdown_eth0 to run other commands when
 # eth0 is started and stopped.
 # You should note that we don't stop the network at system shutdown by default.
-# If you really need this, then set keep_network=NO
+# If you really need this, then set shutdown_network=YES

 # Lastly, the interfaces variable pulls in virtual interfaces that cannot
 # be automatically detected.
--- a/conf.d/staticroute.BSD.in
+++ b/conf.d/staticroute.BSD.in
--- a/conf.d/staticroute.GNU-kFreeBSD.in
+++ b/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"
--- a/conf.d/staticroute.GNU.in
+++ b/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"
--- a/conf.d/staticroute.Linux.in
+++ b/conf.d/staticroute.Linux.in
--- a/conf.d/tmpfiles
+++ b/conf.d/tmpfiles
@@ -1,3 +0,0 @@
-# Extra options for tmpfiles.sh
-#tmpfiles_opts="--verbose"
-tmpfiles_opts=""
--- a/conf.d/urandom
+++ b/conf.d/urandom
@@ -2,4 +2,4 @@
 # (say for crypt swap), so you will need to customize this
 # behavior.  If you have /var on a separate partition, then
 # make sure this path lives on your root device somewhere.
-urandom_seed="/var/lib/misc/random-seed"
+urandom_seed="/var/run/random-seed"
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -0,0 +1 @@
+net.example
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -0,0 +1,7 @@
+DIR=	${DOCDIR}/openrc
+INC=	net.example
+
+MK=	../mk
+include ${MK}/os.mk
+include Makefile.${OS}
+include ${MK}/scripts.mk
--- a/doc/Makefile.FreeBSD
+++ b/doc/Makefile.FreeBSD
@@ -0,0 +1,5 @@
+SRCS+=		net.example.in
+
+.SUFFIXES:	.BSD.in
+.BSD.in:
+	${CP} $< $@
--- a/doc/Makefile.Linux
+++ b/doc/Makefile.Linux
@@ -0,0 +1,5 @@
+SRCS+=		net.example.in
+
+.SUFFIXES:	.Linux.in
+.Linux.in:
+	${CP} $< $@
--- a/doc/Makefile.NetBSD
+++ b/doc/Makefile.NetBSD
@@ -0,0 +1,5 @@
+SRCS+=		net.example.in
+
+.SUFFIXES:	.BSD.in
+.BSD.in:
+	${CP} $< $@
--- a/doc/net.example.BSD.in
+++ b/doc/net.example.BSD.in
@@ -0,0 +1,429 @@
+##############################################################################
+# QUICK-START
+#
+# The quickest start is if you want to use DHCP.
+# In that case, everything should work out of the box, no configuration
+# necessary, though the startup script will warn you that you haven't
+# specified anything.
+
+# WARNING :- some examples have a mixture of IPv4 (ie 192.168.0.1) and IPv6
+# (ie 4321:0:1:2:3:4:567:89ab) internet addresses. They only work if you have
+# the relevant kernel option enabled. So if you don't have an IPv6 enabled
+# kernel then remove the IPv6 address from your config.
+
+# If you want to use a static address or use DHCP explicitly, jump
+# down to the section labeled INTERFACE HANDLERS.
+#
+# If you want to do anything more fancy, you should take the time to
+# read through the rest of this file.
+
+##############################################################################
+# MODULES
+#
+# We now support modular networking scripts which means we can easily
+# add support for new interface types and modules while keeping
+# compatibility with existing ones.
+#
+# Modules load by default if the package they need is installed.  If
+# you specify a module here that doesn't have its package installed
+# then you get an error stating which package you need to install.
+# Ideally, you only use the modules setting when you have two or more
+# packages installed that supply the same service.
+#
+# In other words, you probably should DO NOTHING HERE...
+
+##############################################################################
+# INTERFACE HANDLERS
+
+# For a static configuration, use something like this
+#config_eth0="192.168.0.2/24"
+
+# If you need more than one address, you can use something like this
+# NOTE: ifconfig creates an aliased device for each extra IPv4 address
+#       (eth0:1, eth0:2, etc)
+#       iproute2 does not do this as there is no need to
+#config_eth0="192.168.0.2/24 192.168.0.3/24 192.168.0.4/24"
+
+# You can also use IPv6 addresses
+# (you should always specify a prefix length with IPv6 here)
+#config_eth0="192.168.0.2/24 4321:0:1:2:3:4:567:89ab/64 4321:0:1:2:3:4:567:89ac/64"
+
+# If you wish to keep existing addresses + routing and the interface is up,
+# you can specify a noop (no operation). If the interface is down or there
+# are no addresses assigned, then we move onto the next step (default dhcp)
+# This is useful when configuring your interface with a kernel command line
+# or similar
+#config_eth0="noop 192.168.0.2/24"
+
+# If you don't want ANY address (only useful when calling for advanced stuff)
+#config_eth0="null"
+
+# Here's how to do routing if you need it
+# We add an IPv4 default route, IPv4 subnet route and an IPv6 unicast route
+#routes_eth0="default via 192.168.0.1
+#10.0.0.0/8 via 192.168.0.1
+#::/0"
+
+# If a specified module fails (like dhcp - see below), you can specify a
+# fallback like so
+#fallback_eth0="192.168.0.2 netmask 255.255.255.0"
+#fallback_route_eth0="default via 192.168.0.1"
+
+# NOTE: fallback entry must match the entry location in config_eth0
+# As such you can only have one fallback route.
+
+# Some users may need to alter the MTU - here's how
+#mtu_eth0="1500"
+
+# Most drivers that report carrier status function correctly, but some do not
+# One of these faulty drivers is for the Intel e1000 network card, but only
+# at boot time. To get around this you may alter the carrier_timeout value for
+# the interface. -1 is disable, 0 is infinite and any other number of seconds
+# is how long we wait for carrier. The current default is 3 seconds
+#carrier_timeout_eth0=-1
+
+# You may wish to disable the interface being brought down when stopping.
+# This is only of use for WakeOnLan.
+#ifdown_eth0="NO"
+
+##############################################################################
+# OPTIONAL MODULES
+
+#-----------------------------------------------------------------------------
+# WIRELESS (802.11 support)
+# Wireless can be provided by BSDs ifconfig (iwconfig) or wpa_supplicant
+# wpa_supplicant is preferred, use the modules directive to prefer iwconfig.
+#modules="iwconfig"
+
+# ifconfig (iwconig) support is a one shot script - wpa_supplicant is daemon
+# that scans, associates and re-configures if association is lost.
+# We call it iwconfig to separate the wireless setup from ifconfig.
+####################################
+# HINTS
+#
+# Most users will just need to set the following options
+# key_SSID1="s:yourkeyhere enc open" # s: means a text key
+# key_SSID2="aaaa-bbbb-cccc-dd"      # no s: means a hex key
+# preferred_aps="SSID1 SSID2"
+#
+# Clear? Good. Now configure your wireless network below
+
+####################################
+# SETTINGS
+# Hard code an SSID to an interface - leave this unset if you wish the driver
+# to scan for available Access Points
+# I would only set this as a last resort really - use the preferred_aps
+# setting at the bottom of this file
+#essid_eth0='foo'
+
+# Some drivers/hardware don't scan all that well. We have no control over this
+# but we can say how many scans we want to do to try and get a better sweep of
+# the area. The default is 1.
+#scans_eth0="1"
+
+#Channel can be set (1-14), but defaults to 3 if not set.
+#
+# The below is taken verbatim from the BSD wavelan documentation found at
+# http://www.netbsd.org/Documentation/network/wavelan.html
+# There are 14 channels possible; We are told that channels 1-11 are legal for
+# North America, channels 1-13 for most of Europe, channels 10-13 for France,
+# and only channel 14 for Japan. If in doubt, please refer to the documentation
+# that came with your card or access point. Make sure that the channel you
+# select is the same channel your access point (or the other card in an ad-hoc
+# network) is on. The default for cards sold in North America and most of Europe
+# is 3; the default for cards sold in France is 11, and the default for cards
+# sold in Japan is 14.
+#channel_eth0="3"
+
+# Setup any other config commands. This is basically the ifconfig argument
+# without the ifconfig $iface.
+#ifconfig_eth0=""
+# You can do the same per SSID too.
+#ifconfig_SSID=""
+
+# Seconds to wait until associated. The default is to wait 10 seconds.
+# 0 means wait indefinitely. WARNING: this can cause an infinite delay when
+# booting.
+#associate_timeout_eth0="5"
+
+# Define a WEP key per SSID or MAC address (of the AP, not your card)
+# The encryption type (open or restricted) must match the
+# encryption type on the Access Point.
+# To set a hex key, prefix with 0x
+#key_SSID="0x12341234123412341234123456"
+# or you can use strings. Passphrase IS NOT supported
+#key_SSID="foobar"
+#key_SSID="foobar"
+
+# WEP key for the AP with MAC address 001122334455
+#mac_key_001122334455="foobar"
+
+# You can also override the interface settings found in /etc/conf.d/net
+# per SSID - which is very handy if you use different networks a lot
+#config_SSID="dhcp"
+#routes_SSID=
+#fallback_SSID=
+
+# Setting name/domain server causes /etc/resolv.conf to be overwritten
+# Note that if DHCP is used, and you want this to take precedence then
+# please put -R in your dhcpcd options
+#dns_servers_SSID="192.168.0.1 192.168.0.2"
+#dns_domain_SSID="some.domain"
+#dns_search_SSID="search.this.domain search.that.domain"
+# Please check the man page for resolv.conf for more information
+# as domain and search (searchdomains) are mutually exclusive and
+# searchdomains takes precedence
+
+# You can also set any of the /etc/conf.d/net variables per MAC address
+# incase you use Access Points with the same SSID but need different
+# networking configs. Below is an example - of course you use the same
+# method with other variables
+#config_001122334455="dhcp"
+#dns_servers_001122334455="192.168.0.1 192.168.0.2"
+
+# Map a MAC address to an SSID
+# This is used when the Access Point is not broadcasting its SSID
+# WARNING: This will override the SSID being broadcast due to some
+# Access Points sending an SSID even when they have been configured
+# not to!
+# Change 001122334455 to the MAC address and SSID to the SSID
+# it should map to
+#mac_essid_001122334455="SSID"
+
+# This lists the preferred SSIDs to connect to in order
+# SSID's can contain any characters here as they must match the broadcast
+# SSID exactly.
+# Surround each SSID with the " character and separate them with a space
+# If the first SSID isn't found then it moves onto the next
+# If this isn't defined then it connects to the first one found
+#preferred_aps="SSID1 SSID2"
+
+# You can also define a preferred_aps list per interface
+#preferred_aps_eth0="SSID3 SSID4"
+
+# You can also say whether we only connect to preferred APs or not
+# Values are "any", "preferredonly", "forcepreferred", "forcepreferredonly"
+# and "forceany"
+# "any" means it will connect to visible APs in the preferred list and then
+# any other available AP
+# "preferredonly" means it will only connect to visible APs in the preferred
+# list
+# "forcepreferred" means it will forcibly connect to APs in order if it does
+# not find them in a scan
+# "forcepreferredonly" means it forcibly connects to the APs in order and
+# does not bother to scan
+# "forceany" does the same as forcepreferred + connects to any other
+# available AP
+# Default is "any"
+#associate_order="any"
+#associate_order_eth0="any"
+
+# You can define blacklisted Access Points in the same way
+#blacklist_aps="SSID1 SSID2"
+#blacklist_aps_eth0="SSID3 SSID4"
+
+# If you have more than one wireless card, you can say if you want
+# to allow each card to associate with the same Access Point or not
+# Values are "yes" and "no"
+# Default is "yes"
+#unique_ap="yes"
+#unique_ap_eth0="yes"
+
+# IMPORTANT: preferred_only, blacklisted_aps and unique_ap only work when
+# essid_eth0 is not set and your card is capable of scanning
+
+# NOTE: preferred_aps  list ignores blacklisted_aps - so if you have
+# the same SSID in both, well, you're a bit silly :p
+
+##################################################
+# wpa_supplicant
+# emerge net-wireless/wpa_supplicant
+# Wireless options are held in /etc/wpa_supplicant/wpa_supplicant.conf
+# Consult the wpa_supplicant.conf.example that is installed in
+# /usr/share/doc/wpa_supplicant
+
+# By default we don't wait for wpa_supplicant to associate and authenticate.
+# If you would like to, so can specify how long in seconds
+#associate_timeout_eth0=60
+# A value of 0 means wait forever.
+
+# You can also override any settings found here per SSID - which is very
+# handy if you use different networks a lot. See below for using the SSID
+# in our variables
+#config_SSID="dhcp"
+# See the System module below for setting dns/nis/ntp per SSID
+
+# You can also override any settings found here per MAC address of the AP
+# in case you use Access Points with the same SSID but need different
+# networking configs. Below is an example - of course you use the same
+# method with other variables
+#mac_config_001122334455="dhcp"
+#mac_dns_servers_001122334455="192.168.0.1 192.168.0.2"
+
+# When an interface has been associated with an Access Point, a global
+# variable called SSID is set to the Access Point's SSID for use in the
+# pre/post user functions below (although it's not available in preup as you
+# won't have associated then)
+
+# If you're using anything else to configure wireless on your interface AND
+# you have installed wpa_supplicant, you need to disable wpa_supplicant
+#modules="!iwconfig !wpa_supplicant"
+#or
+#modules="!wireless"
+
+##############################################################################
+# WIRELESS SSID IN VARIABLES
+##############################################################################
+# Remember to change SSID to your SSID.
+# Say that your SSID is My NET - the line
+#      #key_SSID="s:passkey"
+# becomes
+#      #key_My_NET="s:passkey"
+# Notice that the space has changed to an underscore - do the same with all
+# characters not in a-z A-Z (English alphabet) 0-9. This only applies to
+# variables and not values.
+#
+# Any SSID's in values like essid_eth0="My NET" may need to be escaped
+# This means placing the character \ before the character
+# \" need to be escaped for example
+# So if your SSID is
+#      My "\ NET
+# it becomes
+#      My \"\\ NET
+# for example
+#      #essid_eth0="My\"\\NET"
+#
+# So using the above we can use
+#      #dns_domain_My____NET="My\"\\NET"
+# which is an invalid dns domain, but shows the how to use the variable
+# structure
+#########################################################
+
+#-----------------------------------------------------------------------------
+# DHCP
+# DHCP can be provided by dhclient.
+#
+# dhcpcd:   emerge net-misc/dhcpcd
+# dhclient: emerge net-misc/dhcp
+
+# Regardless of which DHCP client you prefer, you configure them the
+# same way using one of following depending on which interface modules
+# you're using.
+#config_eth0="dhcp"
+
+# For passing custom options to dhcpcd use something like the following.  This
+# example reduces the timeout for retrieving an address from 60 seconds (the
+# default) to 10 seconds.
+#dhcpcd_eth0="-t 10"
+
+# GENERIC DHCP OPTIONS
+# Set generic DHCP options like so
+#dhcp_eth0="release nodns nontp nonis nogateway nosendhost"
+
+# This tells the dhcp client to release its lease when it stops, not to
+# overwrite dns, ntp and nis settings, not to set a default route and not to
+# send the current hostname to the dhcp server and when it starts.
+# You can use any combination of the above options - the default is not to
+# use any of them.
+
+
+#-----------------------------------------------------------------------------
+# System
+# For configuring system specifics such as domain, dns, ntp and nis servers
+# It's rare that you would need todo this, but you can anyway.
+# This is most benefit to wireless users who don't use DHCP so they can change
+# their configs based on SSID.
+
+# If you omit the _eth0 suffix, then it applies to all interfaces unless
+# overridden by the interface suffix.
+#dns_domain_eth0="your.domain"
+#dns_servers_eth0="192.168.0.2 192.168.0.3"
+#dns_search_eth0="this.domain that.domain"
+#dns_options_eth0="timeout:1 rotate"
+#dns_sortlist_eth0="130.155.160.0/255.255.240.0 130.155.0.0"
+# See the man page for resolv.conf for details about the options and sortlist
+# directives
+
+#ntp_servers_eth0="192.168.0.2 192.168.0.3"
+
+#nis_domain_eth0="domain"
+#nis_servers_eth0="192.168.0.2 192.168.0.3"
+
+# NOTE: Setting any of these will stamp on the files in question. So if you
+# don't specify dns_servers but you do specify dns_domain then no nameservers
+# will be listed in /etc/resolv.conf even if there were any there to start
+# with.
+# If this is an issue for you then maybe you should look into a resolv.conf
+# manager like resolvconf-gentoo to manage this file for you. All packages
+# that baselayout supports use resolvconf-gentoo if installed.
+
+#-----------------------------------------------------------------------------
+# Cable in/out detection
+# Sometimes the cable is in, others it's out. Obviously you don't want to
+# restart net.eth0 every time when you plug it in either.
+# BSD has the Device State Change Daemon - or devd for short
+# To enable this,  simple add devd to the boot runlevel
+#rc-update add devd boot
+#rc
+
+##############################################################################
+# ADVANCED CONFIGURATION
+#
+# Four functions can be defined which will be called surrounding the
+# start/stop operations.  The functions are called with the interface
+# name first so that one function can control multiple adapters. An extra two
+# functions can be defined when an interface fails to start or stop.
+#
+# The return values for the preup and predown functions should be 0
+# (success) to indicate that configuration or deconfiguration of the
+# interface can continue.  If preup returns a non-zero value, then
+# interface configuration will be aborted.  If predown returns a
+# non-zero value, then the interface will not be allowed to continue
+# deconfiguration.
+#
+# The return values for the postup, postdown, failup and faildown functions are
+# ignored since there's nothing to do if they indicate failure.
+#
+# ${IFACE} is set to the interface being brought up/down
+# ${IFVAR} is ${IFACE} converted to variable name bash allows
+
+#preup() {
+#	# Remember to return 0 on success
+#	return 0
+#}
+
+#predown() {
+#	# The default in the script is to test for NFS root and disallow
+#	# downing interfaces in that case.  Note that if you specify a
+#	# predown() function you will override that logic.  Here it is, in
+#	# case you still want it...
+#	if is_net_fs /; then
+#		eerror "root filesystem is network mounted -- can't stop ${IFACE}"
+#		return 1
+#	fi
+#
+#	# Remember to return 0 on success
+#	return 0
+#}
+
+#postup() {
+#	# This function could be used, for example, to register with a
+#	# dynamic DNS service.  Another possibility would be to
+#	# send/receive mail once the interface is brought up.
+
+#}
+
+#postdown() {
+#	# Return 0 always
+#	return 0
+#}
+
+#failup() {
+#       # This function is mostly here for completeness... I haven't
+#       # thought of anything nifty to do with it yet ;-)
+#}
+
+#faildown() {
+#       # This function is mostly here for completeness... I haven't
+#       # thought of anything nifty to do with it yet ;-)
+#}
--- a/doc/net.example.Linux.in
+++ b/doc/net.example.Linux.in
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,27 +1,11 @@
 DIR=	${SYSCONFDIR}
-SRCS=	rc.conf.in rc.in rc.shutdown.in
-BIN=	${BIN-${OS}}
-CONF=	rc.conf ${BIN-${OS}}
+CONF=	rc.conf

 CLEANFILES+=	rc.conf

 MK=	../mk
 include ${MK}/os.mk
-
-SED_EXTRA-FreeBSD=	-e 's:@TERM@:cons25:g'
-BIN-FreeBSD=		rc rc.shutdown rc.devd
-CONF-FreeBSD=		devd.conf
-
-SED_EXTRA-Linux=	-e 's:@TERM@:wsvt25:g'
-BIN-Linux=
-CONF-Linux=
-
-SED_EXTRA-NetBSD=	-e 's:@TERM@:wsvt25:g'
-BIN-NetBSD=		rc rc.shutdown
-CONF-NetBSD=
-
-SED_EXTRA=	${SED_EXTRA-${OS}}
-
+include Makefile.${OS}
 include ${MK}/scripts.mk

 rc.conf: rc.conf.in rc.conf.${OS}
--- a/etc/Makefile.FreeBSD
+++ b/etc/Makefile.FreeBSD
@@ -0,0 +1,4 @@
+SED_EXTRA=	-e 's:@TERM@:cons25:g'
+SRCS+=		rc.conf.in rc.in rc.shutdown.in
+CONF+=		devd.conf
+BIN+=		rc rc.shutdown rc.devd
--- a/etc/Makefile.Linux
+++ b/etc/Makefile.Linux
@@ -0,0 +1,2 @@
+SED_EXTRA=	-e 's:@TERM@:wsvt25:g'
+SRCS+=		rc.conf.in rc.in rc.shutdown.in
--- a/etc/Makefile.NetBSD
+++ b/etc/Makefile.NetBSD
@@ -0,0 +1,3 @@
+SED_EXTRA=	-e 's:@TERM@:wsvt25:g'
+SRCS+=		rc.conf.in rc.in rc.shutdown.in
+BIN+=		rc rc.shutdown
--- a/etc/rc.conf.DragonFly
+++ b/etc/rc.conf.DragonFly
@@ -1,13 +0,0 @@
-##############################################################################
-# DragonFly BSD SPECIFIC OPTIONS
-
-# This is the subsystem type. Valid options on DragonFly BSD:
-# ""        - nothing special
-# "jail"    - DragonFly BSD jails
-# "prefix"  - Prefix
-# If this is commented out, automatic detection will be used.
-#
-# This should be set to the value representing the environment this file is
-# PRESENTLY in, not the virtualization the environment is capable of.
-#rc_sys=""
-
--- a/etc/rc.conf.FreeBSD
+++ b/etc/rc.conf.FreeBSD
@@ -1,13 +1,12 @@
-##############################################################################
-# FreeBSD SPECIFIC OPTIONS
-
 # This is the subsystem type. Valid options on FreeBSD:
 # ""        - nothing special
 # "jail"    - FreeBSD jails
 # "prefix"  - Prefix
-# If this is commented out, automatic detection will be used.
+# If unset, the old automagic detection code will be triggered. Said old code
+# is deprecated and will be removed not later than 2011/03/01.
 #
-# 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 should be set to the value representing what environment this file is
+# PRESENTLY in, not what virtualization the environment is capable of.
+# See the OpenRC migration guide for more details.
+rc_sys=""

--- a/etc/rc.conf.GNU
+++ b/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?
--- a/etc/rc.conf.GNU-kFreeBSD
+++ b/etc/rc.conf.GNU-kFreeBSD
@@ -1,11 +0,0 @@
-##############################################################################
-# GNU/kFreeBSD SPECIFIC OPTIONS
-
-# This is the subsystem type. Valid options on GNU/kFreeBSD:
-# ""        - nothing special
-# "jail"    - FreeBSD jails (not yet implemented)
-# If this is commented out, automatic detection will be used.
-#
-# This should be set to the value representing the environment this file is
-# PRESENTLY in, not the virtualization the environment is capable of.
-#rc_sys=""
--- a/etc/rc.conf.Linux
+++ b/etc/rc.conf.Linux
@@ -1,6 +1,3 @@
-##############################################################################
-# LINUX SPECIFIC OPTIONS
-
 # This is the subsystem type. Valid options on Linux:
 # ""        - nothing special
 # "lxc"     - Linux Containers
@@ -10,69 +7,18 @@
 # "vserver" - Linux vserver
 # "xen0"    - Xen0 Domain
 # "xenU"    - XenU Domain
-# If this is commented out, automatic detection will be used.
+# If unset, the old automagic detection code will be triggered. Said old code
+# is deprecated and will be removed not later than 2011/03/01.
 #
-# 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 should be set to the value representing what environment this file is
+# PRESENTLY in, not what virtualization the environment is capable of.
+# See the OpenRC migration guide for more details.
+rc_sys=""
+
+##############################################################################
+# LINUX SPECIFIC OPTIONS

 # This is the number of tty's used in most of the rc-scripts (like
 # consolefont, numlock, etc ...)
 rc_tty_number=12

-##############################################################################
-# CGROUPS RESOURCE MANAGEMENT
-
-# If you have cgroups turned on in your kernel, this switch controls
-# whether or not a group for each controller is mounted under
-# /sys/fs/cgroup.
-# None of the other options in this section work if this is set to "NO".
-#rc_controller_cgroups="YES"
-
-# The following settings allow you to set up values for the cgroup
-# controllers for your services.
-# They can be set in this file;, however, if you do this, the settings
-# will apply to all of your services.
-# If you want different settings for each service, place the settings in
-# /etc/conf.d/foo for service foo.
-# The format is to specify the names of the settings followed by their
-# values. Each variable can hold multiple settings.
-# For example, you would use this to set the cpu.shares setting in the
-# cpu controller to 512 for your service.
-# rc_cgroup_cpu="
-# cpu.shares 512
-# "
-#
-#For more information about the adjustments that can be made with
-#cgroups, see Documentation/cgroups/* in the linux kernel source tree.
-
-# Set the blkio controller settings for this service.
-#rc_cgroup_blkio=""
-
-# Set the cpu controller settings for this service.
-#rc_cgroup_cpu=""
-
-# Add this service to the cpuacct controller (any value means yes).
-#rc_cgroup_cpuacct=""
-
-# Set the cpuset controller settings for this service.
-#rc_cgroup_cpuset=""
-
-# Set the devices controller settings for this service.
-#rc_cgroup_devices=""
-
-# Set the memory controller settings for this service.
-#rc_cgroup_memory=""
-
-# Set the net_prio controller settings for this service.
-#rc_cgroup_net_prio=""
-
-# Set this to YES if yu want all of the processes in a service's cgroup
-# killed when the service is stopped or restarted.
-# This should not be set globally because it kills all of the service's
-# child processes, and most of the time this is undesirable. Please set
-# it in /etc/conf.d/<service>.
-# To perform this cleanup manually for a stopped service, you can
-# execute cgroup_cleanup with /etc/init.d/<service> cgroup_cleanup or
-# rc-service <service> cgroup_cleanup.
-# rc_cgroup_cleanup="NO"
--- a/etc/rc.conf.NetBSD
+++ b/etc/rc.conf.NetBSD
@@ -1,14 +1,13 @@
-##############################################################################
-# NetBSD SPECIFIC OPTIONS
-
 # This is the subsystem type. Valid options on NetBSD:
 # ""        - nothing special
 # "prefix"  - Prefix
 # "xen0"    - Xen0 Domain
 # "xenU"    - XenU Domain
-# If this is commented out, automatic detection will be used.
+# If unset, the old automagic detection code will be triggered. Said old code
+# is deprecated and will be removed not later than 2011/03/01.
 #
-# 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 should be set to the value representing what environment this file is
+# PRESENTLY in, not what virtualization the environment is capable of.
+# See the OpenRC migration guide for more details.
+rc_sys=""

--- a/etc/rc.conf.in
+++ b/etc/rc.conf.in
@@ -21,7 +21,7 @@
 # Linux users could specify /sbin/sulogin
 #rc_shell=/bin/sh

-# Do we allow any started service in the runlevel to satisfy the dependency
+# Do we allow any started service in the runlevel to satisfy the depedency
 # or do we want all of them regardless of state? For example, if net.eth0
 # and net.eth1 are in the default runlevel then with rc_depend_strict="NO"
 # both will be started, but services that depend on 'net' will work if either
@@ -47,14 +47,6 @@
 # logging can take place and as such cannot log the sysinit runlevel.
 #rc_logger="YES"

-# Through rc_log_path you can specify a custom log file.
-# The default value is: /var/log/rc.log
-#rc_log_path="/var/log/rc.log"
-
-# If you want verbose output for OpenRC, set this to yes. If you want
-# verbose output for service foo only, set it to yes in /etc/conf.d/foo.
-#rc_verbose=no
-
 # By default we filter the environment for our running scripts. To allow other
 # variables through, add them here. Use a * to allow all variables through.
 #rc_env_allow="VAR1 VAR2"
@@ -77,10 +69,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
@@ -88,13 +76,9 @@
 # Set unicode to YES to turn on unicode support for keyboards and screens.
 #unicode="NO"

-# This is how long fuser should wait for a remote server to respond. The
-# default is 60 seconds, but  it can be adjusted here.
-#rc_fuser_timeout=60
-
 # Below is the default list of network fstypes.
 #
-# afs ceph cifs coda davfs fuse fuse.sshfs gfs glusterfs lustre ncpfs
+# 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
@@ -106,14 +90,10 @@
 # These variables are documented here, but should be configured in
 # /etc/conf.d/foo for service foo and NOT enabled here unless you
 # really want them to work on a global basis.
-# If your service has characters in its name which are not legal in
-# shell variable names and you configure the variables for it in this
-# file, those characters should be replaced with underscores in the
-# variable names as shown below.

 # Some daemons are started and stopped via start-stop-daemon.
 # We can set some things on a per service basis, like the nicelevel.
-#SSD_NICELEVEL="-19"
+#export SSD_NICELEVEL="-19"

 # Pass ulimit parameters
 #rc_ulimit="-u 30"
@@ -132,13 +112,6 @@
 #rc_foo_need="openvpn"
 #rc_foo_after="clock"

-# Below is an example for service foo-bar. Note that the '-' is illegal
-# in a shell variable name, so we convert it to an underscore.
-# example for service foo-bar.
-#rc_foo_bar_config="/etc/foo-bar"
-#rc_foo_bar_need="openvpn"
-#rc_foo_bar_after="clock"
-
 # You can also remove dependencies.
 # This is mainly used for saying which servies do NOT provide net.
 #rc_net_tap0_provide="!net"
--- a/etc/rc.devd
+++ b/etc/rc.devd
@@ -1,11 +1,10 @@
 #!/bin/sh
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# All rights reserved. Released under the 2-clause BSD license.

 # Inform RC that we are in the background and hotplugged
-IN_BACKGROUND=yes
-IN_HOTPLUG=yes
-export IN_BACKGROUND IN_HOTPLUG
+export IN_BACKGROUND=yes
+export IN_HOTPLUG=yes

 getmedia() {
 	ifconfig "$1" | while read line; do
--- a/etc/rc.in
+++ b/etc/rc.in
@@ -1,10 +1,10 @@
 #!@SHELL@
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# All rights reserved. Released under the 2-clause BSD license.

 # If $TERM is not set then assume default of @TERM@
 # This gives us a nice colour boot :)
-[ -z "$TERM" -o "$TERM" = "dumb" ] && TERM="@TERM@" && export TERM
+[ -z "$TERM" -o "$TERM" = "dumb" ] && export TERM="@TERM@"

 # Handle interrupts
 trap : SIGINT
--- a/etc/rc.shutdown.in
+++ b/etc/rc.shutdown.in
@@ -1,17 +1,17 @@
 #!@SHELL@
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# All rights reserved. Released under the 2-clause BSD license.

 # Handle interrupts
 trap : SIGINT SIGQUIT

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

 # If $TERM is not set then assume default of @TERM@
 # This gives us a nice colour boot :)
-[ -z "$TERM" -o "$TERM" = "dumb" ] && TERM="@TERM@" && export TERM
+[ -z "$TERM" -o "$TERM" = "dumb" ] && export TERM="@TERM@"

 action=${1:-shutdown}
 exec /sbin/rc "${action}"
--- a/init.d.misc/Makefile
+++ b/init.d.misc/Makefile
@@ -7,5 +7,5 @@ MK=	../mk

 SED_EXTRA+= -e 's:@VARBASE@:/var:g'

-include ${MK}/os.mk
 include ${MK}/scripts.mk
+include Makefile.${OS}
--- a/init.d.misc/Makefile.FreeBSD
+++ b/init.d.misc/Makefile.FreeBSD
@@ -0,0 +1 @@
+PKG_PREFIX?=	/usr/local
--- a/init.d.misc/Makefile.Linux
+++ b/init.d.misc/Makefile.Linux
@@ -0,0 +1 @@
+PKG_PREFIX?=/usr
--- a/init.d.misc/Makefile.NetBSD
+++ b/init.d.misc/Makefile.NetBSD
@@ -0,0 +1 @@
+PKG_PREFIX?=	/usr/pkg
--- a/init.d.misc/avahi-dnsconfd.in
+++ b/init.d.misc/avahi-dnsconfd.in
@@ -1,6 +1,6 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# All rights reserved. Released under the 2-clause BSD license.

 command=@PKG_PREFIX@/sbin/avahi-dnsconfd
 command_args="$avahi_dnsconfd_args -D"
--- a/init.d.misc/avahid.in
+++ b/init.d.misc/avahid.in
@@ -1,6 +1,6 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# All rights reserved. Released under the 2-clause BSD license.

 command=@PKG_PREFIX@/sbin/avahi-daemon
 command_args="$avahid_args -D"
--- a/init.d.misc/dbus.in
+++ b/init.d.misc/dbus.in
@@ -1,6 +1,6 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# All rights reserved. Released under the 2-clause BSD license.

 command=@PKG_PREFIX@/bin/dbus-daemon
 pidfile=@VARBASE@/run/dbus/pid
--- a/init.d.misc/dhcpcd.in
+++ b/init.d.misc/dhcpcd.in
@@ -1,6 +1,6 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# All rights reserved. Released under the 2-clause BSD license.

 command=/sbin/dhcpcd
 pidfile=/var/run/dhcpcd.pid
--- a/init.d.misc/dnsmasq.in
+++ b/init.d.misc/dnsmasq.in
@@ -1,6 +1,6 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# All rights reserved. Released under the 2-clause BSD license.

 command=@PKG_PREFIX@/sbin/dnsmasq
 command_args=$dnsmasq_args
--- a/init.d.misc/hald.in
+++ b/init.d.misc/hald.in
@@ -1,6 +1,6 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# All rights reserved. Released under the 2-clause BSD license.

 command=@PKG_PREFIX@/sbin/hald
 pidfile=@VARBASE@/run/hald/hald.pid
--- a/init.d.misc/named.in
+++ b/init.d.misc/named.in
@@ -1,6 +1,6 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# All rights reserved. Released under the 2-clause BSD license.

 command=/usr/sbin/named
 command_args=$named_args
--- a/init.d.misc/ntpd.in
+++ b/init.d.misc/ntpd.in
@@ -1,6 +1,6 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# All rights reserved. Released under the 2-clause BSD license.

 : ${ntpd_config:=/etc/ntp.conf}
 : ${ntpd_drift:=/var/db/ntpd.drift}
--- a/init.d.misc/openvpn.in
+++ b/init.d.misc/openvpn.in
@@ -1,6 +1,6 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# All rights reserved. Released under the 2-clause BSD license.

 vpn=${RC_SVCNAME#*.}
 name="OpenVPN"
@@ -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
--- a/init.d.misc/polkitd.in
+++ b/init.d.misc/polkitd.in
@@ -1,6 +1,6 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# All rights reserved. Released under the 2-clause BSD license.

 command=@PKG_PREFIX@/sbin/polkitd
 pidfile=@VARBASE@/run/polkitd/polkitd.pid
--- a/init.d.misc/sshd.in
+++ b/init.d.misc/sshd.in
@@ -1,6 +1,6 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# All rights reserved. Released under the 2-clause BSD license.

 command=/usr/sbin/sshd
 command_args=$sshd_args
--- a/init.d.misc/wpa_supplicant.in
+++ b/init.d.misc/wpa_supplicant.in
@@ -1,6 +1,6 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# All rights reserved. Released under the 2-clause BSD license.

 command=/usr/sbin/wpa_supplicant
 : ${wpa_supplicant_conf:=/etc/wpa_supplicant.conf}
--- a/init.d/.gitignore
+++ b/init.d/.gitignore
@@ -3,14 +3,14 @@ fsck
 hostname
 local
 localmount
-loopback
 moused
+net.lo
+net.lo0
 netmount
 network
 root
 savecache
 swap
-swapfiles
 sysctl
 urandom
 devfs
@@ -40,5 +40,3 @@ syslogd
 termencoding
 ttys
 wscons
-tmpfiles.dev
-tmpfiles.setup
--- a/init.d/Makefile
+++ b/init.d/Makefile
@@ -1,39 +1,27 @@
-include ../mk/net.mk
-
 DIR=	${INITDIR}
-SRCS=	bootmisc.in fsck.in hostname.in local.in localmount.in loopback.in \
-	netmount.in root.in savecache.in swap.in swapfiles.in \
-	tmpfiles.setup.in swclock.in sysctl.in urandom.in ${SRCS-${OS}}
+SRCS=	bootmisc.in fsck.in hostname.in local.in localmount.in netmount.in \
+	network.in root.in savecache.in staticroute.in swap.in swclock.in \
+	sysctl.in urandom.in
 BIN=	${OBJS}

-# Are we installing our network scripts?
-ifeq (${MKNET},yes)
-SRCS+= network.in staticroute.in
-endif
+# Build our old net foo or not
+_OLDNET_SH=	case "${MKOLDNET}" in \
+		[Yy][Ee][Ss]) echo "net.lo";; \
+		*) echo "";; \
+		esac
+_OLDNET!=	${_OLDNET_SH}
+_NET_LO=	${_OLDNET}$(shell ${_OLDNET_SH})
+
+INSTALLAFTER=	_installafter_${_NET_LO}
+CLEANFILES+=	${_NET_LO}
+TARGETS+=	${_NET_LO}

 MK=	../mk
 include ${MK}/os.mk
-
-# Generic BSD scripts
-SRCS-FreeBSD=	hostid.in moused.in newsyslog.in pf.in rarpd.in rc-enabled.in \
-		rpcbind.in savecore.in syslogd.in
-# These are FreeBSD specific
-SRCS-FreeBSD+=	adjkerntz.in devd.in dumpon.in encswap.in ipfw.in \
-		mixer.in nscd.in powerd.in syscons.in
-
-SRCS-Linux=	devfs.in dmesg.in hwclock.in consolefont.in keymaps.in \
-		killprocs.in modules.in mount-ro.in mtab.in numlock.in \
-		procfs.in sysfs.in termencoding.in tmpfiles.dev.in
-
-# Generic BSD scripts
-SRCS-NetBSD=	hostid.in moused.in newsyslog.in pf.in rarpd.in rc-enabled.in \
-		rpcbind.in savecore.in syslogd.in
-# These are NetBSD specific
-SRCS-NetBSD+=	devdb.in swap-blk.in ttys.in wscons.in
-
-%.in: %${SFX}
-	sed ${SED_REPLACE} ${SED_EXTRA} $< > $@
-
+include Makefile.${OS}
 include ${MK}/scripts.mk

 _installafter_: realinstall
+
+_installafter_net.lo: realinstall
+	${INSTALL} -m ${BINMODE} net.lo ${DESTDIR}/${INITDIR}/${NET_LO}
--- a/init.d/Makefile.FreeBSD
+++ b/init.d/Makefile.FreeBSD
@@ -0,0 +1,13 @@
+NET_LO=	net.lo0
+
+# Generic BSD scripts
+SRCS+=	hostid.in moused.in newsyslog.in pf.in rarpd.in rc-enabled.in \
+	rpcbind.in savecore.in syslogd.in
+
+# These are FreeBSD specific
+SRCS+=	adjkerntz.in devd.in dumpon.in ipfw.in mixer.in nscd.in \
+	powerd.in syscons.in
+
+.SUFFIXES:	.BSD.in
+.BSD.in:
+	sed ${SED_REPLACE} ${SED_EXTRA} $< > $@
--- a/init.d/Makefile.Linux
+++ b/init.d/Makefile.Linux
@@ -0,0 +1,9 @@
+NET_LO=	net.lo
+
+SRCS+=	devfs.in dmesg.in hwclock.in consolefont.in keymaps.in killprocs.in \
+	modules.in mount-ro.in mtab.in numlock.in procfs.in sysfs.in \
+	termencoding.in
+
+.SUFFIXES:	.Linux.in
+.Linux.in:
+	sed ${SED_REPLACE} ${SED_EXTRA} $< > $@
--- a/init.d/Makefile.NetBSD
+++ b/init.d/Makefile.NetBSD
@@ -0,0 +1,12 @@
+NET_LO=	net.lo0
+
+# Generic BSD scripts
+SRCS+=	hostid.in moused.in newsyslog.in pf.in rarpd.in rc-enabled.in \
+	rpcbind.in savecore.in syslogd.in
+
+# These are NetBSD specific
+SRCS+=	devdb.in swap-blk.in ttys.in wscons.in
+
+.SUFFIXES:	.BSD.in
+.BSD.in:
+	sed ${SED_REPLACE} ${SED_EXTRA} $< > $@
--- a/init.d/adjkerntz.in
+++ b/init.d/adjkerntz.in
@@ -1,6 +1,6 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# All rights reserved. Released under the 2-clause BSD license.

 extra_commands="save"

--- a/init.d/bootmisc.in
+++ b/init.d/bootmisc.in
@@ -1,17 +1,21 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# All rights reserved. Released under the 2-clause BSD license.

 depend()
 {
 	need localmount
 	before logger
-	after clock root sysctl
-	keyword -prefix -timeout
+	after clock sysctl
+	keyword -prefix
+}
+
+dir_writeable()
+{
+	mkdir "$1"/.test.$$ 2>/dev/null && rmdir "$1"/.test.$$
 }

 : ${wipe_tmp:=${WIPE_TMP:-yes}}
-: ${log_dmesg:=${LOG_DMESG:-yes}}

 cleanup_tmp_dir()
 {
@@ -20,17 +24,16 @@ cleanup_tmp_dir()
 	if ! [ -d "$dir" ]; then
 		mkdir -p "$dir" || return $?
 	fi
-	checkpath -W "$dir" || return 1
+	dir_writeable "$dir" || return 1
 	chmod a+rwt "$dir" 2> /dev/null
-	cd "$dir" || return 1
+	cd "$dir"
 	if yesno $wipe_tmp; then
 		ebegin "Wiping $dir directory"
+		local startopts="-x . -depth"
+		[ "$RC_UNAME" = Linux ] && startopts=". -xdev -depth"

-		# Faster than raw find
-		if ! rm -rf -- [!ajlq\.]* 2>/dev/null ; then
-			# Blah, too many files
-			find . -maxdepth 1 -name '[!ajlq\.]*' -exec rm -rf -- {} +
-		fi
+		# Faster than find
+		rm -rf -- [^ajlq\.]*

 		# pam_mktemp creates a .private directory within which
 		# each user gets a private directory with immutable
@@ -38,113 +41,48 @@ cleanup_tmp_dir()
 		# remove it.
 		[ -d /tmp/.private ] && chattr -R -a /tmp/.private 2> /dev/null

-		# Prune the paths that are left
-		find . -maxdepth 1 \
-			! -name . \
-			! -name lost+found \
-			! -name quota.user \
-			! -name aquota.user \
-			! -name quota.group \
-			! -name aquota.group \
-			! -name journal \
-			-exec rm -rf -- {} +
+		find $startopts ! -name . \
+			! -path "./lost+found" \
+			! -path "./lost+found/*" \
+			! -path "./quota.user" \
+			! -path "./quota.user/*" \
+			! -path "./aquota.user" \
+			! -path "./aquota.user/*" \
+			! -path "./quota.group" \
+			! -path "./quota.group/*" \
+			! -path "./aquota.group" \
+			! -path "./aquota.group/*" \
+			! -path "./journal" \
+			! -path "./journal/*" \
+			-exec rm -rf {} \;
 		eend 0
 	else
 		ebegin "Cleaning $dir directory"
-		rm -rf -- .X*-lock esrv* kio* \
-			jpsock.* .fam* .esd* \
-			orbit-* ssh-* ksocket-* \
-			.*-unix
+		rm -rf -- "$dir"/.X*-lock "$dir"/esrv* "$dir"/kio* \
+			"$dir"/jpsock.* "$dir"/.fam* "$dir"/.esd* \
+			"$dir"/orbit-* "$dir"/ssh-* "$dir"/ksocket-* \
+			"$dir"/.*-unix
 		eend 0
 	fi
 }

-cleanup_var_run_dir()
-{
-	ebegin "Cleaning /var/run"
-	for x in $(find /var/run ! -type d ! -name utmp \
-		! -name random-seed ! -name dev.db \
-		! -name ld-elf.so.hints ! -name ld.so.hints);
-	do
-		# Clean stale sockets
-		if [ -S "$x" ]; then
-			if command -v fuser >/dev/null 2>&1; then
-				fuser "$x" >/dev/null 2>&1 || rm -- "$x"
-			else
-				rm -- "$x"
-			fi
-		fi
-		[ ! -f "$x" ] && continue
-		# Do not remove pidfiles of already running daemons
-		case "$x" in
-			*.pid)
-				start-stop-daemon --test --quiet \
-				--stop --pidfile "$x" && continue
-			;;
-		esac
-		rm -f -- "$x"
-	done
-	eend 0
-}
-
 mkutmp()
 {
 	: >"$1"
 	# Not all systems have the utmp group
 	chgrp utmp "$1" 2>/dev/null
-	chmod 0664 "$1"
-}
-
-migrate_to_run()
-{
-	src="$1"
-	dst="$2"
- 	if [ -L $src -a "$(readlink -f $src)" != $dst ]; then
- 		ewarn "$src does not point to $dst."
- 		ewarn "Setting $src to point to $dst."
- 		rm $src
- 	elif [ ! -L $src -a -d $src ]; then
- 		ebegin "Migrating $src to $dst"
- 		cp -a $src/* $dst/
- 		rm -rf $src
- 		eend $?
- 	fi
- 	# If $src doesn't exist at all, just run this
- 	if [ ! -e $src ]; then
- 		ln -s $dst $src
- 	fi
-}
-
-clean_run()
-{
-	[ "$RC_SYS" = VSERVER -o "$RC_SYS" = LXC ] && return 0
-	local dir
-	dir=$(mktemp -d)
-	mount --bind / $dir
-	rm -rf $dir/run/*
-	umount $dir
-	rm -rf $dir
+	chmod 0660 "$1"
 }

 start()
 {
 	# Remove any added console dirs
-	if checkpath -W "$RC_LIBEXECDIR"; then
-		rm -rf "$RC_LIBEXECDIR"/console/*
-	fi
+	rm -rf "$RC_LIBEXECDIR"/console/*

 	local logw=false runw=false extra=
 	# Ensure that our basic dirs exist
-	if [ "$RC_UNAME" = Linux ]; then
-		# Satisfy Linux FHS
-		extra=/var/lib/misc
-		if [ ! -d /run ]; then
-			extra="/var/run $extra"
-		fi
-	else
-		extra=/var/run
-	fi
-	for x in /var/log /tmp $extra; do
+	[ "$RC_UNAME" = Linux ] && extra=/var/lib/misc # Satisfy Linux FHS
+	for x in /var/log /var/run /tmp $extra; do
 		if ! [ -d $x ]; then
 			if ! mkdir -p $x; then
 				eend 1 "failed to create needed directory $x"
@@ -153,13 +91,7 @@ start()
 		fi
 	done

-	if [ "$RC_UNAME" = Linux -a -d /run ]; then
-		migrate_to_run	/var/lock /run/lock
-		migrate_to_run	/var/run /run
-		clean_run
-	fi
-
-	if checkpath -W /var/run; then
+	if dir_writeable /var/run; then
 		ebegin "Creating user login records"
 		local xtra=
 		[ "$RC_UNAME" = NetBSD ] && xtra=x
@@ -169,16 +101,39 @@ start()
 		[ -e /var/log/wtmp ] || mkutmp /var/log/wtmp
 		eend 0

-		mountinfo -q -f tmpfs /var/run || cleanup_var_run_dir
+		ebegin "Cleaning /var/run"
+		for x in $(find /var/run ! -type d ! -name utmp \
+			! -name random-seed ! -name dev.db \
+			! -name ld-elf.so.hints ! -name ld.so.hints);
+		do
+			# Clean stale sockets
+			if [ -S "$x" ]; then
+				if type fuser >/dev/null 2>&1; then
+					fuser "$x" >/dev/null 2>&1 || rm -- "$x"
+				else
+					rm -- "$x"
+				fi
+			fi
+			[ ! -f "$x" ] && continue
+			# Do not remove pidfiles of already running daemons
+			case "$x" in
+				*.pid)
+					start-stop-daemon --test --quiet \
+					--stop --pidfile "$x" && continue
+				;;
+			esac
+			rm -f -- "$x"
+		done
+		eend 0
 	fi

 	# Clean up /tmp directories
 	local tmp=
 	for tmp in ${clean_tmp_dirs:-${wipe_tmp_dirs-/tmp}}; do
-		mountinfo -q -f tmpfs "$tmp" || cleanup_tmp_dir "$tmp"
+		cleanup_tmp_dir "$tmp"
 	done

-	if checkpath -W /tmp; then
+	if dir_writeable /tmp; then
 		# Make sure our X11 stuff have the correct permissions
 		# Omit the chown as bootmisc is run before network is up
 		# and users may be using lame LDAP auth #139411
@@ -190,16 +145,15 @@ start()
 		fi
 	fi

-	if yesno $log_dmesg; then
-		if $logw || checkpath -W /var/log; then
-			# Create an 'after-boot' dmesg log
-			if [ "$RC_SYS" != VSERVER -a "$RC_SYS" != OPENVZ -a "$RC_SYS" != LXC ]; then
-				dmesg > /var/log/dmesg
-				chmod 640 /var/log/dmesg
-			fi
+	if $logw || dir_writeable /var/log; then
+		# Create an 'after-boot' dmesg log
+		if [ "$RC_SYS" != VSERVER -a "$RC_SYS" != OPENVZ ]; then
+			dmesg > /var/log/dmesg
+			chmod 640 /var/log/dmesg
 		fi
 	fi

+	[ -w /etc/nologin ] && rm -f /etc/nologin
 	return 0
 }

@@ -215,5 +169,3 @@ stop()

 	return 0
 }
-
-# vim: ft=sh
--- a/init.d/consolefont.in
+++ b/init.d/consolefont.in
@@ -1,6 +1,6 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# All rights reserved. Released under the 2-clause BSD license.

 description="Sets a font for the consoles."

@@ -49,14 +49,24 @@ start()
 			retval=1
 			break
 		fi
-		: $(( x += 1 ))
+		x=$(($x + 1))
 	done
 	eend $retval

-	# Store the font so we can use it ASAP on boot
-	if [ $retval -eq 0 ] && checkpath -W "$RC_LIBEXECDIR"; then
+	# Store the last font so we can use it ASAP on boot
+	if [ $retval -eq 0 -a -w "$RC_LIBEXECDIR" ]; then
 		mkdir -p "$RC_LIBEXECDIR"/console
-		setfont -O "$RC_LIBEXECDIR"/console/font
+		for font in /usr/share/consolefonts/"$consolefont".*; do
+			:
+		done
+		cp "$font" "$RC_LIBEXECDIR"/console
+		echo "${font##*/}" >"$RC_LIBEXECDIR"/console/font
+		if yesno ${unicode:-${UNICODE}}; then
+			echo "" > "$RC_LIBEXECDIR"/console/unicode
+		else
+			rm -f "$RC_LIBEXECDIR"/console/unicode
+		fi
+
 	fi

 	return $retval
--- a/init.d/devd.in
+++ b/init.d/devd.in
@@ -1,6 +1,6 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# All rights reserved. Released under the 2-clause BSD license.

 command=/sbin/devd
 command_args=$devd_args
--- a/init.d/devdb.in
+++ b/init.d/devdb.in
@@ -1,6 +1,6 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# All rights reserved. Released under the 2-clause BSD license.

 description="Creates the dev database"

@@ -11,7 +11,7 @@ depend()

 start()
 {
-	ebegin "Building the dev database"
+	ebegin "Bulding the dev database"
 	if [ /var/run/dev.db -nt /dev ]; then
 		:
 	else
--- a/init.d/devfs.in
+++ b/init.d/devfs.in
@@ -1,86 +1,19 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# All rights reserved. Released under the 2-clause BSD license.

-description="Set up the /dev directory"
+description="Mount system critical filesystems in /dev."

-depend()
-{
-	provide dev-mount
-	before dev
-	keyword -prefix -vserver -lxc
+depend() {
+	use dev
+	keyword -prefix -vserver
 }

-mount_dev()
-{
-	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
+start() {
+	# Mount required stuff as user may not have then 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 +32,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
 }
--- a/init.d/dmesg.in
+++ b/init.d/dmesg.in
@@ -1,13 +1,13 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# All rights reserved. Released under the 2-clause BSD license.

 description="Set the dmesg level for a cleaner boot"

 depend()
 {
 	before dev modules
-	keyword -lxc -prefix -vserver
+	keyword -vserver
 }

 start()
--- a/init.d/dumpon.in
+++ b/init.d/dumpon.in
@@ -1,6 +1,6 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# All rights reserved. Released under the 2-clause BSD license.

 description="Configures a specific kernel dump device."

@@ -19,7 +19,7 @@ start() {
 }

 stop() {
-	ebegin "Deactivating kernel core dump device"
+	ebegin "Deactiving kernel core dump device"
 	dumpon off
 	eend $?
 }
--- a/init.d/encswap.in
+++ b/init.d/encswap.in
@@ -1,43 +0,0 @@
-#!@SBINDIR@/openrc-run
-# Copyright 1992-2012 FreeBSD Project
-# Released under the 2-clause BSD license
-
-depend() {
-	before swap
-}
-
-start() {
-	while read device mountpoint type options rest ; do
-		case ":${device}:${type}:${options}" in
-		:#*)
-			;;
-		*.bde:swap:sw)
-			passphrase=$(dd if=/dev/random count=1 2>/dev/null | md5 -q)
-			device="${device%.bde}"
-			gbde init "${device}" -P "${passphrase}" || return 1
-			gbde attach "${device}" -p "${passphrase}" || return 1
-			;;
-		*.eli:swap:sw)
-			device="${device%.eli}"
-			geli onetime ${geli_swap_flags} "${device}" || return 1
-			;;
-		esac
-	done < /etc/fstab
-}
-
-stop() {
-	while read device mountpoint type options rest ; do
-		case ":${device}:${type}:${options}" in
-		:#*)
-			;;
-		*.bde:swap:sw)
-			device="${device%.bde}"
-			gbde detach "${device}"
-			;;
-		*.eli:swap:sw)
-			# Nothing here, because geli swap devices should be
-			# created with the auto-detach-on-last-close option.
-			;;
-		esac
-	done < /etc/fstab
-}
--- a/init.d/fsck.in
+++ b/init.d/fsck.in
@@ -1,6 +1,6 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# All rights reserved. Released under the 2-clause BSD license.

 description="Check and repair filesystems according to /etc/fstab"
 _IFS="
@@ -9,7 +9,7 @@ _IFS="
 depend()
 {
 	use dev clock modules
-	keyword -jail -openvz -prefix -timeout -vserver -lxc -uml
+	keyword -jail -openvz -prefix -timeout -vserver -lxc
 }

 _abort() {
@@ -48,13 +48,8 @@ start()

 	if [ -n "$fsck_passno" ]; then
 		check_extra="[passno $fsck_passno] $check_extra"
-		if [ -n "$fsck_mnt" ]; then
-			eerror "Only 1 of fsck_passno and fsck_mnt must be set!"
-			return 1
-		fi
 	fi
 	ebegin "Checking local filesystems $check_extra"
-	# Append passno mounts
 	for p in $fsck_passno; do
 		local IFS="$_IFS"
 		case "$p" in
@@ -63,20 +58,11 @@ start()
 		set -- "$@" $(fstabinfo --passno "$p")
 		unset IFS
 	done
-	# Append custom mounts
-	for m in $fsck_mnt ; do
-		local IFS="$_IFS"
-		set -- "$@" "$m"
-		unset IFS
-	done

 	if [ "$RC_UNAME" = Linux ]; then
-		local skiptypes
-		skiptypes=$(printf 'no%s,' ${net_fs_list} ${extra_net_fs_list})
-		[ "${skiptypes}" = "no," ] && skiptypes=""
-		fsck_opts="$fsck_opts -C0 -T -t ${skiptypes}noopts=_netdev"
-		if [ -z "$fsck_passno" -a -z "$fsck_mnt" ]; then
-			fsck_args=${fsck_args:--A -p}
+		fsck_opts="$fsck_opts -C0 -T"
+		if [ -z "$fsck_passno" ]; then
+			fsck_args=${fsck_args--A -p}
 			if echo 2>/dev/null >/.test.$$; then
 				rm -f /.test.$$
 				fsck_opts="$fsck_opts -R"
@@ -85,7 +71,7 @@ start()
 	fi

 	trap : INT QUIT
-	fsck ${fsck_args:--p} $fsck_opts "$@"
+	fsck ${fsck_args--p} $fsck_opts "$@"
 	case $? in
 	0)	eend 0; return 0;;
 	1)	ewend 1 "Filesystems repaired"; return 0;;
@@ -105,7 +91,7 @@ start()
 			_reboot
 		fi;;
 	8)	ewend 1 "Operational error"; return 0;;
-	12)	ewend 1 "fsck interrupted";;
+	12)	ewend 1 "fsck interupted";;
 	*)	eend 2 "Filesystems couldn't be fixed";;
 	esac
 	_abort || return 1
--- a/init.d/hostid.in
+++ b/init.d/hostid.in
@@ -1,6 +1,6 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# All rights reserved. Released under the 2-clause BSD license.

 extra_commands="reset"
 : ${hostid_file:=/etc/hostid}
@@ -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
--- a/init.d/hostname.in
+++ b/init.d/hostname.in
@@ -1,18 +1,16 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# All rights reserved. Released under the 2-clause BSD license.

 description="Sets the hostname of the machine."

 depend() {
-	keyword -prefix -lxc
+	keyword -prefix
 }

 start()
 {
-	# HOSTNAME variable used to be defined in caps in conf.d/hostname.
-	# It is also a magic variable in bash.
-	hostname=${hostname-${HOSTNAME-localhost}} # checkbashisms: false positive
+	hostname=${hostname-${HOSTNAME-localhost}}
 	ebegin "Setting hostname to $hostname"
 	hostname "$hostname"
 	eend $? "Failed to set the hostname"
--- a/init.d/hwclock.in
+++ b/init.d/hwclock.in
@@ -1,6 +1,6 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# All rights reserved. Released under the 2-clause BSD license.

 extra_commands="save show"

@@ -83,18 +83,19 @@ 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 += $? ))
+		retval=$(($retval + $?))
 	fi

-	if yesno ${clock_hctosys:-YES}; then
+	# If setting UTC, don't bother to run hwclock when first booting
+	# as that's the default
+	if [ "$PREVLEVEL" != N -o \
+		"$utc_cmd}" != --utc -o \
+		-n "$clock_args" ];
+	then
 		_hwclock --hctosys $utc_cmd $clock_args
-		: $(( retval += $? ))
+		retval=$(($retval + $?))
 	fi

 	eend $retval "Failed to set the system clock"
@@ -106,7 +107,7 @@ stop()
 {
 	# Don't tweak the hardware clock on LiveCD halt.
 	[ -n "$CDBOOT" ] && return 0
-	yesno ${clock_systohc:-YES} || return 0
+	yesno $clock_systohc || return 0

 	local retval=0 errstr=""
 	setupopts
--- a/init.d/ipfw.in
+++ b/init.d/ipfw.in
@@ -1,6 +1,6 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# All rights reserved. Released under the 2-clause BSD license.

 # This is based on /etc/rc.firewall and /etc/rc.firewall6 from FreeBSD

@@ -8,7 +8,7 @@ ipfw_ip_in=${ipfw_ip_in-any}
 ipfw_ports_in=${ipfw_ports_in-auth ssh}
 ipfw_ports_nolog=${ipfw_ports_nolog-135-139,445 1026,1027 1433,1434}

-extra_commands="panic showstatus"
+opts="panic showstatus"

 depend() {
 	before net
@@ -59,7 +59,7 @@ start() {
 		return 1
 	fi

-	# Use a stateful firewall
+	# Use a statefull firewall
 	ipfw add check-state
 	ipfw add pass tcp from me to any established

@@ -123,7 +123,7 @@ start() {
 	ipfw add deny udp from any to any 520 in

 	# Noise from webbrowsing.
-	# The stateful filter is a bit aggressive, and will cause some
+	# The statefull filter is a bit agressive, and will cause some
 	# connection teardowns to be logged.
 	ipfw add deny tcp from any 80,443 to any 1024-65535 in

--- a/init.d/keymaps.in
+++ b/init.d/keymaps.in
@@ -1,6 +1,6 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# All rights reserved. Released under the 2-clause BSD license.

 description="Applies a keymap for the consoles."

@@ -47,7 +47,7 @@ start()
 	n=1
 	while [ $n -le $ttyn ]; do
 		kbd_mode $kmode -C $ttydev$n
-		: $(( n += 1 ))
+		n=$(($n + 1))
 	done
 	eend 0

@@ -58,12 +58,12 @@ start()
 	if yesno $fix_euro; then
 		ebegin "Fixing font for euro symbol"
 		# Fix some fonts displaying the Euro, #173528.
-		echo "altgr keycode 18 = U+20AC" | loadkeys -q -
+		echo "altgr keycode 18 = U+20AC" | loadkeys -q
 		eend $?
 	fi

 	# Save the keymapping for use immediately at boot
-	if checkpath -W "$RC_LIBEXECDIR"; then
+	if [ -w "$RC_LIBEXECDIR" ]; then
 		mkdir -p "$RC_LIBEXECDIR"/console
 		dumpkeys >"$RC_LIBEXECDIR"/console/keymap
 	fi
--- a/init.d/killprocs.in
+++ b/init.d/killprocs.in
@@ -1,6 +1,6 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# All rights reserved. Released under the 2-clause BSD license.

 description="Kill all processes so we can unmount disks cleanly."

@@ -12,11 +12,11 @@ depend()
 start()
 {
 	ebegin "Terminating remaining processes"
-	killall5 -15 ${killall5_opts}
+	killall5 -15
 	sleep 1
 	eend 0
 	ebegin "Killing remaining processes"
-	killall5 -9 ${killall5_opts}
+	killall5 -9
 	sleep 1
 	eend 0
 }
--- a/init.d/local.in
+++ b/init.d/local.in
@@ -1,8 +1,8 @@
-#!@SBINDIR@/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
+# All rights reserved. Released under the 2-clause BSD license.

-description="Executes user programs in @SYSCONFDIR@/local.d"
+description="Executes user commands in /etc/conf.d/local"

 depend()
 {
@@ -14,71 +14,20 @@ start()
 {
 	ebegin "Starting local"

-	local file has_errors=0 retval
-	eindent
-	for file in @SYSCONFDIR@/local.d/*.start; do
-		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
-		ewarn "\"@SYSCONFDIR@/conf.d/local\" should be removed."
-		ewarn "Please move the code from the local_start function"
-		ewarn "to executable scripts with an .start extension"
-		ewarn "in \"@SYSCONFDIR@/local.d\""
+	if type local_start >/dev/null 2>&1; then
 		local_start
 	fi

-	eend ${has_errors}
-
-	# 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
+	eend $? "Failed to start local"
 }

 stop()
 {
 	ebegin "Stopping local"

-	local file has_errors=0 retval
-	eindent
-	for file in @SYSCONFDIR@/local.d/*.stop; do
-		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_stop >/dev/null 2>&1; then
-		ewarn "\"@SYSCONFDIR@/conf.d/local\" should be removed."
-		ewarn "Please move the code from the local_stop function"
-		ewarn "to executable scripts with an .stop extension"
-		ewarn "in \"@SYSCONFDIR@/local.d\""
+	if type local_start >/dev/null 2>&1; then
 		local_stop
 	fi

-	eend ${has_errors}
-
-	# 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
+	eend $? "Failed to stop local"
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Daniel Robbins	6a5e6f1ee0	openrc-0.7.0 upstream merge	2011-01-20 14:00:29 -07:00
Piotr Karbowski	d8ce5dccb2	openrc-0.6.8	2010-12-16 11:17:34 +01:00
Piotr Karbowski	62bd337494	Unprivileged users (such as services for example) should not be able view who is logged into system.	2010-12-16 10:04:46 +01:00
Jory A. Pratt	06c8bd0156	Fix for make-3.82 breakage.	2010-12-03 20:06:34 -07:00
Daniel Robbins	33803219d4	openrc-0.6.5	2010-11-26 17:02:16 -07:00
Jory A. Pratt	18c08a9d4d	remove 'use hostname' bug 340991, Thanks Diego	2010-11-26 16:59:28 -07:00
William Hubbs	2406dc4f3e	allow net_fs_list to be extended but not replaced This fixes bug #342825.	2010-11-26 16:59:18 -07:00
Diego Elio Pettenò	8e6d461a7f	Allow cleaning up of pam_mktemp-based temporary directories. This was blacklisted before, so the .private directories never had their content cleaned up, even if WIPE_TMP was set to yes.	2010-11-26 16:57:37 -07:00
William Hubbs	472a3bb99c	remove support for local.start and local.stop for bug #343709 The openrc ebuild now migrates these files to /etc/conf.d/local, so we do not need to support them.	2010-11-26 16:53:54 -07:00
William Hubbs	c9a2085699	add warnings about local.start and local.stop for bug #343709 We need to warn users that they should be using /etc/conf.d/local instead of /etc/conf.d/local.start and /etc/conf.d/local.stop. This adds those warnings.	2010-11-26 16:53:50 -07:00
William Hubbs	69169b7e95	update documentation for rc_interactive rc_interactive is automatically disabled if rc_parallel is set to YES. Update the documentation in rc.conf to reflect this. This fixes bug #327305.	2010-11-26 16:53:37 -07:00
William Hubbs	3a11f8af34	remove "use hostname" from sysctl for bsd systems	2010-11-26 16:51:42 -07:00
William Hubbs	e2e5b27d85	do not mount local file systems with the _netdev option in fstab This fixes #344947.	2010-11-26 16:51:20 -07:00
Daniel Robbins	f343360741	0.6.4 release	2010-10-27 23:43:30 -06:00
Brant Gurganus	694fd2027f	correction for unmounting volumes with weird characters	2010-10-24 13:08:38 -04:00
Daniel Robbins	ca76764743	Merge branch 'master' of github.com:funtoo/openrc	2010-10-20 19:21:48 -06:00
Jory A. Pratt	19bd9923d7	surpress output of loadkeys, fix setfont path check	2010-10-20 19:21:02 -06:00
Brant Gurganus	2a844e1122	corrected a typo	2010-10-20 16:26:01 -04:00
Daniel Robbins	5135412978	fixing history, one step at a time	2010-08-16 19:09:26 -06:00
				`@@ -0,0 +1 @@`
				`CONF+= ipfw moused powerd rarpd savecore syscons`