update changelog

checkpath: do not chown or chmod symbolic links
This is another security fix. If you use chown() or chmod() on a symbolic link, it affects the referenced file, not the symbolic link itself. X-Gentoo-Bug: 540006 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=540006
2015-02-19 15:25:27 -06:00 · 2015-02-19 15:23:06 -06:00 · 2015-02-19 15:22:13 -06:00 · 2015-02-18 12:56:50 -06:00 · 2015-02-18 12:49:39 -06:00 · 2015-02-18 10:41:27 -06:00
106 changed files with 1717 additions and 3039 deletions
--- a/2101
+++ b/2101
--- a/FEATURE-REMOVAL-SCHEDULE.md
+++ b/FEATURE-REMOVAL-SCHEDULE.md
@@ -1,31 +1,34 @@
-# Features Scheduled for Removal
-
 The following is a list of files and features that are going to be removed in
 the source tree.  Every entry should contain what exactly is going away, why it
 is happening, and who is going to be doing the work.  When the feature is
 removed, it should also be removed from this file.

-## Service pause action
+---------------------------
+
+What: Service pause action

 When: 1.0

-Why: The same affect can be obtained with the --nodeps option to stop.
+Why: ...

 Who:

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

 When: 1.0

 Why: Obsolete or replaced by other options.
-
-* --startas => use --name or --exec
-* --chuid => use --user
-* --oknodo => ignore return code instead
+	 --startas => use --name or --exec
+	 --chuid => use --user
+	 --oknodo => ignore return code instead

 Who:

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

 When: 1.0

@@ -34,7 +37,9 @@ Why: Deprecated in favor of openrc-run and openrc due to naming

 Who:

-## support for the opts variable in service scripts
+---------------------------
+
+What: support for the opts variable in service scripts

 When: 1.0

@@ -43,7 +48,9 @@ Why: Depprecated in favor of extra_commands, extra_started_commands

 Who:

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

 When: 1.0

@@ -51,7 +58,9 @@ Why: Depprecated in favor of executable scripts in @SYSCONFDIR@/local.d

 Who:

-## the mtab service script
+---------------------------
+
+What: the mtab service script

 When: make warnings more visible in 1.0, remove in 2.0

@@ -59,3 +68,5 @@ Why: /etc/mtab should be a symbolic link to /proc/self/mounts on modern
 	 Linux systems

 Who:
+
+---------------------------
--- a/8
+++ b/8
@@ -2,10 +2,7 @@
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.

-TOP:=		${dir ${realpath ${firstword ${MAKEFILE_LIST}}}}
-MK=			${TOP}/mk
-
-include ${TOP}/Makefile.inc
+include Makefile.inc

 SUBDIR=		conf.d etc init.d local.d man scripts sh src sysctl.d

@@ -20,11 +17,12 @@ SUBDIR+=	runlevels

 INSTALLAFTER=	_installafter

+MK= 		mk
 include ${MK}/sys.mk
 include ${MK}/os.mk
 include ${MK}/subdir.mk
 include ${MK}/dist.mk
-include ${MK}/gitver.mk
+include ${MK}/git.mk

 _installafter:
 ifeq (${MKPREFIX},yes)
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -1,3 +1,3 @@
 NAME=		openrc
-VERSION=	0.19.1
+VERSION=	0.13.11
 PKG=		${NAME}-${VERSION}
--- a/44
+++ b/44
@@ -0,0 +1,44 @@
+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/NEWS.md
+++ b/NEWS.md
@@ -1,109 +0,0 @@
-# OpenRC NEWS
-
-This file will contain a list of notable changes for each release. Note
-the information in this file is in reverse order.
-
-## OpenRC-0.19
-
-This version adds a net-online service. By default, this
-service will check all known network interfaces for a configured
-interface or a carrier. It will register as started only when all
-interfaces are configured and there is at least a carrier on one
-interface. The behaviour of this service can be modified in
-/etc/conf.d/net-online.
-
-Currently, this only works on Linux, but if anyone wants to port to
-*bsd, that would be welcomed.
-
-## OpenRC-0.18.3
-
-Modern Linux systems expect /etc/mtab to be a symbolic link to
-/proc/self/mounts. Reasons for this change include support for mount
-namespaces, which will not work if /etc/mtab is a file.
-By default, the mtab service enforces this on each reboot.
-
-If you find that this breaks your system in some way, please do the
-following:
-
- Set mtab_is_file=yes in /etc/conf.d/mtab.
-
- Restart mtab. This will recreate the /etc/mtab file.
-
- Check for an issue on https://github.com/openrc/openrc/issues
-  explaining why you need /etc/mtab to be a file. If there isn't one,
-  please open one and explain in detail why you need this to be a file.
-  If there is one, please add your comments to it. Please give concrete
-  examples of why  it is important that /etc/mtab be a file instead of a
-  symbolic link. Those comments will be taken into consideration for how
-  long to keep supporting mtab as a file or when the support can be
-  removed.
-
-## OpenRC-0.18
-
-The behaviour of localmount and netmount in this version is changing. In
-the past, these services always started successfully. In this version,
-they will be able to fail if file systems they mount fail to mount. If
-you have file systems listed in fstab which should not be mounted at
-boot time, make sure to add noauto to the mount options. If you have
-file systems that you want to attempt to mount at boot time but failure
-should be allowed, add nofail to the mount options for these file
-systems in fstab.
-
-## OpenRC-0.14
-
-The binfmt service, which registers misc binary formats with the Linux
-kernel, has been separated from the procfs service. This service will be
-automatically added to the boot runlevel for new Linux installs. When
-you upgrade, you will need to use rc-update to add it to your boot
-runlevel.
-
-The procfs service no longer automounts the deprecated usbfs and
-usbdevfs file systems. Nothing should be using usbdevfs any longer, and
-if you still need usbfs it can be added to fstab.
-
-Related to the above change, the procfs service no longer attempts to
-modprobe the usbcore module. If your device manager does not load it,
-you will need to configure the modules service to do so.
-
-The override order of binfmt.d and tmpfiles.d directories has been
-changed to match systemd. Files in /run/binfmt.d and /run/tmpfiles.d
-override their /usr/lib counterparts, and files in the /etc counterparts
-override both /usr/lib and /run.
-
-## 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/66
+++ b/66
@@ -0,0 +1,66 @@
+OpenRC README
+
+
+Installation
+------------
+make install
+Yup, that simple. Works with GNU 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
+PKG_PREFIX=/usr/pkg
+LOCAL_PREFIX=/usr/local
+PREFIX=/usr/local
+
+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)\"
+
+PKG_PREFIX should be set to where packages install to by default.
+LOCAL_PREFIX should be set when to where user maintained packages are.
+Only set LOCAL_PREFIX if different from PKG_PREFIX.
+PREFIX should be set when OpenRC is not installed to /.
+
+If any of the following files exist then we do not overwrite them
+/etc/devd.conf
+/etc/rc
+/etc/rc.shutdown
+/etc/conf.d/*
+
+rc and rc.shutdown are the hooks from the BSD init into OpenRC.
+devd.conf is modified from FreeBSD to call /etc/rc.devd which is a generic
+hook into OpenRC.
+inittab is the same, but for SysVInit as used by most Linux distributions.
+This can be found in the support folder.
+Obviously, if you're installing this onto a system that does not use OpenRC
+by default then you may wish to backup the above listed files, remove them
+and then install so that the OS hooks into OpenRC.
+
+init.d.misc is not installed by default as the scripts will need
+tweaking on a per distro basis. They are also non essential to the operation
+of the system.
+
+Reporting Bugs
+--------------
+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.
--- a/README.busybox
+++ b/README.busybox
@@ -1,4 +1,6 @@
-# Using Busybox as your Default Shell with OpenRC
+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
@@ -25,8 +27,5 @@ CONFIG_SETFONT -- The setfont applet does not support the -u option from kbd.
 CONFIG_IP -- The ip applet  doesn't support the "scope" modifier for
 "ip route add" and "ip address add".

-CONFIG_BB_SYSCTL -- The sysctl applet does not support the --system command
-line switch.
-
 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,5 +1,3 @@
-# OpenRC History
-
 This history of OpenRC was written by Daniel Robbins, Roy Marples, William
 Hubbs and others.

--- a/README.md
+++ b/README.md
@@ -1,99 +0,0 @@
-# OpenRC README
-
-OpenRC is a dependency-based init system that works with the
-system-provided init program, normally `/sbin/init`. Currently, it does
-not have an init program of its own.
-
-## Installation
-
-OpenRC requires GNU make.
-
-Once you have GNU Make installed, the default OpenRC installation can be
-executed using this command:
-
-make install
-
-## Configuration
-
-You may wish to configure the installation by passing one or more of the
-below arguments to the make command
-
-```
-PROGLDFLAGS=-static
-LIBNAME=lib64
-DESTDIR=/tmp/openrc-image
-MKNET=no
-MKPAM=pam
-MKPREFIX=yes
-MKPKGCONFIG=no
-MKSELINUX=yes
-MKSTATICLIBS=no
-MKTERMCAP=ncurses
-MKTERMCAP=termcap
-MKTOOLS=yes
-PKG_PREFIX=/usr/pkg
-LOCAL_PREFIX=/usr/local
-PREFIX=/usr/local
-BRANDING=\"Gentoo/$(uname -s)\"
-```
-
-## Notes
-
-We don't support building a static OpenRC with PAM.
-
-You may need to use `PROGLDFLAGS=-Wl,-Bstatic` on glibc instead of just `-static`.
-
-If you debug memory under valgrind, add `-DDEBUG_MEMORY`
-to your `CPPFLAGS` so that all malloc memory should be freed at exit.
-
-If you are building OpenRC for a Gentoo Prefix installation, add `MKPREFIX=yes`.
-
-`PKG_PREFIX` should be set to where packages install to by default.
-
-`LOCAL_PREFIX` should be set when to where user maintained packages are.
-Only set `LOCAL_PREFIX` if different from `PKG_PREFIX`.
-
-`PREFIX` should be set when OpenRC is not installed to /.
-
-If any of the following files exist then we do not overwrite them
-
-```
-/etc/devd.conf
-/etc/rc
-/etc/rc.shutdown
-/etc/conf.d/*
-```
-
-`rc` and `rc.shutdown` are the hooks from the BSD init into OpenRC.
-
-`devd.conf` is modified from FreeBSD to call `/etc/rc.devd` which is a
-generic hook into OpenRC.
-
-`inittab` is the same, but for SysVInit as used by most Linux distributions.
-This can be found in the support folder.
-
-Obviously, if you're installing this onto a system that does not use
-OpenRC by default then you may wish to backup the above listed files,
-remove them and then install so that the OS hooks into OpenRC.
-
-`init.d.misc` is not installed by default as the scripts will need
-tweaking on a per distro basis. They are also non essential to the
-operation of the system.
-
-## Reporting Bugs
-
-If you are using Gentoo Linux, bugs can be filed on their bugzilla under
-the `gentoo hosted projects` product and the `openrc` component [1].
-Otherwise, you can report issues on our github [2].
-
-Better yet, if you can contribute code, please feel free to submit pull
-requests [3].
-
-## IRC Channel
-
-We have an official irc channel, #openrc on freenode, feel free to join
-us there.
-
-[1]	https://bugs.gentoo.org/
-[2]	https://github.com/openrc/openrc/issues
-[3]	https://github.com/openrc/openrc/pulls
--- a/STYLE-GUIDE.md
+++ b/STYLE-GUIDE.md
@@ -1,23 +1,23 @@
-# OpenRC Style Guide
-
 This is the openrc style manual.  It governs the coding style of all code
 in this repository.  Follow it.  Contact openrc@gentoo.org for any questions
 or fixes you might notice.

-## C CODE
+##########
+# C CODE #
+##########

-The BSD Kernel Normal Form (KNF) style is used [1]. Basically, it is like
-K&R/LKML, but wrapped lines that are indented use 4 spaces. Here are the
-highlights.
+The BSD Kernel Normal Form (KNF) style is used:
+	http://en.wikipedia.org/wiki/Indent_style#BSD_KNF_style
+Basically, it's like K&R/LKML, but wrapped lines that are indented use 4 spaces.

- no trailing whitespace
- indented code use tabs (not line wrapped)
- cuddle the braces (except for functions)
- space after native statements and before paren (for/if/while/...)
- no space between function and paren
- pointer asterisk cuddles the variable, not the type
+Highlights:
+	- no trailing whitespace
+	- indented code use tabs (not line wrapped)
+	- cuddle the braces (except for functions)
+	- space after native statements and before paren (for/if/while/...)
+	- no space between function and paren
+	- pointer asterisk cuddles the variable, not the type

-```
 void foo(int c)
 {
 	int ret = 0;
@@ -32,15 +32,16 @@ void foo(int c)

 	return ret;
 }
-```

-## COMMIT MESSAGES
+##################
+# 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
-[2], so I would like to thank the author.
+[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
@@ -66,7 +67,7 @@ Further paragraphs come after blank lines.
 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
@@ -80,5 +81,5 @@ different from the author and committer.
  *BSD. Also, [Distro] should be replaced with the name of the
  distribution, e.g. X-Gentoo-Bug.

-[1]	http://en.wikipedia.org/wiki/Indent_style#BSD_KNF_style
-[2] http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
+[1] http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
+
--- a/conf.d/Makefile
+++ b/conf.d/Makefile
@@ -15,8 +15,7 @@ include ${MK}/os.mk

 CONF-FreeBSD=	ipfw moused powerd rarpd savecore syscons

-CONF-Linux=	consolefont devfs dmesg hwclock keymaps killprocs modules mtab \
-	net-online
+CONF-Linux=	consolefont devfs dmesg hwclock keymaps killprocs modules

 CONF-NetBSD=	moused rarpd savecore

--- a/conf.d/bootmisc
+++ b/conf.d/bootmisc
@@ -8,8 +8,3 @@ 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"
-
-# Save the previous dmesg log to dmesc.old
-# This may be useful if you need to compare the current boot to the
-# previous one.
-#previous_dmesg=no
--- a/conf.d/mtab
+++ b/conf.d/mtab
@@ -1,5 +0,0 @@
-# This setting controls whether /etc/mtab is a file or symbolic link.
-# Most of the time, you shouldn't touch this. However, if the default
-# breaks your system in some way, please see the NEWS.md file that comes
-# with OpenRC for the actions to take.
-# mtab_is_file=no
--- a/conf.d/net-online
+++ b/conf.d/net-online
@@ -1,15 +0,0 @@
-# The interfaces setting controls which interfaces the net-online
-# service considers in deciding whether the network is active. By
-# default, it is all ethernet or wireless LAN interfaces.
-#interfaces=""
-
-# This setting controls whether a ping to the default gateway is
-# included in the test for network connectivity after all interfaces
-# are active.
-#ping_default_gateway=no
-
-# The timeout setting controls how long the net-online service waits
-# for the network to be configured.
-# The default is 120 seconds.
-# if this is set to 0, the wait is infinite.
-#timeout=120
--- a/conf.d/netmount
+++ b/conf.d/netmount
@@ -25,11 +25,11 @@
 #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
+# 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="networkmanager"
 #rc_need="dhcpcd"
 #rc_need="wicd"
 #
--- a/etc/rc.conf.Linux
+++ b/etc/rc.conf.Linux
@@ -2,17 +2,14 @@
 # LINUX SPECIFIC OPTIONS

 # This is the subsystem type. Valid options on Linux:
-# ""               - nothing special
-# "docker"         - Docker container manager
-# "lxc"            - Linux Containers
-# "openvz"         - Linux OpenVZ
-# "prefix"         - Prefix
-# "rkt"            - CoreOS container management system
-# "uml"            - Usermode Linux
-# "vserver"        - Linux vserver
-# "systemd-nspawn" - Container created by the systemd-nspawn utility
-# "xen0"           - Xen0 Domain
-# "xenU"           - XenU Domain
+# ""        - nothing special
+# "lxc"     - Linux Containers
+# "openvz"  - Linux OpenVZ
+# "prefix"  - Prefix
+# "uml"     - Usermode Linux
+# "vserver" - Linux vserver
+# "xen0"    - Xen0 Domain
+# "xenU"    - XenU Domain
 # If this is commented out, automatic detection will be used.
 #
 # This should be set to the value representing the environment this file is
@@ -64,21 +61,12 @@ rc_tty_number=12
 # Set the devices controller settings for this service.
 #rc_cgroup_devices=""

-# Set the hugetlb controller settings for this service.
-#rc_cgroup_hugetlb=""
-
 # Set the memory controller settings for this service.
 #rc_cgroup_memory=""

-# Set the net_cls controller settings for this service.
-#rc_cgroup_net_cls=""
-
 # Set the net_prio controller settings for this service.
 #rc_cgroup_net_prio=""

-# Set the pids controller settings for this service.
-#rc_cgroup_pids=""
-
 # Set this to YES if yu want all of the processes in a service's cgroup
 # killed when the service is stopped or restarted.
 # This should not be set globally because it kills all of the service's
--- a/etc/rc.conf.in
+++ b/etc/rc.conf.in
@@ -29,20 +29,17 @@
 # come up.
 #rc_depend_strict="YES"

-# rc_hotplug controls which services we allow to be hotplugged.
+# rc_hotplug is a list of services that we allow to be hotplugged.
+# By default we do not allow hotplugging.
 # A hotplugged service is one started by a dynamic dev manager when a matching
 # hardware device is found.
-# Hotplugged services appear in the "hotplugged" runlevel.
-# If rc_hotplug is set to any value, we compare the name of this service
-# to every pattern in the value, from left to right, and we allow the
-# service to be hotplugged if it matches a pattern, or if it matches no
-# patterns. Patterns can include shell wildcards.
-# To disable services from being hotplugged, prefix patterns with "!".
-#If rc_hotplug is not set or is empty, all hotplugging is disabled.
+# This service is intrinsically included in the boot runlevel.
+# To disable services, prefix with a !
 # Example - rc_hotplug="net.wlan !net.*"
-# This allows net.wlan and any service not matching net.* to be hotplugged.
-# Example - rc_hotplug="!net.*"
-# This allows services that do not match "net.*" to be hotplugged.
+# This allows net.wlan and any service not matching net.* to be plugged.
+# Example - rc_hotplug="*"
+# This allows all services to be hotplugged
+#rc_hotplug="*"

 # rc_logger launches a logging daemon to log the entire rc process to
 # /var/log/rc.log
@@ -119,9 +116,6 @@
 #SSD_NICELEVEL="-19"

 # Pass ulimit parameters
-# If you are using bash in POSIX mode for your shell, note that the
-# ulimit command uses a block size of 512 bytes for the -c and -f
-# options
 #rc_ulimit="-u 30"

 # It's possible to define extra dependencies for services like so
--- a/etc/rc.in
+++ b/etc/rc.in
@@ -10,9 +10,9 @@
 trap : SIGINT
 trap "echo 'Boot interrupted'; exit 1" SIGQUIT

-/sbin/openrc sysinit || exit 1
-/sbin/openrc boot || exit 1
-/sbin/openrc default
+/sbin/rc sysinit || exit 1
+/sbin/rc boot || exit 1
+/sbin/rc default

 # We don't actually care if rc default worked or not, we should exit 0
 # to allow logins
--- a/etc/rc.shutdown.in
+++ b/etc/rc.shutdown.in
@@ -14,4 +14,4 @@ LD_LIBRARY_PATH="/lib${LD_LIBRARY_PATH:+:}${LDLIBRARY_PATH}" ; export LD_LIBRARY
 [ -z "$TERM" -o "$TERM" = "dumb" ] && TERM="@TERM@" && export TERM

 action=${1:-shutdown}
-exec /sbin/openrc "${action}"
+exec /sbin/rc "${action}"
--- a/init.d/.gitignore
+++ b/init.d/.gitignore
@@ -23,7 +23,6 @@ modules
 mount-ro
 mtab
 numlock
-osclock
 procfs
 staticroute
 sysfs
--- a/init.d/Makefile
+++ b/init.d/Makefile
@@ -2,8 +2,8 @@ include ../mk/net.mk

 DIR=	${INITDIR}
 SRCS=	bootmisc.in fsck.in hostname.in local.in localmount.in loopback.in \
-	netmount.in osclock.in root.in savecache.in swap.in swapfiles.in \
-	tmpfiles.setup.in swclock.in sysctl.in urandom.in s6-svscan.in ${SRCS-${OS}}
+	netmount.in root.in savecache.in swap.in swapfiles.in \
+	tmpfiles.setup.in swclock.in sysctl.in urandom.in ${SRCS-${OS}}
 BIN=	${OBJS}

 # Are we installing our network scripts?
@@ -21,9 +21,9 @@ SRCS-FreeBSD=	hostid.in moused.in newsyslog.in pf.in rarpd.in rc-enabled.in \
 SRCS-FreeBSD+=	adjkerntz.in devd.in dumpon.in encswap.in ipfw.in \
 		mixer.in nscd.in powerd.in syscons.in

-SRCS-Linux=	binfmt.in devfs.in dmesg.in hwclock.in consolefont.in keymaps.in \
+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 net-online.in sysfs.in termencoding.in tmpfiles.dev.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 \
--- a/init.d/binfmt.in
+++ b/init.d/binfmt.in
@@ -1,20 +0,0 @@
-#!@SBINDIR@/openrc-run
-# Copyright 2015 William Hubbs <w.d.hubbs@gmail.com>
-# Released under the 2-clause BSD license.
-
-description="Register misc binary format handlers"
-
-depend()
-{
-	after procfs
-	use modules devfs
-	keyword -openvz -prefix -systemd-nspawn -vserver -lxc
-}
-
-start()
-{
-	ebegin "Loading custom binary format handlers"
-	"$RC_LIBEXECDIR"/sh/binfmt.sh
-	eend $?
-	return 0
-}
--- a/init.d/bootmisc.in
+++ b/init.d/bootmisc.in
@@ -119,31 +119,11 @@ clean_run()
 {
 	[ "$RC_SYS" = VSERVER -o "$RC_SYS" = LXC ] && return 0
 	local dir
-	# If / is still read-only due to a problem, this will fail!
-	if ! checkpath -W /; then
-		ewarn "/ is not writable; unable to clean up underlying /run"
-		return 1
-	fi
-	if ! checkpath -W /tmp; then
-		ewarn "/tmp is not writable; unable to clean up underlying /run"
-		return 1
-	fi
-	# Now we know that we can modify /tmp and /
-	# if mktemp -d fails, it returns an EMPTY string
-	# STDERR: mktemp: failed to create directory via template ‘/tmp/tmp.XXXXXXXXXX’: Read-only file system
-	# STDOUT: ''
-	rc=0
 	dir=$(mktemp -d)
-	if [ -n "$dir" -a -d $dir -a -w $dir ]; then
-		mount --bind / $dir && rm -rf $dir/run/* || rc=1
-		umount $dir && rmdir $dir
-	else
-		rc=1
-	fi
-	if [ $rc -ne 0 ]; then
-		ewarn "Could not clean up underlying /run on /"
-		return 1
-	fi
+	mount --bind / $dir
+	rm -rf $dir/run/*
+	umount $dir
+	rm -rf $dir
 }

 start()
@@ -213,16 +193,10 @@ start()
 	if yesno $log_dmesg; then
 		if $logw || checkpath -W /var/log; then
 			# Create an 'after-boot' dmesg log
-			case "$RC_SYS" in
-				VSERVER|OPENVZ|LXC|SYSTEMD-NSPAWN) ;;
-				*)
-					if yesno ${previous_dmesg:-no}; then
-						mv /var/log/dmesg /var/log/dmesg.old
-					fi
-					dmesg > /var/log/dmesg
-					chmod 640 /var/log/dmesg
-					;;
-			esac
+			if [ "$RC_SYS" != VSERVER -a "$RC_SYS" != OPENVZ -a "$RC_SYS" != LXC ]; then
+				dmesg > /var/log/dmesg
+				chmod 640 /var/log/dmesg
+			fi
 		fi
 	fi

--- a/init.d/consolefont.in
+++ b/init.d/consolefont.in
@@ -7,8 +7,8 @@ description="Sets a font for the consoles."
 depend()
 {
 	need localmount termencoding
-	after hotplug bootmisc modules
-	keyword -openvz -prefix -systemd-nspawn -uml -vserver -xenu -lxc
+	after hotplug bootmisc
+	keyword -openvz -prefix -uml -vserver -xenu -lxc
 }

 start()
--- a/init.d/devfs.in
+++ b/init.d/devfs.in
@@ -8,7 +8,7 @@ depend()
 {
 	provide dev-mount
 	before dev
-	keyword -prefix -systemd-nspawn -vserver -lxc
+	keyword -prefix -vserver -lxc
 }

 mount_dev()
--- a/init.d/dmesg.in
+++ b/init.d/dmesg.in
@@ -7,7 +7,7 @@ description="Set the dmesg level for a cleaner boot"
 depend()
 {
 	before dev modules
-	keyword -lxc -prefix -systemd-nspawn -vserver
+	keyword -lxc -prefix -vserver
 }

 start()
--- a/init.d/fsck.in
+++ b/init.d/fsck.in
@@ -9,7 +9,7 @@ _IFS="
 depend()
 {
 	use dev clock modules
-	keyword -jail -openvz -prefix -systemd-nspawn -timeout -vserver -lxc -uml
+	keyword -jail -openvz -prefix -timeout -vserver -lxc -uml
 }

 _abort() {
--- a/init.d/hostname.in
+++ b/init.d/hostname.in
@@ -5,7 +5,7 @@
 description="Sets the hostname of the machine."

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

 start()
--- a/init.d/hwclock.in
+++ b/init.d/hwclock.in
@@ -28,7 +28,7 @@ depend()
 	else
 		before *
 	fi
-	keyword -openvz -prefix -systemd-nspawn -uml -vserver -xenu -lxc
+	keyword -openvz -prefix -uml -vserver -xenu -lxc
 }

 setupopts()
--- a/init.d/keymaps.in
+++ b/init.d/keymaps.in
@@ -8,7 +8,7 @@ depend()
 {
 	need localmount termencoding
 	after bootmisc
-	keyword -openvz -prefix -systemd-nspawn -uml -vserver -xenu -lxc
+	keyword -openvz -prefix -uml -vserver -xenu -lxc
 }

 start()
--- a/init.d/local.in
+++ b/init.d/local.in
@@ -20,7 +20,7 @@ start()
 	for file in @SYSCONFDIR@/local.d/*.start; do
 		if [ -x "${file}" ]; then
 			vebegin "Executing \"${file}\""
-			eval "${file}" $redirect
+			"${file}" $redirect
 			retval=$?
 			if [ ${retval} -ne 0 ]; then
 				has_errors=1
@@ -59,7 +59,7 @@ stop()
 	for file in @SYSCONFDIR@/local.d/*.stop; do
 		if [ -x "${file}" ]; then
 			vebegin "Executing \"${file}\""
-			eval "${file}" $redirect
+			"${file}" $redirect
 			retval=$?
 			if [ ${retval} -ne 0 ]; then
 				has_errors=1
--- a/init.d/localmount.in
+++ b/init.d/localmount.in
@@ -9,13 +9,13 @@ depend()
 	need fsck
 	use lvm modules mtab
 	after lvm modules
-	keyword -jail -prefix -systemd-nspawn -vserver -lxc
+	keyword -jail -prefix -vserver -lxc
 }

 start()
 {
 	# Mount local filesystems in /etc/fstab.
-	local types="noproc" x= no_netdev= rc=
+	local types="noproc" x= no_netdev=
 	for x in $net_fs_list $extra_net_fs_list; do
 		types="${types},no${x}"
 	done
@@ -29,11 +29,9 @@ start()
 	ebegin "Mounting local filesystems"
 	mount -at "$types" $no_netdev
 	eend $? "Some local filesystem failed to mount"
-	rc=$?
-	if [ "$RC_UNAME" != Linux ]; then
-		rc=0
-	fi
-	return $rc
+
+	# Always return 0 - some local mounts may not be critical for boot
+	return 0
 }

 stop()
@@ -72,19 +70,17 @@ stop()
 			sync
 		fi

-		local aufs_branch aufs_mount_point aufs_si_id aufs_br_id branches
-		for aufs_si_dir in /sys/fs/aufs/si*; do
-			[ -d "${aufs_si_dir}" ] || continue
-			aufs_si_id="si=${aufs_si_dir#/sys/fs/aufs/si_}"
+		local aufs_branch aufs_mount_dir aufs_mount_point aufs_si_dir aufs_si_id
+		for aufs_si_dir in /sys/fs/aufs/*; do
+			aufs_mount_dir=${aufs_si_dir#/sys/fs/aufs/}
+			aufs_si_id="$(printf "%s" $aufs_mount_dir | sed 's/_/=/g')"
 			aufs_mount_point="$(mountinfo -o ${aufs_si_id})"
-			branches="$aufs_si_dir/br[0-9] $aufs_si_dir/br[0-9][0-9] $aufs_si_dir/br[0-9][0-9][0-9]"
-			for x in $branches; do
-				[ -e "${x}" ] || continue
+			for x in $aufs_si_dir/br[0-9][0-9][0-9]; do
 				aufs_branch=$(sed 's/=.*//g' $x)
 				eindent
 				if ! mount -o "remount,del:$aufs_branch" "$aufs_mount_point" > /dev/null 2>&1; then
 					ewarn "Failed to remove branch $aufs_branch from aufs \
-					$aufs_mount_point"
+						$aufs_mount_point"
 				fi
 				eoutdent
 				sync
--- a/init.d/loopback.in
+++ b/init.d/loopback.in
@@ -6,7 +6,7 @@ description="Configures the loopback interface."

 depend()
 {
-	keyword -jail -prefix -systemd-nspawn -vserver
+	keyword -jail -prefix -vserver
 }

 start()
--- a/init.d/modules.in
+++ b/init.d/modules.in
@@ -7,7 +7,7 @@ description="Loads a user defined list of kernel modules."
 depend()
 {
 	use isapnp
-	keyword -openvz -prefix -systemd-nspawn -vserver -lxc
+	keyword -openvz -prefix -vserver -lxc
 }

 start()
--- a/init.d/mount-ro.in
+++ b/init.d/mount-ro.in
@@ -7,7 +7,7 @@ description="Re-mount filesytems read-only for a clean reboot."
 depend()
 {
 	need killprocs savecache
-	keyword -openvz -prefix -systemd-nspawn -vserver -lxc
+	keyword -openvz -prefix -vserver -lxc
 }

 start()
--- a/init.d/mtab.in
+++ b/init.d/mtab.in
@@ -7,33 +7,33 @@ description="Update /etc/mtab to match what the kernel knows about"
 depend()
 {
 	need root
-	keyword -prefix -systemd-nspawn
+	keyword -prefix
 }

 start()
 {
-	local rc=0
-	ebegin "Updating /etc/mtab"
-	if ! checkpath -W /etc; then
-		rc=1
-	elif ! yesno ${mtab_is_file:-no}; then
-		[ ! -L /etc/mtab ] && [ -f /etc/mtab ] &&
-			ewarn "Removing /etc/mtab file"
-		einfo "Creating mtab symbolic link"
-		ln -snf /proc/self/mounts /etc/mtab
-	else
-		[ -L /etc/mtab ] && ewarn "Removing /etc/mtab symbolic link"
-		rm -f /etc/mtab
-		einfo "Creating mtab file"
-		# With / as tmpfs we cannot umount -at tmpfs in localmount as that
-		# makes / readonly and dismounts all tmpfs even if in use which is
-		# not good. Luckily, umount uses /etc/mtab instead of /proc/mounts
-		# which allows this hack to work.
-		grep -v "^[! ]* / tmpfs " /proc/mounts > /etc/mtab
-
-		# Remove stale backups
-		rm -f /etc/mtab~ /etc/mtab~~
+	if [ -L /etc/mtab ]; then
+		return 0
 	fi
-	eend $rc "/etc is not writable; unable to create /etc/mtab"
-	return 0
+
+	ebegin "Updating /etc/mtab"
+	vewarn "The support for updating /etc/mtab as a file is"
+	vewarn "deprecated and will be removed in the future."
+	vewarn "Please run the following command as root on your system."
+	vewarn
+	vewarn "ln -snf /proc/self/mounts /etc/mtab"
+	if ! echo 2>/dev/null >/etc/mtab; then
+		ewend 1 "/etc/mtab is not updateable"
+		return 0
+	fi
+
+	# With / as tmpfs we cannot umount -at tmpfs in localmount as that
+	# makes / readonly and dismounts all tmpfs even if in use which is
+	# not good. Luckily, umount uses /etc/mtab instead of /proc/mounts
+	# which allows this hack to work.
+	grep -v "^[! ]* / tmpfs " /proc/mounts > /etc/mtab
+
+	# Remove stale backups
+	rm -f /etc/mtab~ /etc/mtab~~
+	eend 0
 }
--- a/init.d/net-online.in
+++ b/init.d/net-online.in
@@ -1,69 +0,0 @@
-#!@SBINDIR@/openrc-run
-# Copyright (C) 2015 William Hubbs <w.d.hubbs@gmail.com>
-# Released under the 2-clause BSD license.
-
-description="Delays until the network is online or a specific timeout"
-
-depend()
-{
-	after modules
-	need sysfs
-	keyword -jail -lxc -openvz -prefix -systemd-nspawn -uml -vserver
-}
-
-get_interfaces()
-{
-	local ifname iftype
-	for ifname in /sys/class/net/*; do
-		read iftype < ${ifname}/type
-		[ "$iftype" = "1" ] && printf "%s " ${ifname##*/}
-	done
-}
-
-get_default_gateway()
-{
-	local cmd gateway
-	if command -v ip > /dev/null 2>&1; then
-		cmd="ip route show"
-	else
-		cmd=route
-	fi
-	set -- $($cmd | grep default)
-	[ "$2" != via ] && gateway="$2" || gateway="$3"
-	printf "%s" $gateway
-}
-
-start ()
-{
-	local carriers configured dev gateway ifcount infinite interfaces
-	local rc state timeout x
-
-	ebegin "Checking to see if the network is online"
-	rc=0
-	interfaces=${interfaces:-$(get_interfaces)}
-	timeout=${timeout:-120}
- [ $timeout -eq 0 ] && infinite=true || infinite=false
- while $infinite || [ $timeout -gt 0 ]; do
-	carriers=0
-	configured=0
-	ifcount=0
- 	for dev in ${interfaces}; do
-		: $((ifcount += 1))
-		read x < /sys/class/net/$dev/carrier
-		[ $x -eq 1 ] && : $((carriers += 1))
-		read x < /sys/class/net/$dev/operstate
-		[ "$x" = up ] && : $((configured += 1))
-	done
-	[ $configured -eq $ifcount ] && [ $carriers -ge 1 ] && break
-	sleep 1
-	: $((timeout -= 1))
- done
- ! $infinite && [ $timeout -eq 0 ] && rc=1
- if [ $rc -eq 0 ] && yesno ${ping_default_gateway:-no}; then
- 	gateway="$(get_default_gateway)"
- 	if [ -n "$gateway" ] && ! ping -c 1 $gateway > /dev/null 2>&1; then
-		rc=1
-	fi
- fi
- eend $rc "The network is offline"
-}
--- a/init.d/netmount.in
+++ b/init.d/netmount.in
@@ -9,7 +9,7 @@ depend()
 	config /etc/fstab
 	use afc-client amd nfsclient autofs openvpn
 	use dns
-	keyword -jail -prefix -systemd-nspawn -vserver -lxc
+	keyword -jail -prefix -vserver -lxc
 }

 start()
@@ -27,10 +27,7 @@ start()
 		rc=$?
 	fi
 	ewend $rc "Could not mount all network filesystems"
-	if [ "$RC_UNAME" != Linux ]; then
-		rc=0
-	fi
-	return $rc
+	return 0
 }

 stop()
--- a/init.d/numlock.in
+++ b/init.d/numlock.in
@@ -9,7 +9,7 @@ ttyn=${rc_tty_number:-${RC_TTY_NUMBER:-12}}
 depend()
 {
 	need localmount
-	keyword -openvz -prefix -systemd-nspawn -vserver -lxc
+	keyword -openvz -prefix -vserver -lxc
 }

 _setleds()
--- a/init.d/osclock.in
+++ b/init.d/osclock.in
@@ -1,12 +0,0 @@
-#!@SBINDIR@/openrc-run
-# Copyright (c) 2014 Ralph Sennhauser <sera@igentoo.org>
-# Released under the 2-clause BSD license.
-
-# Can be used on OSs that take care of the clock.
-
-description="Provides clock"
-
-depend()
-{
-	provide clock
-}
--- a/init.d/procfs.in
+++ b/init.d/procfs.in
@@ -8,20 +8,66 @@ depend()
 {
 	use modules devfs
 	need localmount
-	keyword -openvz -prefix -systemd-nspawn -vserver -lxc
+	keyword -openvz -prefix -vserver -lxc
 }

 start()
 {
+	# Make sure we insert usbcore if it's a module
+	if [ -f /proc/modules -a ! -d /sys/module/usbcore -a ! -d /proc/bus/usb ]; then
+		modprobe -q usbcore
+	fi
+
+	[ -e /proc/filesystems ] || return 0
+
 	# Setup Kernel Support for miscellaneous Binary Formats
 	if [ -d /proc/sys/fs/binfmt_misc -a ! -e /proc/sys/fs/binfmt_misc/register ]; then
-		modprobe -q binfmt-misc
 		if grep -qs binfmt_misc /proc/filesystems; then
 			ebegin "Mounting misc binary format filesystem"
 			mount -t binfmt_misc -o nodev,noexec,nosuid \
 				binfmt_misc /proc/sys/fs/binfmt_misc
+			if eend $? ; then
+				local fmts
+				ebegin "Loading custom binary format handlers"
+				fmts=$(grep -hsv -e '^[#;]' -e '^[[:space:]]*$' \
+					/run/binfmt.d/*.conf \
+					/etc/binfmt.d/*.conf \
+					""/usr/lib/binfmt.d/*.conf)
+				if [ -n "${fmts}" ]; then
+					echo "${fmts}" > /proc/sys/fs/binfmt_misc/register
+				fi
 				eend $?
+			fi
 		fi
 	fi
+
+	[ "$RC_SYS" = "OPENVZ" ] && return 0
+
+	# Check what USB fs the kernel support.  Currently
+	# 2.5+ kernels, and later 2.4 kernels have 'usbfs',
+	# while older kernels have 'usbdevfs'.
+	if [ -d /proc/bus/usb -a ! -e /proc/bus/usb/devices ]; then
+		local usbfs=$(grep -Fow usbfs /proc/filesystems ||
+			grep -Fow usbdevfs /proc/filesystems)
+		if [ -n "$usbfs" ]; then
+			ebegin "Mounting USB device filesystem [$usbfs]"
+			local usbgid="$(getent group usb | \
+				sed -e 's/.*:.*:\(.*\):.*/\1/')"
+			mount -t $usbfs \
+				-o ${usbgid:+devmode=0664,devgid=$usbgid,}noexec,nosuid \
+				usbfs /proc/bus/usb
+			eend $?
+		fi
+	fi
+
+	# Setup Kernel Support for SELinux
+	if [ -d /sys/fs/selinux ] && ! mountinfo -q /sys/fs/selinux; then
+		if grep -qs selinuxfs /proc/filesystems; then
+			ebegin "Mounting SELinux filesystem"
+			mount -t selinuxfs selinuxfs /sys/fs/selinux
+			eend $?
+		fi
+	fi
+
 	return 0
 }
--- a/init.d/root.in
+++ b/init.d/root.in
@@ -7,7 +7,7 @@ description="Mount the root fs read/write"
 depend()
 {
 	need fsck
-	keyword -jail -openvz -prefix -systemd-nspawn -vserver -lxc
+	keyword -jail -openvz -prefix -vserver -lxc
 }

 start()
--- a/init.d/s6-svscan.in
+++ b/init.d/s6-svscan.in
@@ -1,31 +0,0 @@
-#!@SBINDIR@/openrc-run
-# Copyright (C) 2015 William Hubbs <w.d.hubbs@gmail.com>
-# Released under the 2-clause BSD license.
-
-command=/bin/s6-svscan
-command_args="${RC_SVCDIR}"/s6-scan
-command_background=yes
-pidfile=/var/run/s6-svscan.pid
-
-depend()
-{
-	need localmount
-}
-
-start_pre()
-{
-	einfo "Creating s6 scan directory"
-	checkpath -d -m 0755 "$RC_SVCDIR"/s6-scan
-	return $?
-}
-
-stop_post()
-{
-	ebegin "Stopping any remaining s6 services"
-	s6-svc -dx "${RC_SVCDIR}"/s6-scan/* 2>/dev/null || true
-	eend $?
-
-	ebegin "Stopping any remaining s6 service loggers"
-	s6-svc -dx "${RC_SVCDIR}"/s6-scan/*/log 2>/dev/null || true
-	eend $?
-}
--- a/init.d/savecache.in
+++ b/init.d/savecache.in
@@ -7,53 +7,43 @@ description="Saves the caches OpenRC uses to non volatile storage"
 start()
 {
 	if [ -e "$RC_SVCDIR"/clock-skewed ]; then
-		ewarn "Clock skew detected!"
+		ewarn "WARNING: clock skew detected!"
 		if ! yesno "${RC_GOINGDOWN}"; then
 			eerror "Not saving deptree cache"
 			return 1
 		fi
 	fi
-	if [ ! -d "$RC_LIBEXECDIR"/cache ]; then
-		if ! checkpath -W "$RC_LIBEXECDIR"; then
-			eerror "${RC_LIBEXECDIR} is not writable!"
-			eerror "Unable to save dependency cache"
-			if yesno "${RC_GOINGDOWN}"; then
-				return 0
-			fi
-			return 1
-		fi
-		rm -rf "$RC_LIBEXECDIR"/cache
-		if ! mkdir -p "$RC_LIBEXECDIR"/cache; then
-			eerror "Unable to create $RC_LIBEXECDIR/cache"
-			eerror "Unable to save dependency cache"
-			if yesno "${RC_GOINGDOWN}"; then
-				return 0
-			fi
-			return 1
-		fi
-	fi
 	if ! checkpath -W "$RC_LIBEXECDIR"/cache; then
-		eerror "${RC_LIBEXECDIR}/cache is not writable!"
-		eerror "Unable to save dependency cache"
-		if yesno "${RC_GOINGDOWN}"; then
-			return 0
+		ewarn "WARNING: ${RC_LIBEXECDIR}/cache is not writable!"
+		if ! yesno "${RC_GOINGDOWN}"; then
+			ewarn "Unable to save deptree cache"
+			return 1
 		fi
-		return 1
+		return 0
 	fi
 	ebegin "Saving dependency cache"
-	local rc=0 save=
+	local rc=
+	if [ ! -d "$RC_LIBEXECDIR"/cache ]; then
+		rm -rf "$RC_LIBEXECDIR"/cache
+		if ! mkdir "$RC_LIBEXECDIR"/cache; then
+			rc=$?
+			if yesno "${RC_GOINGDOWN}"; then
+				rc=0
+			fi
+			eend $rc
+			return $rc
+		fi
+	fi
+	local save=
 	for x in deptree depconfig shutdowntime softlevel nettree rc.log; do
 		[ -e "$RC_SVCDIR/$x" ] && save="$save $RC_SVCDIR/$x"
 	done
 	if [ -n "$save" ]; then
-		cp -p $save "$RC_LIBEXECDIR"/cache
-		rc=$?
+		cp -p $save "$RC_LIBEXECDIR"/cache 2>/dev/null
 	fi
+	rc=$?
 	if yesno "${RC_GOINGDOWN}"; then
-		if [ $rc -ne 0 ]; then
-			eerror "Unable to save dependency cache"
-		fi
-		eend 0
+		rc=0
 	fi
-	eend $rc "Unable to save dependency cache"
+	eend $rc
 }
--- a/init.d/savecore.in
+++ b/init.d/savecore.in
@@ -23,7 +23,7 @@ start()
 		# Don't quote ${dump_device}, so that if it's unset,
 		# savecore will check on the partitions listed in fstab
 		# without errors in the output
-		savecore -C $dump_device >/dev/null
+		savecore -C "$dump_dir" $dump_device >/dev/null
 	else
 		ls "$dump_dir"/bsd* > /dev/null 2>&1
 	fi
--- a/init.d/swap.in
+++ b/init.d/swap.in
@@ -5,7 +5,7 @@
 depend()
 {
 	before localmount
-	keyword -jail -openvz -prefix -systemd-nspawn -vserver -lxc
+	keyword -jail -openvz -prefix -vserver -lxc
 }

 start()
--- a/init.d/swapfiles.in
+++ b/init.d/swapfiles.in
@@ -5,7 +5,7 @@
 depend()
 {
 	need localmount
-	keyword -jail -openvz -prefix -systemd-nspawn -vserver -lxc
+	keyword -jail -openvz -prefix -vserver -lxc
 }

 start()
--- a/init.d/swclock.in
+++ b/init.d/swclock.in
@@ -8,7 +8,7 @@ depend()
 {
 	before *
 	provide clock
-	keyword -openvz -prefix -systemd-nspawn -uml -vserver -xenu -lxc
+	keyword -openvz -prefix -uml -vserver -xenu -lxc
 }

 # swclock is an OpenRC built in
--- a/init.d/sysctl.GNU.in
+++ b/init.d/sysctl.GNU.in
@@ -1,4 +1,4 @@
-#!@PREFIX@/sbin/openrc-run
+#!@PREFIX@/sbin/runscript
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 #FIXME: Modify for GNU/Hurd
--- a/init.d/sysctl.Linux.in
+++ b/init.d/sysctl.Linux.in
@@ -5,15 +5,12 @@
 depend()
 {
 	before bootmisc logger
-	keyword -prefix -systemd-nspawn -vserver
+	keyword -prefix -vserver
 }

 start()
 {
-	local quiet
-	yesno $rc_verbose || quiet=-q
-
 	ebegin "Configuring kernel parameters"
-	sysctl ${quiet} --system
+	sysctl --system
 	eend $? "Unable to configure some kernel parameters"
 }
--- a/init.d/sysfs.in
+++ b/init.d/sysfs.in
@@ -8,7 +8,7 @@ sysfs_opts=nodev,noexec,nosuid

 depend()
 {
-	keyword -lxc -prefix -systemd-nspawn -vserver
+	keyword -lxc -prefix -vserver
 }

 mount_sys()
@@ -61,6 +61,16 @@ mount_misc()
 		fi
 	fi

+	# set up kernel support for cgroups
+	if [ -d /sys/fs/cgroup ] && ! mountinfo -q /sys/fs/cgroup; then
+		if grep -qs cgroup /proc/filesystems; then
+			ebegin "Mounting cgroup filesystem"
+			local opts="${sysfs_opts},mode=755,size=${rc_cgroupsize:-10m}"
+			mount -n -t tmpfs -o ${opts} cgroup_root /sys/fs/cgroup
+			eend $?
+		fi
+	fi
+
 	# set up kernel support for fusectl
 	if [ -d /sys/fs/fuse/connections ] \
 		&& ! mountinfo -q /sys/fs/fuse/connections; then
@@ -72,15 +82,6 @@ mount_misc()
 		fi
 	fi

-	# Setup Kernel Support for SELinux
-	if [ -d /sys/fs/selinux ] && ! mountinfo -q /sys/fs/selinux; then
-		if grep -qs selinuxfs /proc/filesystems; then
-			ebegin "Mounting SELinux filesystem"
-			mount -t selinuxfs selinuxfs /sys/fs/selinux
-			eend $?
-		fi
-	fi
-
 	# setup up kernel support for efivarfs
 	# slightly complicated, as if it's build as a module but NOT yet loaded,
 	# it will NOT appear in /proc/filesystems yet
@@ -98,16 +99,6 @@ mount_misc()

 mount_cgroups()
 {
-	# set up kernel support for cgroups
-	if [ -d /sys/fs/cgroup ] && ! mountinfo -q /sys/fs/cgroup; then
-		if grep -qs cgroup /proc/filesystems; then
-			ebegin "Mounting cgroup filesystem"
-			local opts="${sysfs_opts},mode=755,size=${rc_cgroupsize:-10m}"
-			mount -n -t tmpfs -o ${opts} cgroup_root /sys/fs/cgroup
-			eend $?
-		fi
-	fi
-
 	mountinfo -q /sys/fs/cgroup || return 0

 	if ! mountinfo -q /sys/fs/cgroup/openrc; then
@@ -116,7 +107,7 @@ mount_cgroups()
 		mount -n -t cgroup \
 			-o none,${sysfs_opts},name=openrc,release_agent="$agent" \
 			openrc /sys/fs/cgroup/openrc
-		printf 1 > /sys/fs/cgroup/openrc/notify_on_release
+		echo 1 > /sys/fs/cgroup/openrc/notify_on_release
 	fi

 	yesno ${rc_controller_cgroups:-YES} && [ -e /proc/cgroups ] || return 0
--- a/init.d/termencoding.in
+++ b/init.d/termencoding.in
@@ -9,7 +9,7 @@ ttyn=${rc_tty_number:-${RC_TTY_NUMBER:-12}}

 depend()
 {
-	keyword -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu
+	keyword -lxc -openvz -prefix -uml -vserver -xenu
 	use root
 	after bootmisc
 }
--- a/init.d/tmpfiles.dev.in
+++ b/init.d/tmpfiles.dev.in
@@ -2,7 +2,7 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Released under the 2-clause BSD license.

-description="Set up tmpfiles.d entries"
+description="set up tmpfiles.d entries"

 depend()
 {
@@ -13,7 +13,7 @@ depend()

 start()
 {
-	ebegin "Setting up tmpfiles.d entries for /dev"
+	ebegin "setting up tmpfiles.d entries for /dev"
 	@LIBEXECDIR@/sh/tmpfiles.sh --prefix=/dev --create --boot ${tmpfiles_opts}
 	eend $?
 	return 0
--- a/init.d/tmpfiles.setup.in
+++ b/init.d/tmpfiles.setup.in
@@ -2,7 +2,7 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Released under the 2-clause BSD license.

-description="Set up tmpfiles.d entries"
+description="set up tmpfiles.d entries"

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

 start()
 {
-	ebegin "Setting up tmpfiles.d entries"
+	ebegin "setting up tmpfiles.d entries"
 	@LIBEXECDIR@/sh/tmpfiles.sh --exclude-prefix=/dev --create --remove --boot \
 		${tmpfiles_opts}
 	eend $?
--- a/init.d/urandom.in
+++ b/init.d/urandom.in
@@ -8,7 +8,7 @@ description="Initializes the random number generator."
 depend()
 {
 	need localmount
-	keyword -jail -lxc -openvz -prefix -systemd-nspawn
+	keyword -jail -lxc -openvz -prefix
 }

 save_seed()
--- a/man/Makefile
+++ b/man/Makefile
@@ -1,17 +1,9 @@
-MK=		../mk
-include ${MK}/sys.mk
-include ${MK}/os.mk
-
 MAN3=		einfo.3 \
 		rc_config.3 rc_deptree.3 rc_find_pids.3 rc_plugin_hook.3 \
 		rc_runlevel.3 rc_service.3 rc_stringlist.3
 MAN8=		rc-service.8 rc-status.8 rc-update.8 openrc.8 openrc-run.8 \
 		service.8 start-stop-daemon.8

-ifeq (${OS},Linux)
-MAN8 += rc-sstat.8
-endif
-
 # Handy macro to create symlinks
 # This does rely on correctly formatting our manpages!
 MAKE_LINKS=	suffix=$${man\#*.}; \
@@ -24,6 +16,8 @@ MAKE_LINKS=	suffix=$${man\#*.}; \
 		fi; \
 		done;

+MK=		../mk
+include ${MK}/sys.mk
 include ${MK}/gitignore.mk

 all:
--- a/man/openrc-run.8
+++ b/man/openrc-run.8
@@ -107,19 +107,6 @@ the service has already been stopped.
 String describing the service.
 .It Ar description_$command
 String describing the extra command.
-.It Ar supervisor
-Supervisor to use to monitor this daemon. If this is unset,
-start-stop-daemon will be used. The only alternate supervisor we support
-in this release is S6 from Skarnet software. To use this, set
-supervisor=s6.
-.It Ar s6_service_path
-The path to the s6 service directory if you are monitoring this service
-with S6. The default is /var/svc.d/${RC_SVCNAME}.
-.It Ar s6_svwait_options_start
-The options to pass to s6-svwait when starting the service via s6.
-.It Ar s6_service_timeout_stop
-The amount of time, in milliseconds, s6-svc should wait for the service
-to go down when stopping the service. The default is 10000.
 .It Ar start_stop_daemon_args
 List of arguments passed to start-stop-daemon when starting the daemon.
 .It Ar command
@@ -127,8 +114,7 @@ Daemon to start or stop via
 .Nm start-stop-daemon
 if no start or stop function is defined by the service.
 .It Ar command_args
-List of arguments to pass to the daemon when starting via
-.Nm start-stop-daemon .
+List of arguments to pass to the daemon when starting.
 .It Ar command_background
 Set this to "true", "yes" or "1" (case-insensitive) to force the daemon into
 the background. This implies the "--make-pidfile" and "--pidfile" option of
@@ -141,8 +127,6 @@ will chroot into this path before writing the pid file or starting the daemon.
 Pidfile to use for the above defined command.
 .It Ar name
 Display name used for the above defined command.
-.It Ar stopsig
-Signal to send when stopping the daemon.
 .It Ar retry
 Retry schedule to use when stopping the daemon. It can either be a
 timeout in seconds or multiple signal/timeout pairs (like SIGTERM/5).
@@ -166,25 +150,21 @@ will start and stop it in the right order in relation to other services.
 As it's a function it can be very flexible, see the example below.
 Here is a list of the functions you can use in a
 .Ic depend
-function. You simply pass the names of the services you want to add to
-that dependency type to the function, or prefix the names with ! to
-remove them from the dependencies.
+function. You simply pass the names of the services to it to add to that
+dependency type, or prefix it with ! to remove it.
 .Bl -tag -width "RC_DEFAULTLEVEL"
 .It Ic need
 The service will refuse to start until needed services have started and it
 will refuse to stop until any services that need it have stopped.
 .It Ic use
-The service will attempt to start any services it uses that have been added
+The service will attempt to start any services we use that have been added
 to the runlevel.
-.It Ic want
-The service will attempt to start any services it wants, regardless of
-whether they have been added to the runlevel.
 .It Ic after
 The service will start after these services and stop before these services.
 .It Ic before
 The service will start before these services and stop after these services.
 .It Ic provide
-The service provides this virtual service. For example, named provides dns.
+We provide this virtual service. For example, named provides dns.
 Virtual services take precedence over real services, so it is highly
 recommended that you do not have a real service that has the same name
 as a virtual service.
@@ -217,8 +197,6 @@ Same as -jail, but for Linux Resource Containers (LXC).
 Same as -jail, but for OpenVZ systems.
 .It Dv -prefix
 Same as -jail, but for Prefix systems.
-.It Dv -rkt
-Same as -jail, but for RKT systems.
 .It Dv -uml
 Same as -jail, but for UML systems.
 .It Dv -vserver
@@ -227,11 +205,6 @@ Same as -jail, but for VServer systems.
 Same as -jail, but for Xen DOM0 systems.
 .It Dv -xenu
 Same as -jail, but for Xen DOMU systems.
-.It Dv -docker
-Same as -jail, but for docker systems.
-.It Dv -containers
-Same as -jail, but for all relevant container types on the operating
-system.
 .El
 .El
 .Pp
@@ -473,9 +446,6 @@ rc_net_tap1_provide="!net"
 # It's also possible to negate keywords. This is mainly useful for prefix
 # users testing OpenRC.
 rc_keyword="!-prefix"
-# This can also be used to block a script from runining in all
-# containers except one or two
-rc_keyword="!-containers !-docker"
 .Ed
 .Sh EXAMPLES
 .Pp
--- a/man/rc-sstat.8
+++ b/man/rc-sstat.8
@@ -1,46 +0,0 @@
-.\" Copyright (c) 2015 William Hubbs
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.Dd April 24, 2008
-.Dt RC-sstat 8 SMM
-.Os OpenRC
-.Sh NAME
-.Nm rc-sstat
-.Nd show status info about services supervised by s6 then rc-status
-info
-.Sh SYNOPSIS
-.Nm
-.Sh DESCRIPTION
-.Nm
-gathers and displays information about the status of services supervised
-by s6 then runs rc-status to show info about nnormal OpenRC services.
-.Pp
-.Sh EXIT STATUS
-.Nm
-exits 1 if there is an internal error or exits with the same exit codes
-as rc-status.
-.Sh SEE ALSO
-.Xr rc-status 8 ,
-.Xr rc-update 8
-.Sh AUTHORS
-.An William Hubbs <w.d.hubbs@gmail.com>
--- a/man/rc-update.8
+++ b/man/rc-update.8
@@ -87,7 +87,7 @@ If the
 .Fl s , -stack
 option is given then we either add or remove the runlevel from the runlevel.
 This allows inheritance of runlevels.
-.Pp
+
 If the
 .Fl a, -all
 option is given, we remove the service from all runlevels. This is
--- a/mk/depend.mk
+++ b/mk/depend.mk
@@ -6,7 +6,7 @@ IGNOREFILES+=	.depend

 .depend: ${SRCS}
 	rm -f .depend
-	${CC} ${LOCAL_CPPFLAGS} ${CPPFLAGS} -MM ${SRCS} > .depend
+	${CC} ${CPPFLAGS} -MM ${SRCS} > .depend

 depend: .depend extra_depend

--- a/mk/dist.mk
+++ b/mk/dist.mk
@@ -2,7 +2,7 @@
 # Copyright (c) 2008 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.

-GITREF?=	${VERSION}
+GITREF?=	HEAD
 DISTPREFIX?=	${NAME}-${VERSION}
 DISTFILE?=	${DISTPREFIX}.tar.bz2

@@ -34,7 +34,7 @@ snapshot:
 	mkdir /tmp/${SNAPDIR}
 	cp -RPp * /tmp/${SNAPDIR}
 	(cd /tmp/${SNAPDIR}; make clean)
-	rm -rf /tmp/${SNAPDIR}/.git 2>/dev/null || true
+	find /tmp/${SNAPDIR} -name .svn -exec rm -rf -- {} \; 2>/dev/null || true
 	tar -cvjpf ${SNAPFILE} -C /tmp ${SNAPDIR}
 	rm -rf /tmp/${SNAPDIR}
 	ls -l ${SNAPFILE}
--- a/mk/gitver.mk
+++ b/mk/gitver.mk
--- a/mk/lib.mk
+++ b/mk/lib.mk
@@ -21,10 +21,10 @@ _LIBS+=			${SHLIB_NAME}
 CLEANFILES+=		${OBJS} ${SOBJS} ${_LIBS} ${SHLIB_LINK}

 %.o: %.c
-	${CC} ${LOCAL_CFLAGS} ${LOCAL_CPPFLAGS} ${CFLAGS} ${CPPFLAGS} -c $< -o $@
+	${CC} ${CFLAGS} ${CPPFLAGS} -c $< -o $@

 %.So: %.c
-	${CC} ${PICFLAG} -DPIC ${LOCAL_CFLAGS} ${LOCAL_CPPFLAGS} ${CPPFLAGS} ${CFLAGS} -c $< -o $@
+	${CC} ${PICFLAG} -DPIC ${CPPFLAGS} ${CFLAGS} -c $< -o $@

 all: depend ${_LIBS}

@@ -40,7 +40,7 @@ ${SHLIB_NAME}:	${SOBJS}
 	@${ECHO} building shared library $@
 	@rm -f $@ ${SHLIB_LINK}
 	@ln -fs $@ ${SHLIB_LINK}
-	${CC} ${LOCAL_CFLAGS} ${CFLAGS} ${LOCAL_LDFLAGS} ${LDFLAGS} -shared -Wl,-x \
+	${CC} ${CFLAGS} ${LDFLAGS} -shared -Wl,-x \
 	-o $@ -Wl,-soname,${SONAME} \
 	${SOBJS} ${LDADD}

--- a/mk/os-GNU.mk
+++ b/mk/os-GNU.mk
@@ -4,5 +4,5 @@
 SFX=		.GNU.in
 PKG_PREFIX?=	/usr

-CPPFLAGS+=	-D_BSD_SOURCE -D_XOPEN_SOURCE=700 -DMAXPATHLEN=4096 -DPATH_MAX=4096
+CPPFLAGS+=	-D_BSD_SOURCE -D_XOPEN_SOURCE=700 -DMAXPATHLEN=4096 -DMAX_PATH=4096
 LIBDL=		-Wl,-Bdynamic -ldl
--- a/mk/os-Linux.mk
+++ b/mk/os-Linux.mk
@@ -4,24 +4,11 @@
 SFX=		.Linux.in
 PKG_PREFIX?=	/usr

-CPPFLAGS+=	-D_BSD_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=700
+CPPFLAGS+=	-D_BSD_SOURCE -D_XOPEN_SOURCE=700
 LIBDL=		-Wl,-Bdynamic -ldl

 ifeq (${MKSELINUX},yes)
 CPPFLAGS+= -DHAVE_SELINUX
-LIBSELINUX?= -lselinux
+LIBSELINUX= -lselinux
 LDADD += $(LIBSELINUX)
-
-ifneq (${MKPAM},pam)
-# if using selinux but not pam then we need crypt
-LIBCRYPT?= -lcrypt
-LDADD += $(LIBCRYPT)
-endif
-
-endif
-
-ifeq (${MKAUDIT},yes)
-LIBAUDIT?=	-laudit
-CPPFLAGS+=	-DHAVE_AUDIT
-LDADD+=		${LIBAUDIT}
 endif
--- a/mk/pam.mk
+++ b/mk/pam.mk
@@ -3,12 +3,6 @@ LIBPAM?=	-lpam
 CPPFLAGS+=	-DHAVE_PAM
 LDADD+=		${LIBPAM}

-ifeq (${MKSELINUX},yes)
-# with selinux, pam_misc is needed too
-LIBPAM_MISC?=	-lpam_misc
-LDADD+=		${LIBPAM_MISC}
-endif
-
 PAMDIR?=	/etc/pam.d
 PAMMODE?=	0644
 else ifneq (${MKPAM},)
--- a/mk/prog.mk
+++ b/mk/prog.mk
@@ -1,4 +1,4 @@
-# rules to build a program
+# rules to build a library
 # based on FreeBSD's bsd.prog.mk

 # Copyright (c) 2008 Roy Marples <roy@marples.name>
@@ -25,10 +25,10 @@ CLEANFILES+=		${OBJS} ${PROG}
 all: depend ${PROG}

 %.o: %.c
-	${CC} ${LOCAL_CFLAGS} ${LOCAL_CPPFLAGS} ${CFLAGS} ${CPPFLAGS} -c $< -o $@
+	${CC} ${CFLAGS} ${CPPFLAGS} -c $< -o $@

 ${PROG}: ${SCRIPTS} ${OBJS}
-	${CC} ${LOCAL_CFLAGS} ${LOCAL_LDFLAGS}  ${CFLAGS} ${LDFLAGS} -o $@ ${OBJS} ${LDADD}
+	${CC} ${CFLAGS} ${LDFLAGS} -o $@ ${OBJS} ${LDADD}

 clean:
 	rm -f ${CLEANFILES}
--- a/runlevels/Makefile
+++ b/runlevels/Makefile
@@ -34,8 +34,7 @@ BOOT-FreeBSD+=	hostid newsyslog savecore syslogd
 # FreeBSD specific stuff
 BOOT-FreeBSD+=	adjkerntz dumpon syscons

-BOOT-Linux+=	binfmt hwclock keymaps modules mtab procfs termencoding \
-	tmpfiles.setup
+BOOT-Linux+=	hwclock keymaps modules mtab procfs termencoding tmpfiles.setup
 SHUTDOWN-Linux=	killprocs mount-ro
 SYSINIT-Linux=	devfs dmesg sysfs tmpfiles.dev

--- a/s6-guide.md
+++ b/s6-guide.md
@@ -1,48 +0,0 @@
-# Using S6 with OpenRC
-
-Beginning with OpenRC-0.16, we support using the s6 supervision suite
-from Skarmet Software in place of start-stop-daemon for monitoring
-daemons [1].
-
-## Setup
-
-Documenting s6 in detail is beyond the scope of this guide. It will
-document how to set up OpenRC services to communicate with s6.
-
-### Use Default start, stop and status functions
-
-If you write your own start, stop and status functions in your service
-script, none of this will work. You must allow OpenRC to use the default
-functions.
-
-### Dependencies
-
-All OpenRC service scripts that want their daemons monitored by s6
-should have the following line added to their dependencies to make sure
-the s6 scan directory is being monitored.
-
-need s6-svscan
-
-### Variable Settings
-
-The most important setting is the supervisor variable. At the top of
-your service script, you should set this variable as follows:
-
-supervisor=s6
-
-Several other variables affect s6 services. They are documented on the
-openrc-run man page, but I will list them here for convenience:
-
-s6_service_path - the path to the s6 service directory. The default is
-/var/svc.d/$RC_SVCNAME.
-
-s6_svwait_options_start - the options to pass to s6-svwait when starting
-the service. If this is not set, s6-svwait will not be called.
-
-s6_service_timeout_stop - the amount of time, in milliseconds, s6-svc
-should wait for a service to go down when stopping.
-
-This is very early support, so feel free to file bugs if you have
-issues.
-
-[1] http://www.skarnet.org/software/s6
--- a/scripts/.gitignore
+++ b/scripts/.gitignore
@@ -1 +0,0 @@
-rc-sstat
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -1,19 +1,5 @@
-MK=	../mk
-include ${MK}/os.mk
-
 DIR=	${LIBEXECDIR}/bin
 BIN=	on_ac_power
-INSTALLAFTER = _installafter
-
-ifeq (${OS},Linux)
-SRCS+= rc-sstat.in
-BIN+=	rc-sstat
-endif
-
-_installafter:
-ifeq (${OS},Linux)
-	${INSTALL} -d ${DESTDIR}${SBINDIR}
-	ln -s ${DIR}/rc-sstat ${DESTDIR}/${SBINDIR}/rc-sstat
-endif

+MK=	../mk
 include ${MK}/scripts.mk
--- a/scripts/rc-sstat.in
+++ b/scripts/rc-sstat.in
@@ -1,140 +0,0 @@
-#!@SHELL@
-
-# Define variables
-scandir="/run/openrc/s6-scan"
-statfile=/dev/shm/s6-svstat.${USER}
-
-color_red='\E[01;31m'
-color_green='\E[32m'
-color_yellow='\E[01;33m'
-
-# Time Modules
-uptimeModules() {
-	# Given a single integer argument representing seconds of uptime...
-	# convert uptime to a friendly human readable string: '2d 16h 58m 46s'
-	# define a variable to keep track of the longest length uptime string
-	uSec=${1:-0}
-
-	uDay=$(( $uSec / 86400 ))
-	uSec=$(( $uSec % 86400 ))
-	uHour=$(( $uSec / 3600 ))
-	uSec=$(( $uSec % 3600 ))
-	uMin=$(( $uSec / 60 ))
-	uSec=$(( $uSec % 60 ))
-
-	[ $uDay -ne 0 ] && pDay="${uDay}d " || pDay=""
-	[ $uHour -ne 0 ] && pHour="${uHour}h " || pHour=""
-	[ $uMin -ne 0 ] && pMin="${uMin}m " || pMin=""
-	[ $uSec -ne 0 ] && pSec="${uSec}s " || pSec=""
-
-	parsedUptime="$( echo ${pDay}${pHour}${pMin}${pSec} | sed 's#[ \t]*$##' )"
-	uCharCount=${#parsedUptime}
-}
-
-# Make sure we are running as root
-if [ $(id -u) != 0 ]; then
-	printf "This command must be run as root\n"
-	exit 1
-fi
-
-# Make sure scandir exists
-if [ ! -d $scandir ]; then
-	printf "%s\n" "$scandir does not exist"
-	exit 1
-fi
-
-# Make sure s6-svscan is running 
-if ! pgrep s6-svscan >/dev/null ; then 
-	printf "s6-svscan is not running\n"
-	exit 1
-fi
-
-# If TERM is undefined (launching sstat through an ssh command) then make it vt100
-if [ -z $TERM -o $TERM = "dumb" ]; then
-	export TERM=vt100
-fi
-
-# Gather list of candidate services s6-supervise may be supervising
-# filter for folders and symlinks at /run/openrc/s6-scan/* ommiting output starting with '.'
-services="$(find $scandir -maxdepth 1 -mindepth 1 \( -type d -or -type l \) | awk -F'/' '{ if ( $NF !~ "^\\." ) print $NF}')"
-if [ -z "$services" ]; then
-	printf "s6 found no services configured for supervision\n"
-	exit 1
-fi
-
-# Gather status for each service from s6-svstat
-# write to tmp file in memory for non I/O bound repeatative access
-rm -f $statfile 2>/dev/null
-for service in $services ; do
-	echo "$service $(s6-svstat ${scandir}/${service})" >> $statfile
-done
-
-# Define longest string from parsed uptime (default to 7 to match string length of 'Up Time')
-timeStringLength=7
-for uptime in $(awk '$2 == "up" {print $5}' $statfile | sort -run)
-do
-	uptimeModules $uptime
-	[ ${uCharCount} -gt $timeStringLength ] && timeStringLength=$uCharCount
-done
-
-
-#   Print the status header like so...
-#                Service Name  State    PID         Up Time           Start Time
-#----------------------------  -----  -----  --------------  -------------------
-printf "\n"
-printf "%28s  %5s  %5s  %${timeStringLength}s  %19s\n" "Service Name" "State" "PID" "Up Time" "Start Time"
-for dashes in 28 5 5 $timeStringLength 19 ; do
-	printf "%0.s-" $(seq 1 $dashes) ; echo -n '  '
-done && printf "\n"
-
-
-#   sshd up (pid 26300) 80373 seconds
-cat $statfile | \
-while read line
-do
-	set $line
-
-	service=$1
-	state=$2
-	pid=${4/)/}
-	time=$5
-
-	# call function to convert time in seconds and define additional variables
-	uptimeModules $time
-
-	if [ "$state" = up ]; then
-		if [ $time -lt 30 ]; then
-			# uptime < 30 seconds, color the whole line yellow
-			echo -en "$color_yellow"
-			# 1st 4 columns are printed with printf for space padding
-			printf "%28s  %5s  %5s  %${timeStringLength}s" $service $state $pid "$parsedUptime"
-			# 4th column is output from date -d
-			echo -e "  $(date -d "${time} seconds ago" "+%F %T")"
-			# reset terminal colors
-			tput sgr0
-		else
-			printf "%28s" $service
-			# uptime > 30 seconds, color just the "state" value green
-			echo -en "$color_green"
-			printf "  %5s" $state
-			# reset terminal colors
-			tput sgr0
-			printf "  %5s" $pid
-			printf "  %${timeStringLength}s"  "$parsedUptime"
-			echo -e "  $(date -d "${time} seconds ago" "+%F %T")"
-		fi
-	else
-		printf "%28s" $service
-		echo -en "$color_red"
-		printf "  %5s" $state
-		tput sgr0
-		echo ""
-	fi
-done
-
-# Cleanup 
-rm -f $statfile 2>/dev/null
-
-printf "\n\n"
-
-rc-status
--- a/sh/.gitignore
+++ b/sh/.gitignore
@@ -1,11 +1,10 @@
 functions.sh
 gendepends.sh
 rc-functions.sh
-openrc-run.sh
+runscript.sh
 cgroup-release-agent.sh
 init.sh
 init-early.sh
 rc-cgroup.sh
 tmpfiles.sh
 migrate-to-run.sh
-binfmt.sh
--- a/sh/Makefile
+++ b/sh/Makefile
@@ -1,8 +1,8 @@
 DIR=	${LIBEXECDIR}/sh
 SRCS=	init.sh.in functions.sh.in gendepends.sh.in \
-	openrc-run.sh.in rc-functions.sh.in tmpfiles.sh.in ${SRCS-${OS}}
-INC=	rc-mount.sh functions.sh rc-functions.sh s6.sh start-stop-daemon.sh
-BIN=	gendepends.sh init.sh openrc-run.sh tmpfiles.sh ${BIN-${OS}}
+	rc-functions.sh.in runscript.sh.in tmpfiles.sh.in ${SRCS-${OS}}
+INC=	rc-mount.sh functions.sh rc-functions.sh
+BIN=	gendepends.sh init.sh runscript.sh tmpfiles.sh ${BIN-${OS}}

 INSTALLAFTER=	_installafter

@@ -12,9 +12,9 @@ include ${MK}/os.mk
 SRCS-FreeBSD=
 BIN-FreeBSD=

-SRCS-Linux=	binfmt.sh.in cgroup-release-agent.sh.in init-early.sh.in \
-	migrate-to-run.sh.in rc-cgroup.sh.in
-BIN-Linux=	binfmt.sh cgroup-release-agent.sh init-early.sh migrate-to-run.sh \
+SRCS-Linux=	cgroup-release-agent.sh.in init-early.sh.in migrate-to-run.sh.in \
+	rc-cgroup.sh.in
+BIN-Linux=	cgroup-release-agent.sh init-early.sh migrate-to-run.sh \
 	rc-cgroup.sh

 SRCS-NetBSD=
--- a/sh/binfmt.sh.in
+++ b/sh/binfmt.sh.in
@@ -1,85 +0,0 @@
-#!@SHELL@
-# This is a reimplementation of the systemd binfmt.d code to register
-# misc binary formats with the kernel.
-#
-# Copyright (c) 2015 William Hubbs <w.d.hubbs@gmail.com>
-# Released under the 2-clause BSD license.
-#
-# See the binfmt.d manpage as well:
-# http://0pointer.de/public/systemd-man/binfmt.d.html
-# This script should match the manpage as of 2015/03/31
-#
-
-apply_file() {
-	[ $# -lt 1 ] && return 0
-	FILE="$1"
-	LINENUM=0
-
-	### FILE FORMAT ###
-	# See https://www.kernel.org/doc/Documentation/binfmt_misc.txt
-	while read line; do
-		LINENUM=$(( LINENUM+1 ))
-		case $line in
-			\#*) continue ;;
-			\;*) continue ;;
-		esac
-
-		echo "${line}" > /proc/sys/fs/binfmt_misc/register
-		rc=$?
-		if [ $rc -ne 0 ]; then
-			printf "binfmt: invalid entry on line %d of \`%s'\n" \
-				"$LINENUM" "$FILE" >&2
-			error=1
-		fi
-	done <$FILE
-	return $rc
-}
-
-[ -e /proc/sys/fs/binfmt_misc/register ] || exit 0
-error=0
-if [ $# -gt 0 ]; then
-	while [ $# -gt 0 ]; do
-		apply_file "$1"
-		shift
-	done
-else
-	# The hardcoding of these paths is intentional; we are following the
-	# systemd spec.
-	binfmt_dirs='/usr/lib/binfmt.d/ /run/binfmt.d/ /etc/binfmt.d/'
-	binfmt_basenames=''
-	binfmt_d=''
-
-	# Build a list of sorted unique basenames
-	# directories declared later in the binfmt_d list will override earlier
-	# directories, on a per file basename basis.
-	# `/run/binfmt.d/foo.conf' supersedes `/usr/lib/binfmt.d/foo.conf'.
-	# `/run/binfmt.d/foo.conf' will always be read after `/etc/binfmt.d/bar.conf'
-	for d in ${binfmt_dirs} ; do
-		[ -d $d ] && for f in ${d}/*.conf ; do
-			case "${f##*/}" in
-				systemd.conf|systemd-*.conf) continue;;
-			esac
-			[ -e $f ] && binfmt_basenames="${binfmt_basenames}\n${f##*/}"
-		done # for f in ${d}
-	done # for d in ${binfmt_dirs}
-	binfmt_basenames="$(printf "${binfmt_basenames}\n" | sort -u )"
-
-	for b in $binfmt_basenames ; do
-		real_f=''
-		for d in $binfmt_dirs ; do
-			f=${d}/${b}
-			[ -e "${f}" ] && real_f=$f
-		done
-		[ -e "${real_f}" ] && binfmt_d="${binfmt_d} ${real_f}"
-	done
-
-	# loop through the gathered fragments, sorted globally by filename.
-	# `/run/binfmt.d/foo.conf' will always be read after `/etc/binfmt.d/bar.conf'
-	for FILE in $binfmt_d ; do
-		apply_file "$FILE"
-	done
-fi
-
-exit $error
-
-# vim: set ts=2 sw=2 sts=2 noet ft=sh:
--- a/sh/gendepends.sh.in
+++ b/sh/gendepends.sh.in
@@ -16,9 +16,6 @@ need() {
 use() {
 	[ -n "$*" ] && echo "$RC_SVCNAME iuse $*" >&3
 }
-want() {
-	[ -n "$*" ] && echo "$RC_SVCNAME iwant $*" >&3
-}
 before() {
 	[ -n "$*" ] && echo "$RC_SVCNAME ibefore $*" >&3
 }
@@ -29,18 +26,7 @@ provide() {
 	[ -n "$*" ] && echo "$RC_SVCNAME iprovide $*" >&3
 }
 keyword() {
-	local c x
-	set -- $*
-	while [ -n "$*" ]; do
-		case "$1" in
-			-containers) x="$(_get_containers)" ;;
-			!-containers) x="$(_get_containers_remove)" ;;
-			*) x=$1 ;;
-		esac
-		c="${c}${x} "
-		shift
-	done
-	[ -n "$c" ] && echo "$RC_SVCNAME keyword $c" >&3
+	[ -n "$*" ] && echo "$RC_SVCNAME keyword $*" >&3
 }
 depend() {
 	:
@@ -96,11 +82,6 @@ do
 		fi

 		[ -e @SYSCONFDIR@/rc.conf ] && . @SYSCONFDIR@/rc.conf
-		if [ -d "@SYSCONFDIR@/rc.conf.d" ]; then
-			for _f in "@SYSCONFDIR@"/rc.conf.d/*.conf; do
-				[ -e "$_f" ] && . "$_f"
-			done
-		fi

 		if . "$_dir/$RC_SVCNAME"; then
 			echo "$RC_SVCNAME" >&3
--- a/sh/init.sh.BSD.in
+++ b/sh/init.sh.BSD.in
@@ -23,11 +23,6 @@ mount_svcdir()

 . "$RC_LIBEXECDIR"/sh/functions.sh
 [ -r "@SYSCONFDIR@/rc.conf" ] && . "@SYSCONFDIR@/rc.conf"
-if [ -d "@SYSCONFDIR@/rc.conf.d" ]; then
-	for _f in "@SYSCONFDIR@"/rc.conf.d/*.conf; do
-		[ -r "$_f" ] && . "$_f"
-	done
-fi

 # Disable devd until we need it
 if [ -z "$RC_SYS" -a "$RC_UNAME" = "FreeBSD" ]; then
--- a/sh/init.sh.Linux.in
+++ b/sh/init.sh.Linux.in
@@ -5,11 +5,6 @@

 . "$RC_LIBEXECDIR"/sh/functions.sh
 [ -r "@SYSCONFDIR@/rc.conf" ] && . "@SYSCONFDIR@/rc.conf"
-if [ -d "@SYSCONFDIR@/rc.conf.d" ]; then
-	for _f in "@SYSCONFDIR@"/rc.conf.d/*.conf; do
-		[ -e "$_f" ] && . "$_f"
-	done
-fi

 # By default VServer already has /proc mounted, but OpenVZ does not!
 # However, some of our users have an old proc image in /proc
--- a/sh/rc-cgroup.sh.in
+++ b/sh/rc-cgroup.sh.in
@@ -1,7 +1,6 @@
 #!@SHELL@
 # Copyright (c) 2012 Alexander Vershilov <qnikst@gentoo.org>
 # Released under the 2-clause BSD license.
-
 extra_stopped_commands="${extra_stopped_commands} cgroup_cleanup"
 description_cgroup_cleanup="Kill all processes in the cgroup"

@@ -48,27 +47,25 @@ cgroup_set_values()
 			$controller.*)
 				if [ -n "$name" -a -f "$cgroup/$name" -a -n "$val" ]; then
 					veinfo "$RC_SVCNAME: Setting $cgroup/$name to $val"
-					printf "%s" "$val" > "$cgroup/$name"
+					echo $val > "$cgroup/$name"
 				fi
 				name=$1
 				val=
 				;;
 			*)
-				[ -n "$val" ] &&
-					val="$val $1" ||
-					val="$1"
+				val="$val $1"
 				;;
 		esac
 		shift
 	done
 	if [ -n "$name" -a -f "$cgroup/$name" -a -n "$val" ]; then
 		veinfo "$RC_SVCNAME: Setting $cgroup/$name to $val"
-		printf "%s" "$val" > "$cgroup/$name"
+		echo $val > "$cgroup/$name"
 	fi

 	if [ -f "$cgroup/tasks" ]; then
 		veinfo "$RC_SVCNAME: adding to $cgroup/tasks"
-		printf "%d" 0 > "$cgroup/tasks"
+		echo 0 > "$cgroup/tasks"
 	fi

 	return 0
@@ -81,14 +78,14 @@ cgroup_add_service()
    # cgroups. But may lead to a problems where that inheriting
    # is needed.
 	for d in /sys/fs/cgroup/* ; do
-		[ -f "${d}"/tasks ] && printf "%d" 0 > "${d}"/tasks
+		[ -f "${d}"/tasks ] && echo 0 > "${d}"/tasks
 	done

 	openrc_cgroup=/sys/fs/cgroup/openrc
 	if [ -d "$openrc_cgroup" ]; then
 		cgroup="$openrc_cgroup/$RC_SVCNAME"
 		mkdir -p "$cgroup"
-		[ -f "$cgroup/tasks" ] && printf "%d" 0 > "$cgroup/tasks"
+		[ -f "$cgroup/tasks" ] && echo 0 > "$cgroup/tasks"
 	fi
 }

@@ -109,21 +106,12 @@ cgroup_set_limits()
 	local devices="${rc_cgroup_devices:-$RC_CGROUP_DEVICES}"
 	[ -n "$devices" ] && cgroup_set_values devices "$devices"

-	local hugetlb="${rc_cgroup_hugetlb:-$RC_CGROUP_HUGETLB}"
-	[ -n "$hugetlb" ] && cgroup_set_values hugetlb "$hugetlb"
-
 	local memory="${rc_cgroup_memory:-$RC_CGROUP_MEMORY}"
 	[ -n "$memory" ] && cgroup_set_values memory "$memory"

-	local net_cls="${rc_cgroup_net_cls:-$RC_CGROUP_NET_CLS}"
-	[ -n "$net_cls" ] && cgroup_set_values net_cls "$net_cls"
-
 	local net_prio="${rc_cgroup_net_prio:-$RC_CGROUP_NET_PRIO}"
 	[ -n "$net_prio" ] && cgroup_set_values net_prio "$net_prio"

-	local pids="${rc_cgroup_pids:-$RC_CGROUP_PIDS}"
-	[ -n "$pids" ] && cgroup_set_values pids "$pids"
-
 	return 0
 }

--- a/sh/rc-functions.sh.in
+++ b/sh/rc-functions.sh.in
@@ -85,34 +85,13 @@ get_bootparam()
 	return 1
 }

-# Called from openrc-run.sh or gendepends.sh
-_get_containers() {
-	local c
-	case "${RC_UNAME}" in
-	FreeBSD)
-		c="-jail"
-		;;
-	Linux)
-		c="-docker -lxc -openvz -rkt -systemd-nspawn -uml -vserver"
-		;;
-	esac
-	echo $c
-}
-
-_get_containers_remove() {
-	local c
-	for x in $(_get_containers); do
-		c="${c}!${x} "
-	done
-	echo $c
-}
-
+# Called from runscript.sh or gendepends.sh
 _depend() {
 	depend
 	local _rc_svcname=$(shell_var "$RC_SVCNAME") _deptype= _depends=

 	# Add any user defined depends
-	for _deptype in config:CONFIG need:NEED use:USE want:WANT \
+	for _deptype in config:CONFIG need:NEED use:USE \
 	after:AFTER before:BEFORE \
 	provide:PROVIDE keyword:KEYWORD; do
 		IFS=:
--- a/sh/openrc-run.sh.in
+++ b/sh/openrc-run.sh.in
@@ -1,5 +1,5 @@
 #!@SHELL@
-# Shell wrapper for openrc-run
+# Shell wrapper for runscript

 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
@@ -34,10 +34,7 @@ sourcex()

 sourcex "@LIBEXECDIR@/sh/functions.sh"
 sourcex "@LIBEXECDIR@/sh/rc-functions.sh"
-case $RC_SYS in
-	PREFIX|SYSTEMD-NSPAWN) ;;
-	*) sourcex -e "@LIBEXECDIR@/sh/rc-cgroup.sh";;
-esac
+[ "$RC_SYS" != "PREFIX" ] && sourcex -e "@LIBEXECDIR@/sh/rc-cgroup.sh"

 # Support LiveCD foo
 if sourcex -e "/sbin/livecd-functions.sh"; then
@@ -66,9 +63,6 @@ need() {
 use() {
 	[ -n "$*" ] && echo "use $*"
 }
-want() {
-	[ -n "$*" ] && echo "want $*"
-}
 before() {
 	[ -n "$*" ] && echo "before $*"
 }
@@ -79,18 +73,7 @@ provide() {
 	[ -n "$*" ] && echo "provide $*"
 }
 keyword() {
-	local c x
-	set -- $*
-	while [ -n "$*" ]; do
-		case "$1" in
-			-containers) x="$(_get_containers)" ;;
-			!-containers) x="$(_get_containers_remove)" ;;
-			*) x=$1 ;;
-		esac
-		c="${c}${x} "
-		shift
-	done
-	[ -n "$c" ] && echo "keyword $c"
+	[ -n "$*" ] && echo "keyword $*"
 }

 # Describe the init script to the user
@@ -140,45 +123,76 @@ _status()
 }

 # Template start / stop / status functions
-# These functions select the appropriate function to call from the
-# supervisor modules
 start()
 {
-	local func=ssd_start
-	case "$supervisor" in
-		s6) func=s6_start ;;
-		?*)
-			ewarn "Invalid supervisor, \"$supervisor\", using start-stop-daemon"
-			;;
-	esac
-	$func
+	[ -n "$command" ] || return 0
+	local _background=
+	ebegin "Starting ${name:-$RC_SVCNAME}"
+	if yesno "${command_background}"; then
+		if [ -z "${pidfile}" ]; then
+			eend 1 "command_background option used but no pidfile specified"
+			return 1
+		fi
+		_background="--background --make-pidfile"
+	fi
+	if yesno "$start_inactive"; then
+		local _inactive=false
+		service_inactive && _inactive=true
+		mark_service_inactive
+	fi
+	eval start-stop-daemon --start \
+		--exec $command \
+		${chroot:+--chroot} $chroot \
+		${procname:+--name} $procname \
+		${pidfile:+--pidfile} $pidfile \
+		$_background $start_stop_daemon_args \
+		-- $command_args
+	if eend $? "Failed to start $RC_SVCNAME"; then
+		service_set_value "command" "${command}"
+		[ -n "${chroot}" ] && service_set_value "chroot" "${chroot}"
+		[ -n "${pidfile}" ] && service_set_value "pidfile" "${pidfile}"
+		[ -n "${procname}" ] && service_set_value "procname" "${procname}"
+		return 0
+	fi
+	if yesno "$start_inactive"; then
+		if ! $_inactive; then
+			mark_service_stopped
+		fi
+	fi
+	return 1
 }

 stop()
 {
-	local func=ssd_stop
-	case "$supervisor" in
-		s6) func=s6_stop ;;
-		?*)
-			ewarn "Invalid supervisor, \"$supervisor\", using start-stop-daemon"
-			;;
-	esac
-	$func
+	local startcommand="$(service_get_value "command")"
+	local startchroot="$(service_get_value "chroot")"
+	local startpidfile="$(service_get_value "pidfile")"
+	local startprocname="$(service_get_value "procname")"
+	command="${startcommand:-$command}"
+	chroot="${startchroot:-$chroot}"
+	pidfile="${startpidfile:-$pidfile}"
+	procname="${startprocname:-$procname}"
+	[ -n "$command" -o -n "$procname" -o -n "$pidfile" ] || return 0
+	ebegin "Stopping ${name:-$RC_SVCNAME}"
+	start-stop-daemon --stop \
+		${retry:+--retry} $retry \
+		${command:+--exec} $command \
+		${procname:+--name} $procname \
+		${pidfile:+--pidfile} $chroot$pidfile \
+		${stopsig:+--signal} $stopsig
+	eend $? "Failed to stop $RC_SVCNAME"
 }

 status()
 {
-	local func=ssd_status
-	case "$supervisor" in
-		s6) func=s6_status ;;
-		?*)
-			ewarn "Invalid supervisor, \"$supervisor\", using start-stop-daemon"
-			;;
-	esac
-	$func
+	_status
 }

 yesno $RC_DEBUG && set -x
+if yesno "${rc_verbose:-$RC_VERBOSE}"; then
+	EINFO_VERBOSE=yes
+	export EINFO_VERBOSE
+fi

 _conf_d=${RC_SERVICE%/*}/../conf.d
 # If we're net.eth0 or openvpn.work then load net or openvpn config
@@ -198,22 +212,6 @@ unset _conf_d

 # Load any system overrides
 sourcex -e "@SYSCONFDIR@/rc.conf"
-if [ -d "@SYSCONFDIR@/rc.conf.d" ]; then
-	for _f in "@SYSCONFDIR@"/rc.conf.d/*.conf; do
-		sourcex -e "$_f"
-	done
-fi
-
-
-# load service supervisor functions
-sourcex "@LIBEXECDIR@/sh/s6.sh"
-sourcex "@LIBEXECDIR@/sh/start-stop-daemon.sh"
-
-# Set verbose mode
-if yesno "${rc_verbose:-$RC_VERBOSE}"; then
-	EINFO_VERBOSE=yes
-	export EINFO_VERBOSE
-fi

 for _cmd; do
 	if [ "$_cmd" != status -a "$_cmd" != describe ]; then
@@ -241,22 +239,20 @@ done
 # Load our script
 sourcex "$RC_SERVICE"

-eval "printf '%s\n' $required_dirs" | while read _d; do
-	if [ -n "$_d" ] && [ ! -d "$_d" ]; then
+for _d in $required_dirs; do
+	if [ ! -d $_d ]; then
 		eerror "$RC_SVCNAME: \`$_d' is not a directory"
 		exit 1
 	fi
 done
-[ $? -ne 0 ] && exit 1
 unset _d

-eval "printf '%s\n' $required_files" | while read _f; do
-	if [ -n "$_f" ] && [ ! -r "$_f" ]; then
+for _f in $required_files; do
+	if [ ! -r $_f ]; then
 		eerror "$RC_SVCNAME: \`$_f' is not readable"
 		exit 1
 	fi
 done
-[ $? -ne 0 ] && exit 1
 unset _f

 if [ -n "$opts" ]; then
--- a/sh/s6.sh
+++ b/sh/s6.sh
@@ -1,50 +0,0 @@
-# Start / stop / status functions for s6 support
-# Copyright (c) 2015 William Hubbs <w.d.hubbs@gmail.com>
-# Released under the 2-clause BSD license.
-
-[ -z "${s6_service_path}" ] && s6_service_path="/var/svc.d/${RC_SVCNAME}"
-
-s6_start()
-{
-	if [ ! -d "${s6_service_path}" ]; then
-		eerror "${s6_service_path} does not exist."
- 	return 1
- fi
-	s6_service_link="${RC_SVCDIR}/s6-scan/${s6_service_path##*/}"
-	ebegin "Starting ${name:-$RC_SVCNAME}"
-	ln -sf "${s6_service_path}" "${s6_service_link}"
-	s6-svscanctl -na "${RC_SVCDIR}"/s6-scan
-	sleep 1.5
-	s6-svc -u "${s6_service_link}"
-	if [ -n "$s6_svwait_options_start" ]; then
-		s6-svwait ${s6_svwait_options_start} "${s6_service_link}"
-	fi
-	sleep 1.5
-	set -- $(s6-svstat "${s6_service_link}")
-	[ "$1" = "up" ]
-	eend $? "Failed to start $RC_SVCNAME"
-}
-
-s6_stop()
-{
-	if [ ! -d "${s6_service_path}" ]; then
-		eerror "${s6_service_path} does not exist."
- 	return 1
- fi
-	s6_service_link="${RC_SVCDIR}/s6-scan/${s6_service_path##*/}"
-	ebegin "Stopping ${name:-$RC_SVCNAME}"
-	s6-svc -Dd -T ${s6_service_timeout_stop:-10000} "${s6_service_link}"
-	set -- $(s6-svstat "${s6_service_link}")
-	[ "$1" = "down" ]
-	eend $? "Failed to stop $RC_SVCNAME"
-}
-
-s6_status()
-{
-	s6_service_link="${RC_SVCDIR}/s6-scan/${s6_service_path##*/}"
-	if [ -L "${s6_service_link}" ]; then
-		s6-svstat "${s6_service_link}"
-	else
-		_status
-	fi
-}
--- a/sh/start-stop-daemon.sh
+++ b/sh/start-stop-daemon.sh
@@ -1,77 +0,0 @@
-# start / stop / status functions for start-stop-daemon
-# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
-
-ssd_start()
-{
-	if [ -z "$command" ]; then
-		ewarn "The command variable is undefined."
-		ewarn "There is nothing for ${name:-$RC_SVCNAME} to start."
-		ewarn "If this is what you intend, please write a start function."
-		ewarn "This will become a failure in a future release."
-		return 0
-	fi
-
-	local _background=
-	ebegin "Starting ${name:-$RC_SVCNAME}"
-	if yesno "${command_background}"; then
-		if [ -z "${pidfile}" ]; then
-			eend 1 "command_background option used but no pidfile specified"
-			return 1
-		fi
-		if [ -n "${command_args_background}" ]; then
-			eend 1 "command_background used with command_args_background"
-			return 1
-		fi
-		_background="--background --make-pidfile"
-	fi
-	if yesno "$start_inactive"; then
-		local _inactive=false
-		service_inactive && _inactive=true
-		mark_service_inactive
-	fi
-	eval start-stop-daemon --start \
-		--exec $command \
-		${procname:+--name} $procname \
-		${pidfile:+--pidfile} $pidfile \
-		${command_user+--user} $command_user \
-		$_background $start_stop_daemon_args \
-		-- $command_args $command_args_background
-	if eend $? "Failed to start $RC_SVCNAME"; then
-		service_set_value "command" "${command}"
-		[ -n "${pidfile}" ] && service_set_value "pidfile" "${pidfile}"
-		[ -n "${procname}" ] && service_set_value "procname" "${procname}"
-		return 0
-	fi
-	if yesno "$start_inactive"; then
-		if ! $_inactive; then
-			mark_service_stopped
-		fi
-	fi
-	return 1
-}
-
-ssd_stop()
-{
-	local startcommand="$(service_get_value "command")"
-	local startpidfile="$(service_get_value "pidfile")"
-	local startprocname="$(service_get_value "procname")"
-	command="${startcommand:-$command}"
-	pidfile="${startpidfile:-$pidfile}"
-	procname="${startprocname:-$procname}"
-	[ -n "$command" -o -n "$procname" -o -n "$pidfile" ] || return 0
-	ebegin "Stopping ${name:-$RC_SVCNAME}"
-	start-stop-daemon --stop \
-		${retry:+--retry} $retry \
-		${command:+--exec} $command \
-		${procname:+--name} $procname \
-		${pidfile:+--pidfile} $pidfile \
-		${stopsig:+--signal} $stopsig
-
-	eend $? "Failed to stop $RC_SVCNAME"
-}
-
-ssd_status()
-{
-	_status
-}
--- a/sh/tmpfiles.sh.in
+++ b/sh/tmpfiles.sh.in
@@ -53,18 +53,10 @@ relabel() {
 	done
 }

-splitpath() {
-    local path=$1
-    while [ -n "$path" ]; do
-        echo $path
-        path=${path%/*}
-    done
-}
-
 _restorecon() {
    local path=$1
    if [ -x /sbin/restorecon ]; then
-        dryrun_or_real restorecon -F $(splitpath "$path")
+        dryrun_or_real restorecon -F "$path"
    fi
 }

@@ -130,7 +122,6 @@ _d() {

 	if [ ! -d "$path" ]; then
 		dryrun_or_real mkdir -p "$path" 2>/dev/null
-		_restorecon "$path"
 		dryrun_or_real $CHECKPATH -dq -m "$mode" -o "$uid:$gid" "$path"
 	fi
 }
@@ -146,18 +137,10 @@ _D() {

 	if [ $CREATE -gt 0 ]; then
 		dryrun_or_real mkdir -p "$path" 2>/dev/null
-		_restorecon "$path"
 		dryrun_or_real $CHECKPATH -Dq -m "$mode" -o "$uid:$gid" "$path"
 	fi
 }

-_v() {
-	# Create a subvolume if the path does not exist yet and the file system
-	# supports this (btrfs). Otherwise create a normal directory.
-	# TODO: Implement btrfs subvol creation.
-	_d "$@"
-}
-
 _L() {
 	# Create a symlink if it doesn't exist yet
 	local path=$1 mode=$2 uid=$3 gid=$4 age=$5 arg=$6
@@ -262,7 +245,7 @@ PREFIX=
 FILE=
 fragments=
 # XXX: The harcoding of /usr/lib/ is an explicit choice by upstream
-tmpfiles_dirs='/usr/lib/tmpfiles.d/ /run/tmpfiles.d/ /etc/tmpfiles.d/'
+tmpfiles_dirs='/usr/lib/tmpfiles.d/ /etc/tmpfiles.d/ /run/tmpfiles.d/'
 tmpfiles_basenames=''
 tmpfiles_d=''
 # Build a list of sorted unique basenames
@@ -353,7 +336,7 @@ for FILE in $tmpfiles_d ; do

 		# whine about invalid entries
 		case $cmd in
-			f|F|w|d|D|v|p|L|c|C|b|x|X|r|R|z|Z) ;;
+			f|F|w|d|D|p|L|c|C|b|x|X|r|R|z|Z) ;;
 			*) warninvalid ; continue ;;
 		esac

@@ -361,7 +344,7 @@ for FILE in $tmpfiles_d ; do
 		if [ "$mode" = '-' -o "$mode" = '' ]; then
 			case "$cmd" in
 				p|f|F) mode=0644 ;;
-				d|D|v) mode=0755 ;;
+				d|D) mode=0755 ;;
 				C|z|Z|x|r|R|L) ;;
 			esac
 		fi
--- a/src/libeinfo/Makefile
+++ b/src/libeinfo/Makefile
@@ -4,7 +4,7 @@ SRCS=			libeinfo.c
 INCS=			einfo.h
 VERSION_MAP=		einfo.map

-LOCAL_CPPFLAGS+=		-I../includes
+CPPFLAGS+=		-I../includes

 MK=			../../mk
 include ${MK}/lib.mk
--- a/src/librc/Makefile
+++ b/src/librc/Makefile
@@ -7,7 +7,7 @@ VERSION_MAP=	rc.map

 LDADD+=		${LIBKVM}

-LOCAL_CPPFLAGS+=	-I../includes
+CPPFLAGS+=	-I../includes

 MK=		../../mk
 include ${MK}/lib.mk
--- a/src/librc/librc-daemon.c
+++ b/src/librc/librc-daemon.c
@@ -31,8 +31,7 @@
 #include "queue.h"
 #include "librc.h"

-#if defined(__linux__) || (defined (__FreeBSD_kernel__) && defined(__GLIBC__)) \
-	|| defined(__GNU__)
+#if defined(__linux__) || (defined (__FreeBSD_kernel__) && defined(__GLIBC__))
 static bool
 pid_is_exec(pid_t pid, const char *exec)
 {
@@ -100,7 +99,7 @@ rc_find_pids(const char *exec, const char *const *argv, uid_t uid, pid_t pid)
 	pid_t p;
 	char buffer[PATH_MAX];
 	struct stat sb;
-	pid_t openrc_pid = 0;
+	pid_t runscript_pid = 0;
 	char *pp;
 	RC_PIDLIST *pids = NULL;
 	RC_PID *pi;
@@ -109,7 +108,7 @@ rc_find_pids(const char *exec, const char *const *argv, uid_t uid, pid_t pid)
 		return NULL;

 	/*
-	  We never match RC_OPENRC_PID if present so we avoid the below
+	  We never match RC_RUNSCRIPT_PID if present so we avoid the below
 	  scenario

 	  /etc/init.d/ntpd stop does
@@ -119,9 +118,9 @@ rc_find_pids(const char *exec, const char *const *argv, uid_t uid, pid_t pid)
 	  nasty
 	*/

-	if ((pp = getenv("RC_OPENRC_PID"))) {
-		if (sscanf(pp, "%d", &openrc_pid) != 1)
-			openrc_pid = 0;
+	if ((pp = getenv("RC_RUNSCRIPT_PID"))) {
+		if (sscanf(pp, "%d", &runscript_pid) != 1)
+			runscript_pid = 0;
 	}

 	/*
@@ -147,7 +146,7 @@ rc_find_pids(const char *exec, const char *const *argv, uid_t uid, pid_t pid)
 	while ((entry = readdir(procdir)) != NULL) {
 		if (sscanf(entry->d_name, "%d", &p) != 1)
 			continue;
-		if (openrc_pid != 0 && openrc_pid == p)
+		if (runscript_pid != 0 && runscript_pid == p)
 			continue;
 		if (pid != 0 && pid != p)
 			continue;
@@ -511,8 +510,6 @@ rc_service_daemons_crashed(const char *service)
 	RC_STRINGLIST *list = NULL;
 	RC_STRING *s;
 	size_t i;
-	char *ch_root;
-	char *spidfile;

 	path += snprintf(dirpath, sizeof(dirpath), RC_SVCDIR "/daemons/%s",
 	    basename_c(service));
@@ -557,8 +554,8 @@ rc_service_daemons_crashed(const char *service)
 		}
 		fclose(fp);

-		ch_root = rc_service_value_get(basename_c(service), "chroot");
-		spidfile = pidfile;
+		char *ch_root = rc_service_value_get(basename_c(service), "chroot");
+		char *spidfile = pidfile;
 		if (ch_root && pidfile) {
 			spidfile = xmalloc(strlen(ch_root) + strlen(pidfile) + 1);
 			strcpy(spidfile, ch_root);
--- a/src/librc/librc-depend.c
+++ b/src/librc/librc-depend.c
@@ -192,9 +192,7 @@ valid_service(const char *runlevel, const char *service, const char *type)

 	if (!runlevel ||
 	    strcmp(type, "ineed") == 0 ||
-	    strcmp(type, "needsme") == 0  ||
-	    strcmp(type, "iwant") == 0 ||
-	    strcmp(type, "wantsme") == 0)
+	    strcmp(type, "needsme") == 0)
 		return true;

 	if (rc_service_in_runlevel(service, runlevel))
@@ -545,7 +543,6 @@ rc_deptree_order(const RC_DEPTREE *deptree, const char *runlevel, int options)
 	types = rc_stringlist_new();
 	rc_stringlist_add(types, "ineed");
 	rc_stringlist_add(types, "iuse");
-	rc_stringlist_add(types, "iwant");
 	rc_stringlist_add(types, "iafter");
 	services = rc_deptree_depends(deptree, types, list, runlevel,
 				      RC_DEP_STRICT | RC_DEP_TRACE | options);
@@ -651,7 +648,6 @@ typedef struct deppair
 static const DEPPAIR deppairs[] = {
 	{ "ineed",	"needsme" },
 	{ "iuse",	"usesme" },
-	{ "iwant",	"wantsme" },
 	{ "iafter",	"ibefore" },
 	{ "ibefore",	"iafter" },
 	{ "iprovide",	"providedby" },
@@ -848,7 +844,6 @@ rc_deptree_update(void)
 			/* If we're after something, remove us from the before list */
 			if (strcmp(type, "iafter") == 0 ||
 			    strcmp(type, "ineed") == 0 ||
-			    strcmp(type, "iwant") == 0 ||
 			    strcmp(type, "iuse") == 0) {
 				if ((dt = get_deptype(depinfo, "ibefore")))
 					rc_stringlist_delete(dt->services, depend);
@@ -962,7 +957,6 @@ rc_deptree_update(void)
 	/* Phase 5 - Remove broken before directives */
 	types = rc_stringlist_new();
 	rc_stringlist_add(types, "ineed");
-	rc_stringlist_add(types, "iwant");
 	rc_stringlist_add(types, "iuse");
 	rc_stringlist_add(types, "iafter");
 	TAILQ_FOREACH(depinfo, deptree, entries) {
--- a/src/librc/librc-misc.c
+++ b/src/librc/librc-misc.c
@@ -28,8 +28,6 @@
 * SUCH DAMAGE.
 */

-#include <fnmatch.h>
-
 #include "queue.h"
 #include "librc.h"

@@ -216,78 +214,12 @@ rc_config_list(const char *file)
 }
 librc_hidden_def(rc_config_list)

-static void rc_config_set_value(RC_STRINGLIST *config, char *value)
-{
-	RC_STRING *cline;
-	char *entry;
-	size_t i = 0;
-	char *newline;
-	char *p = value;
-	bool replaced;
-	char *token;
-
-	if (! p)
-		return;
-	if (strncmp(p, "export ", 7) == 0)
-		p += 7;
-	if (! (token = strsep(&p, "=")))
-		return;
-
-	entry = xstrdup(token);
-	/* Preserve shell coloring */
-	if (*p == '$')
-		token = value;
-	else
-		do {
-			/* Bash variables are usually quoted */
-			token = strsep(&p, "\"\'");
-		} while (token && *token == '\0');
-
-	/* Drop a newline if that's all we have */
-	if (token) {
-		i = strlen(token) - 1;
-		if (token[i] == '\n')
-			token[i] = 0;
-
-		i = strlen(entry) + strlen(token) + 2;
-		newline = xmalloc(sizeof(char) * i);
-		snprintf(newline, i, "%s=%s", entry, token);
-	} else {
-		i = strlen(entry) + 2;
-		newline = xmalloc(sizeof(char) * i);
-		snprintf(newline, i, "%s=", entry);
-	}
-
-	replaced = false;
-	/* In shells the last item takes precedence, so we need to remove
-	   any prior values we may already have */
-	TAILQ_FOREACH(cline, config, entries) {
-		i = strlen(entry);
-		if (strncmp(entry, cline->value, i) == 0 && cline->value[i] == '=') {
-			/* We have a match now - to save time we directly replace it */
-			free(cline->value);
-			cline->value = newline;
-			replaced = true;
-			break;
-		}
-	}
-
-	if (!replaced) {
-		rc_stringlist_add(config, newline);
-		free(newline);
-	}
-	free(entry);
-}
-
 /*
- * Override some specific rc.conf options on the kernel command line.
- * I only know how to do this in Linux, so if someone wants to supply
- * a patch for this on *BSD or tell me how to write the code to do this,
- * any suggestions are welcome.
+ * Override some specific rc.conf options on the kernel command line
 */
-static RC_STRINGLIST *rc_config_kcl(RC_STRINGLIST *config)
-{
 #ifdef __linux__
+static RC_STRINGLIST *rc_config_override(RC_STRINGLIST *config)
+{
 	RC_STRINGLIST *overrides;
 	RC_STRING *cline, *override, *config_np;
 	char *tmp = NULL;
@@ -336,60 +268,90 @@ static RC_STRINGLIST *rc_config_kcl(RC_STRINGLIST *config)
 	}

 	rc_stringlist_free(overrides);
+	return config;
+}
 #endif
-	return config;
-}
-
-static RC_STRINGLIST * rc_config_directory(RC_STRINGLIST *config)
-{
-	DIR *dp;
-	struct dirent *d;
-	RC_STRINGLIST *rc_conf_d_files = rc_stringlist_new();
-	RC_STRING *fname;
-	RC_STRINGLIST *rc_conf_d_list;
-	char path[PATH_MAX];
-	RC_STRING *line;
-
-	if ((dp = opendir(RC_CONF_D)) != NULL) {
-		while ((d = readdir(dp)) != NULL) {
-			if (fnmatch("*.conf", d->d_name, FNM_PATHNAME) == 0) {
-				rc_stringlist_addu(rc_conf_d_files, d->d_name);
-			}
-		}
-		closedir(dp);
-
-		if (rc_conf_d_files) {
-			rc_stringlist_sort(&rc_conf_d_files);
-			TAILQ_FOREACH(fname, rc_conf_d_files, entries) {
-				if (! fname->value)
-					continue;
-				sprintf(path, "%s/%s", RC_CONF_D, fname->value);
-				rc_conf_d_list = rc_config_list(path);
-				TAILQ_FOREACH(line, rc_conf_d_list, entries)
-					if (line->value)
-						rc_config_set_value(config, line->value);
-				rc_stringlist_free(rc_conf_d_list);
-			}
-			rc_stringlist_free(rc_conf_d_files);
-		}
-	}
-	return config;
-}

 RC_STRINGLIST *
 rc_config_load(const char *file)
 {
 	RC_STRINGLIST *list;
 	RC_STRINGLIST *config;
+	char *token;
 	RC_STRING *line;
+	RC_STRING *cline;
+	size_t i = 0;
+	bool replaced;
+	char *entry;
+	char *newline;
+	char *p;

 	list = rc_config_list(file);
 	config = rc_stringlist_new();
 	TAILQ_FOREACH(line, list, entries) {
-		rc_config_set_value(config, line->value);
+		/* Get entry */
+		p = line->value;
+		if (! p)
+			continue;
+		if (strncmp(p, "export ", 7) == 0)
+			p += 7;
+		if (! (token = strsep(&p, "=")))
+			continue;
+
+		entry = xstrdup(token);
+		/* Preserve shell coloring */
+		if (*p == '$')
+			token = line->value;
+		else
+			do {
+				/* Bash variables are usually quoted */
+				token = strsep(&p, "\"\'");
+			} while (token && *token == '\0');
+
+		/* Drop a newline if that's all we have */
+		if (token) {
+			i = strlen(token) - 1;
+			if (token[i] == '\n')
+				token[i] = 0;
+
+			i = strlen(entry) + strlen(token) + 2;
+			newline = xmalloc(sizeof(char) * i);
+			snprintf(newline, i, "%s=%s", entry, token);
+		} else {
+			i = strlen(entry) + 2;
+			newline = xmalloc(sizeof(char) * i);
+			snprintf(newline, i, "%s=", entry);
+		}
+
+		replaced = false;
+		/* In shells the last item takes precedence, so we need to remove
+		   any prior values we may already have */
+		TAILQ_FOREACH(cline, config, entries) {
+			i = strlen(entry);
+			if (strncmp(entry, cline->value, i) == 0 && cline->value[i] == '=') {
+				/* We have a match now - to save time we directly replace it */
+				free(cline->value);
+				cline->value = newline;
+				replaced = true;
+				break;
+			}
+		}
+
+		if (!replaced) {
+			rc_stringlist_add(config, newline);
+			free(newline);
+		}
+		free(entry);
 	}
 	rc_stringlist_free(list);

+#ifdef __linux__
+	/* Only override rc.conf settings */
+	if (strcmp(file, RC_CONF) == 0) {
+		config = rc_config_override(config);
+	}
+#endif
+
 	return config;
 }
 librc_hidden_def(rc_config_load)
@@ -439,9 +401,6 @@ rc_conf_value(const char *setting)
 #endif
 		}

-		rc_conf = rc_config_directory(rc_conf);
-	rc_conf = rc_config_kcl(rc_conf);
-
 		/* Convert old uppercase to lowercase */
 		TAILQ_FOREACH(s, rc_conf, entries) {
 			p = s->value;
--- a/src/librc/librc.c
+++ b/src/librc/librc.c
@@ -101,9 +101,7 @@ ls_dir(const char *dir, int options)
 					continue;
 			}
 			if (options & LS_DIR) {
-				snprintf(file, sizeof(file), "%s/%s",
-				    dir, d->d_name);
-				if (stat(file, &buf) != 0 ||
+				if (stat(d->d_name, &buf) == 0 &&
 				    !S_ISDIR(buf.st_mode))
 					continue;
 			}
@@ -210,14 +208,14 @@ found:
 }
 #endif

-
+/* New sys identification code
+ * Not to be used for any binaries outside of openrc. */
 const char *
-rc_sys(void)
+rc_sys_v2(void)
 {
-#ifdef PREFIX
-	return RC_SYS_PREFIX;
-#endif
-
+#define __STRING_SWITCH(x) { char *__string_switch = x; if (false) {}
+#define __STRING_CASE(y) else if (strcmp(__string_switch,y) == 0)
+#define __STRING_SWITCH_END() }
 	char *systype = rc_conf_value("rc_sys");
 	if (systype) {
 		char *s = systype;
@@ -227,11 +225,43 @@ rc_sys(void)
 				*s = toupper((unsigned char) *s);
 			s++;
 		}
+		/* Now do detection */
+		__STRING_SWITCH(systype)
+		__STRING_CASE(RC_SYS_PREFIX)	{ return RC_SYS_PREFIX; }
+#ifdef __FreeBSD__
+		__STRING_CASE(RC_SYS_JAIL) { return RC_SYS_JAIL; }
+#endif /* __FreeBSD__ */
+#ifdef __NetBSD__
+		__STRING_CASE(RC_SYS_XEN0) { return RC_SYS_XEN0; }
+		__STRING_CASE(RC_SYS_XENU) { return RC_SYS_XENU; }
+#endif /* __NetBSD__ */
+#ifdef __linux__
+		__STRING_CASE(RC_SYS_XEN0) { return RC_SYS_XEN0; }
+		__STRING_CASE(RC_SYS_XENU) { return RC_SYS_XENU; }
+		__STRING_CASE(RC_SYS_UML) { return RC_SYS_UML; }
+		__STRING_CASE(RC_SYS_VSERVER) { return RC_SYS_VSERVER; }
+		__STRING_CASE(RC_SYS_OPENVZ) { return RC_SYS_OPENVZ; }
+		__STRING_CASE(RC_SYS_LXC) { return RC_SYS_LXC; }
+#endif /* __linux__ */
+		__STRING_SWITCH_END()
 	}
+#undef __STRING_SWITCH
+#undef __STRING_CASE
+#undef __STRING_SWITCH_END
+	return NULL;
+}
+librc_hidden_def(rc_sys_v2)
+
+/* Old sys identification code.
+ * Not to be used for any binaries outside of openrc. */
+const char *
+rc_sys_v1(void)
+{
+#ifdef PREFIX
+	return RC_SYS_PREFIX;
+#else

 #ifdef __FreeBSD__
-	if (systype && strcmp(systype, RC_SYS_JAIL) == 0)
-		return RC_SYS_JAIL;
 	int jailed = 0;
 	size_t len = sizeof(jailed);

@@ -241,12 +271,6 @@ rc_sys(void)
 #endif

 #ifdef __NetBSD__
-	if (systype) {
-		if(strcmp(systype, RC_SYS_XEN0) == 0)
-				return RC_SYS_XEN0;
-		if (strcmp(systype, RC_SYS_XENU) == 0)
-			return RC_SYS_XENU;
-	}
 	if (exists("/kern/xen/privcmd"))
 		return RC_SYS_XEN0;
 	if (exists("/kern/xen"))
@@ -254,26 +278,6 @@ rc_sys(void)
 #endif

 #ifdef __linux__
-	if (systype) {
-		if (strcmp(systype, RC_SYS_XEN0) == 0)
-			return RC_SYS_XEN0;
-		if (strcmp(systype, RC_SYS_XENU) == 0)
-			return RC_SYS_XENU;
-		if (strcmp(systype, RC_SYS_UML) == 0)
-			return RC_SYS_UML;
-		if (strcmp(systype, RC_SYS_VSERVER) == 0)
-			return RC_SYS_VSERVER;
-		if (strcmp(systype, RC_SYS_OPENVZ) == 0)
-			return RC_SYS_OPENVZ;
-		if (strcmp(systype, RC_SYS_LXC) == 0)
-			return RC_SYS_LXC;
-		if (strcmp(systype, RC_SYS_RKT) == 0)
-				return RC_SYS_RKT;
-		if (strcmp(systype, RC_SYS_SYSTEMD_NSPAWN) == 0)
-				return RC_SYS_SYSTEMD_NSPAWN;
-		if (strcmp(systype, RC_SYS_DOCKER) == 0)
-				return RC_SYS_DOCKER;
-	}
 	if (exists("/proc/xen")) {
 		if (file_regex("/proc/xen/capabilities", "control_d"))
 			return RC_SYS_XEN0;
@@ -290,15 +294,21 @@ rc_sys(void)
 		return RC_SYS_OPENVZ; /* old test */
 	else if (file_regex("/proc/1/environ", "container=lxc"))
 		return RC_SYS_LXC;
-	else if (file_regex("/proc/1/environ", "container=rkt"))
-		return RC_SYS_RKT;
-	else if (file_regex("/proc/1/environ", "container=systemd-nspawn"))
-		return RC_SYS_SYSTEMD_NSPAWN;
-	else if (file_regex("/proc/1/environ", "container=docker"))
-		return RC_SYS_DOCKER;
 #endif

 	return NULL;
+#endif /* PREFIX */
+}
+librc_hidden_def(rc_sys_v1)
+
+const char *
+rc_sys(void)
+{
+	if (rc_conf_value("rc_sys")) {
+		return rc_sys_v2();
+	} else {
+		return rc_sys_v1();
+	}
 }
 librc_hidden_def(rc_sys)

--- a/src/librc/librc.h
+++ b/src/librc/librc.h
@@ -130,6 +130,8 @@ librc_hidden_proto(rc_stringlist_new)
 librc_hidden_proto(rc_stringlist_split)
 librc_hidden_proto(rc_stringlist_sort)
 librc_hidden_proto(rc_sys)
+librc_hidden_proto(rc_sys_v1)
+librc_hidden_proto(rc_sys_v2)
 librc_hidden_proto(rc_yesno)

 #endif
--- a/src/librc/rc.h.in
+++ b/src/librc/rc.h.in
@@ -56,7 +56,6 @@ extern "C" {
 #define RC_SYS_WHITELIST   RC_LIBEXECDIR "/conf.d/env_whitelist"
 #define RC_USR_WHITELIST   RC_SYSCONFDIR "/conf.d/env_whitelist"
 #define RC_CONF         RC_SYSCONFDIR "/rc.conf"
-#define RC_CONF_D         RC_SYSCONFDIR "/rc.conf.d"
 #define RC_CONF_OLD     RC_SYSCONFDIR "/conf.d/rc"

 #define RC_PATH_PREFIX     RC_LIBEXECDIR "/bin:/bin:/sbin:/usr/bin:/usr/sbin"
@@ -329,13 +328,10 @@ bool rc_service_daemons_crashed(const char *);
 /*! @name System types
 * OpenRC can support some special sub system types, normally virtualization.
 * Some services cannot work in these systems, or we do something else. */
-#define RC_SYS_DOCKER  "DOCKER"
 #define RC_SYS_JAIL    "JAIL"
 #define RC_SYS_OPENVZ  "OPENVZ"
 #define RC_SYS_LXC     "LXC"
 #define RC_SYS_PREFIX  "PREFIX"
-#define RC_SYS_RKT  "RKT"
-#define RC_SYS_SYSTEMD_NSPAWN "SYSTEMD-NSPAWN"
 #define RC_SYS_UML     "UML"
 #define RC_SYS_VSERVER "VSERVER"
 #define RC_SYS_XEN0    "XEN0"
@@ -345,6 +341,14 @@ bool rc_service_daemons_crashed(const char *);
 * @return string from RC_SYS_* types or NULL if none detected */
 const char *rc_sys(void);

+/*! Returns the type of subsystem using old automatic code
+ * @return string from RC_SYS_* types or NULL if none detected */
+const char *rc_sys_v1(void);
+
+/*! Returns the type of subsystem using new rc.conf rc_sys value
+ * @return string from RC_SYS_* types or NULL if none detected */
+const char *rc_sys_v2(void);
+
 /*! @name Dependency options
 * These options can change the services found by the rc_get_depinfo and
 * rc_get_depends functions. */
--- a/src/rc/Makefile
+++ b/src/rc/Makefile
@@ -1,8 +1,8 @@
 PROG=		openrc
-SRCS=		checkpath.c fstabinfo.c mountinfo.c openrc-run.c \
+SRCS=		checkpath.c fstabinfo.c mountinfo.c start-stop-daemon.c \
 		rc-applets.c rc-depend.c rc-logger.c \
 		rc-misc.c rc-plugin.c rc-service.c rc-status.c rc-update.c \
-		rc.c start-stop-daemon.c swclock.c
+		runscript.c rc.c swclock.c

 ifeq (${MKSELINUX},yes)
 SRCS+=		rc-selinux.c
@@ -35,14 +35,14 @@ RC_SBINLINKS=	mark_service_starting mark_service_started \
 ALL_LINKS=	${BINLINKS} ${SBINLINKS} ${RC_BINLINKS} ${RC_SBINLINKS}
 CLEANFILES+=	${ALL_LINKS}

-LOCAL_CPPFLAGS=-I../includes -I../librc -I../libeinfo
-LOCAL_LDFLAGS=-L../librc -L../libeinfo
+CPPFLAGS+=	-I../includes -I../librc -I../libeinfo
+LDFLAGS+=	-L../librc -L../libeinfo
 LDADD+=		-lutil -lrc -leinfo

 include ../../Makefile.inc
 MK=		../../mk
 include ${MK}/prog.mk
-include ${MK}/gitver.mk
+include ${MK}/git.mk
 include ${MK}/cc.mk

 include ${MK}/termcap.mk
--- a/src/rc/checkpath.c
+++ b/src/rc/checkpath.c
@@ -45,7 +45,10 @@
 #include "builtins.h"
 #include "einfo.h"
 #include "rc-misc.h"
+
+#ifdef HAVE_SELINUX
 #include "rc-selinux.h"
+#endif

 typedef enum {
 	inode_unknown = 0,
@@ -161,8 +164,10 @@ static int do_check(char *path, uid_t uid, gid_t gid, mode_t mode,
 		}
 	}

+#ifdef HAVE_SELINUX
 	if (selinux_on)
 		selinux_util_label(path);
+#endif

 	return 0;
 }
@@ -291,8 +296,10 @@ int checkpath(int argc, char **argv)
 	if (gr)
 		gid = gr->gr_gid;

+#ifdef HAVE_SELINUX
 	if (selinux_util_open() == 1)
 		selinux_on = true;
+#endif

 	while (optind < argc) {
 		if (writable)
@@ -302,8 +309,10 @@ int checkpath(int argc, char **argv)
 		optind++;
 	}

+#ifdef HAVE_SELINUX
 	if (selinux_on)
 		selinux_util_close();
+#endif

 	return retval;
 }
--- a/src/rc/mountinfo.c
+++ b/src/rc/mountinfo.c
@@ -39,8 +39,8 @@
 #  include <sys/statvfs.h>
 #  define statfs statvfs
 #  define F_FLAGS f_flag
-#elif defined(__linux__) || (defined(__FreeBSD_kernel__) && \
-	defined(__GLIBC__)) || defined(__GNU__)
+#elif defined (__linux__) || (defined(__FreeBSD_kernel__) && \
+		defined(__GLIBC__)) || defined(__GNU__)
 #  include <mntent.h>
 #endif

@@ -267,8 +267,8 @@ find_mounts(struct args *args)
 	return list;
 }

-#elif defined(__linux__) || (defined(__FreeBSD_kernel__) && \
-	defined(__GLIBC__)) || defined(__GNU__)
+#elif defined (__linux__) || (defined (__FreeBSD_kernel__) && \
+		defined(__GLIBC__))
 static struct mntent *
 getmntfile(const char *file)
 {
@@ -298,7 +298,7 @@ find_mounts(struct args *args)
 	int netdev;
 	RC_STRINGLIST *list;

-	if ((fp = fopen("/proc/self/mounts", "r")) == NULL)
+	if ((fp = fopen("/proc/mounts", "r")) == NULL)
 		eerrorx("getmntinfo: %s", strerror(errno));

 	list = rc_stringlist_new();
@@ -315,8 +315,6 @@ find_mounts(struct args *args)
 		if ((ent = getmntfile(to))) {
 			if (strstr(ent->mnt_opts, "_netdev"))
 				netdev = 0;
-			else
-				netdev = 1;
 		}

 		process_mount(list, args, from, to, fst, opts, netdev);
@@ -349,7 +347,7 @@ get_regex(const char *string)

 #include "_usage.h"
 #define extraopts "[mount1] [mount2] ..."
-#define getoptstring "f:F:n:N:o:O:p:P:iste:E:" getoptstring_COMMON
+#define getoptstring "f:F:n:N:o:O:p:P:ist" getoptstring_COMMON
 static const struct option longopts[] = {
 	{ "fstype-regex",        1, NULL, 'f'},
 	{ "skip-fstype-regex",   1, NULL, 'F'},
--- a/src/rc/rc-applets.c
+++ b/src/rc/rc-applets.c
@@ -329,7 +329,7 @@ do_mark_service(int argc, char **argv)
 	bool ok = false;
 	char *svcname = getenv("RC_SVCNAME");
 	char *service = NULL;
-	char *openrc_pid;
+	char *runscript_pid;
 	/* char *mtime; */
 	pid_t pid;
 	RC_SERVICE bit;
@@ -350,7 +350,7 @@ do_mark_service(int argc, char **argv)
 		eerrorx("%s: unknown applet", applet);

 	/* If we're marking ourselves then we need to inform our parent
-	   openrc-run process so they do not mark us based on our exit code */
+	   runscript process so they do not mark us based on our exit code */
 	/*
 	 * FIXME: svcname and service are almost always equal except called from a
 	 * shell with just argv[1] - So that doesn't seem to do what Roy initially
@@ -359,8 +359,8 @@ do_mark_service(int argc, char **argv)
 	 * openrc@gentoo.org).
 	 */
 	if (ok && svcname && strcmp(svcname, service) == 0) {
-		openrc_pid = getenv("RC_OPENRC_PID");
-		if (openrc_pid && sscanf(openrc_pid, "%d", &pid) == 1)
+		runscript_pid = getenv("RC_RUNSCRIPT_PID");
+		if (runscript_pid && sscanf(runscript_pid, "%d", &pid) == 1)
 			if (kill(pid, SIGHUP) != 0)
 				eerror("%s: failed to signal parent %d: %s",
 				    applet, pid, strerror(errno));
@@ -369,10 +369,10 @@ do_mark_service(int argc, char **argv)
 		   in control as well */
 		/*
 		l = strlen(RC_SVCDIR "/exclusive") + strlen(svcname) +
-		    strlen(openrc_pid) + 4;
+		    strlen(runscript_pid) + 4;
 		mtime = xmalloc(l);
 		snprintf(mtime, l, RC_SVCDIR "/exclusive/%s.%s",
-		    svcname, openrc_pid);
+		    svcname, runscript_pid);
 		if (exists(mtime) && unlink(mtime) != 0)
 			eerror("%s: unlink: %s", applet, strerror(errno));
 		free(mtime);
--- a/src/rc/rc-logger.c
+++ b/src/rc/rc-logger.c
@@ -44,8 +44,7 @@
 #include <time.h>
 #include <unistd.h>

-#if defined(__linux__) || (defined(__FreeBSD_kernel__) && defined(__GLIBC__)) \
-	|| defined(__GNU__)
+#if defined(__linux__) || (defined(__FreeBSD_kernel__) && defined(__GLIBC__))
 #  include <pty.h>
 #elif defined(__NetBSD__) || defined(__OpenBSD__)
 #  include <util.h>
--- a/src/rc/rc-misc.c
+++ b/src/rc/rc-misc.c
@@ -66,7 +66,6 @@ static const char *const env_whitelist[] = {
 	"LC_MONETARY", "LC_MESSAGES", "LC_PAPER", "LC_NAME", "LC_ADDRESS",
 	"LC_TELEPHONE", "LC_MEASUREMENT", "LC_IDENTIFICATION", "LC_ALL",
 	"IN_HOTPLUG", "IN_BACKGROUND", "RC_INTERFACE_KEEP_CONFIG",
-	"EERROR_QUIET", "EINFO_QUIET",
 	NULL
 };

--- a/src/rc/rc-selinux.c
+++ b/src/rc/rc-selinux.c
@@ -1,7 +1,7 @@
 /*
- * rc-selinux.c
- * SELinux helpers to get and set contexts.
- */
+  rc-selinux.c
+  SELinux helpers to get and set contexts.
+*/

 /*
 * Copyright (c) 2014 Jason Zaman <jason@perfinion.com>
@@ -31,18 +31,11 @@
 #include <stddef.h>
 #include <errno.h>
 #include <dlfcn.h>
-#include <ctype.h>
-#include <limits.h>
-#include <pwd.h>
-#include <unistd.h>
+
+#include <sys/stat.h>

 #include <selinux/selinux.h>
 #include <selinux/label.h>
-#include <selinux/get_default_type.h>
-#include <selinux/context.h>
-
-#include <sys/stat.h>
-#include <sys/types.h>

 #include "einfo.h"
 #include "queue.h"
@@ -51,28 +44,11 @@
 #include "rc-plugin.h"
 #include "rc-selinux.h"

-/* the context files for selinux */
-#define RUN_INIT_FILE "run_init_type"
-#define INITRC_FILE "initrc_context"
+#define SELINUX_LIB     RC_LIBDIR "/runscript_selinux.so"

-#ifdef HAVE_AUDIT
-#include <libaudit.h>
-#endif
+static void (*selinux_run_init_old) (void);
+static void (*selinux_run_init_new) (int argc, char **argv);

-/* PAM or shadow for authentication */
-#ifdef HAVE_PAM
-#    define PAM_SERVICE_NAME "run_init" /* the name of this program for PAM */
-#    include <security/pam_appl.h>
-#    include <security/pam_misc.h>
-#else
-#    define PASSWORD_PROMPT "Password:"
-#    include <crypt.h>
-#    include <shadow.h>
-#    include <string.h>
-#endif
-
-
-/* The handle for the fcontext lookups */
 static struct selabel_handle *hnd = NULL;

 int selinux_util_label(const char *path)
@@ -157,243 +133,33 @@ int selinux_util_close(void)
 	return 0;
 }

-/*
- * This will check the users password and return 0 on success or -1 on fail
- *
- * We ask for the password to make sure it is intended vs run by malicious software.
- * Actual authorization is covered by the policy itself.
- */
-static int check_password(char *username)
+void selinux_setup(int argc, char **argv)
 {
-	int ret = 1;
-#ifdef HAVE_PAM
-	pam_handle_t *pamh;
-	int pam_err = 0;
-	const struct pam_conv pconv = {
-		misc_conv,
-		NULL
-	};
+	void *lib_handle = NULL;

-	pam_err = pam_start(PAM_SERVICE_NAME, username, &pconv, &pamh);
-	if (pam_err != PAM_SUCCESS) {
-		ret = -1;
-		goto outpam;
-	}
+	if (!exists(SELINUX_LIB))
+		return;

-	pam_err = pam_authenticate(pamh, PAM_DISALLOW_NULL_AUTHTOK);
-	if (pam_err != PAM_SUCCESS) {
-		ret = -1;
-		goto outpam;
-	}
-
-	ret = 0;
-outpam:
-	pam_end(pamh, pam_err);
-	pamh = NULL;
-
-#else /* authenticating via /etc/shadow instead */
-	struct spwd *spw;
-	char *password;
-	char *attempt;
-
-	spw = getspnam(username);
-	if (!spw) {
-		eerror("Failed to read shadow entry");
-		ret = -1;
-		goto outshadow;
-	}
-
-	attempt = getpass(PASSWORD_PROMPT);
-	if (!attempt) {
-		ret = -1;
-		goto outshadow;
-	}
-
-	if (*spw->sp_pwdp == '\0' && *attempt == '\0') {
-		ret = -1;
-		goto outshadow;
-	}
-
-	/* salt must be at least two characters long */
-	if (!(spw->sp_pwdp[0] && spw->sp_pwdp[1])) {
-		ret = -1;
-		goto outshadow;
-	}
-
-	/* encrypt the password attempt */
-	password = crypt(attempt, spw->sp_pwdp);
-
-	if (password && strcmp(password, spw->sp_pwdp) == 0)
-		ret = 0;
-	else
-		ret = -1;
-outshadow:
-#endif
-	return ret;
-}
-
-/* Authenticates the user, returns 0 on success, 1 on fail */
-static int check_auth()
-{
-	struct passwd *pw;
-	uid_t uid;
-
-#ifdef HAVE_AUDIT
-	uid = audit_getloginuid();
-	if (uid == (uid_t) -1)
-		uid = getuid();
-#else
-	uid = getuid();
-#endif
-
-	pw = getpwuid(uid);
-	if (!pw) {
-		eerror("cannot find your entry in the passwd file.");
-		return (-1);
-	}
-
-	printf("Authenticating %s.\n", pw->pw_name);
-
-	/* do the actual check */
-	if (check_password(pw->pw_name) == 0) {
-		return 0;
-	}
-
-	eerrorx("Authentication failed for %s", pw->pw_name);
-	return 1;
-}
-
-/*
- * Read the context from the given context file. context must be free'd by the user.
- */
-static int read_context_file(const char *filename, char **context)
-{
-	int ret = -1;
-	FILE *fp;
-	char filepath[PATH_MAX];
-	char *line = NULL;
-	char *p;
-	char *p2;
-	size_t len = 0;
-	ssize_t read;
-
-	memset(filepath, '\0', PATH_MAX);
-	snprintf(filepath, PATH_MAX - 1, "%s/%s", selinux_contexts_path(), filename);
-
-	fp = fopen(filepath, "r");
-	if (fp == NULL) {
-		eerror("Failed to open context file: %s", filename);
-		return -1;
-	}
-
-	while ((read = getline(&line, &len, fp)) != -1) {
-		/* cut off spaces before the string */
-		p = line;
-		while (isspace(*p) && *p != '\0')
-			p++;
-
-		/* empty string, skip */
-		if (*p == '\0')
-			continue;
-
-		/* cut off spaces after the string */
-		p2 = p;
-		while (!isspace(*p2) && *p2 != '\0')
-			p2++;
-		*p2 = '\0';
-
-		*context = xstrdup(p);
-		ret = 0;
-		break;
-	}
-
-	free(line);
-	fclose(fp);
-	return ret;
-}
-
-void selinux_setup(char **argv)
-{
-	char *new_context = NULL;
-	char *curr_context = NULL;
-	context_t curr_con;
-	char *curr_t = NULL;
-	char *run_init_t = NULL;
-
-	/* Return, if selinux is disabled. */
-	if (is_selinux_enabled() < 1) {
+	lib_handle = dlopen(SELINUX_LIB, RTLD_NOW | RTLD_GLOBAL);
+	if (!lib_handle) {
+		eerror("dlopen: %s", dlerror());
 		return;
 	}

-	if (read_context_file(RUN_INIT_FILE, &run_init_t) != 0) {
-		/* assume a reasonable default, rather than bailing out */
-		run_init_t = xstrdup("run_init_t");
-		ewarn("Assuming SELinux run_init type is %s", run_init_t);
-	}
+	selinux_run_init_old = (void (*)(void))
+	    dlfunc(lib_handle, "selinux_runscript");
+	selinux_run_init_new = (void (*)(int, char **))
+	    dlfunc(lib_handle, "selinux_runscript2");

-	/* Get our current context. */
-	if (getcon(&curr_context) < 0) {
-		if (errno == ENOENT) {
-			/* should only hit this if proc is not mounted.  this
-			 * happens on Gentoo right after init starts, when
-			 * the init script processing starts.
-			 */
-			goto out;
-		} else {
-			perror("getcon");
-			exit(1);
-		}
-	}
+	/* Use new run_init if it exists, else fall back to old */
+	if (selinux_run_init_new)
+		selinux_run_init_new(argc, argv);
+	else if (selinux_run_init_old)
+		selinux_run_init_old();
+	else
+		/* This shouldnt happen... probably corrupt lib */
+		eerrorx
+		    ("run_init is missing from runscript_selinux.so!");

-	/* extract the type from the context */
-	curr_con = context_new(curr_context);
-	curr_t = xstrdup(context_type_get(curr_con));
-	/* dont need them anymore so free() now */
-	context_free(curr_con);
-	free(curr_context);
-
-	/* if we are not in the run_init domain, we should not do anything */
-	if (strncmp(run_init_t, curr_t, strlen(run_init_t)) != 0) {
-		goto out;
-	}
-
-	free(curr_t);
-	free(run_init_t);
-
-	if (check_auth() != 0) {
-		eerrorx("Authentication failed.");
-	}
-
-	/* Get the context for the script to be run in. */
-	if (read_context_file(INITRC_FILE, &new_context) != 0) {
-		/* assume a reasonable default, rather than bailing out */
-		new_context = xstrdup("system_u:system_r:initrc_t");
-		ewarn("Assuming SELinux initrc context is %s", new_context);
-	}
-
-	/* Set the new context */
-	if (setexeccon(new_context) < 0) {
-		eerrorx("Could not set SELinux exec context to %s.", new_context);
-	}
-
-	free(new_context);
-
-	/*
-	 * exec will recycle ptys so try and use open_init_pty if it exists
-	 * which will open the pty with initrc_devpts_t, if it doesnt exist,
-	 * fall back to plain exec
-	 */
-	if (access("/usr/sbin/open_init_pty", X_OK)) {
-		if (execvp("/usr/sbin/open_init_pty", argv)) {
-			perror("execvp");
-			exit(-1);
-		}
-	} else if (execvp(argv[1], argv + 1)) {
-		perror("execvp");
-		exit(-1);
-	}
-
-out:
-	free(run_init_t);
-	free(curr_t);
+	dlclose(lib_handle);
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
William Hubbs	6cd030e3f1	update changelog	2015-02-19 15:25:27 -06:00
William Hubbs	90ecf23310	checkpath: do not chown or chmod symbolic links This is another security fix. If you use chown() or chmod() on a symbolic link, it affects the referenced file, not the symbolic link itself. X-Gentoo-Bug: 540006 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=540006	2015-02-19 15:23:06 -06:00
William Hubbs	55a3746d80	increment version	2015-02-19 15:22:13 -06:00
William Hubbs	8f7351cf7f	Update ChangeLog	2015-02-18 12:56:50 -06:00
William Hubbs	52220d5df1	ChangeLog: show authors and committers	2015-02-18 12:49:39 -06:00
William Hubbs	d5dfc6d529	local: fix redirections The local service now redirects stdout and stderr for the scripts it runs to /dev/null unless it is run in verbose mode. X-Gentoo-Bug: 537444 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=537444	2015-02-18 10:41:27 -06:00
William Hubbs	7f33410e5d	typo fix	2015-02-18 10:41:27 -06:00
William Hubbs	56993950f2	checkpath: security fix for -m and -o options Do not change permissions on the target if it is a file and has multiple hard links. This is necessary because a hard link can be an attack vector to gain privilege escalation. X-Gentoo-Bug: 540006 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=540006	2015-02-18 10:41:27 -06:00
William Hubbs	e3999c15ad	bump version to 0.13.10	2015-02-18 10:37:38 -06:00
William Hubbs	4a9c450ec2	update change log	2015-02-04 22:03:26 -06:00
William Hubbs	bb4c14999c	Add nfsclient to netmount use dependencies X-Gentoo-Bug: 537996 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=537996	2015-02-04 21:59:50 -06:00
William Hubbs	252422dcf0	start openrc-0.13.9	2015-02-04 21:59:14 -06:00
William Hubbs	a3a64ac94e	update ChangeLog	2015-01-18 09:45:32 -06:00
William Hubbs	1a2f45a4c5	tmpfiles.dev: pass --boot to tmpfiles.sh so kmod works properly	2015-01-18 09:32:49 -06:00
William Hubbs	34b55f31b3	start work on 0.13.8	2015-01-18 09:31:53 -06:00
William Hubbs	e0c746e938	Create ChangeLog	2015-01-15 09:51:12 -06:00
William Hubbs	50329eee7a	Add description for cgroup_cleanup X-Gentoo-Bug: 535184 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=535184	2015-01-13 01:07:02 -06:00
Doug Freed	fb81028121	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	2015-01-13 01:07:02 -06:00
William Hubbs	50e99aa30a	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.	2015-01-13 01:07:02 -06:00
William Hubbs	b177b79242	Add target to create ChangeLog This was added by request because some users are requesting a ChangeLog. This fixes #29.	2015-01-13 01:07:02 -06:00
William Hubbs	7009f66872	start working on 0.13.7	2015-01-13 00:45:19 -06:00
William Hubbs	2eb0ea9afb	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	2014-11-23 21:59:01 -06:00
William Hubbs	534031fc7a	Start work on 0.13.6	2014-11-23 21:57:44 -06:00
William Hubbs	6b85d4288c	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.	2014-11-20 11:07:14 -06:00
William Hubbs	dec899b946	Start work on 0.13.5	2014-11-20 11:06:03 -06:00
William Hubbs	c9f6e2a6c8	netmount: unmount nfs file systems	2014-11-06 14:44:01 -06:00
William Hubbs	e1a4aef3e5	start work on 0.13.4	2014-11-06 14:43:02 -06:00
Alexander Vershilov	cb2c45a3c0	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	2014-11-01 18:32:26 -05:00
William Hubbs	d92eca3988	Start work on 0.13.3	2014-11-01 18:31:20 -05:00
Johan Bergström	5bdd08e0e7	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.	2014-10-26 13:32:46 -05:00
William Hubbs	8a68dc899e	Fix compile errors created by bundling queue.h	2014-10-24 10:59:16 -05:00
Anthony G. Basile	2d1e255285	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.	2014-10-24 10:59:16 -05:00
Anthony G. Basile	6f9fd30edb	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>.	2014-10-24 10:59:16 -05:00
William Hubbs	e0c32c23dc	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/	2014-10-24 10:59:16 -05:00
Gabriele Giacone	4777035d53	Fix rc_svcdir for GNU/Hurd	2014-10-24 10:59:16 -05:00
Svante Signell	f049b535b3	fix defines for GNU/Hurd	2014-10-24 10:59:16 -05:00
Svante Signell	4ba30c5a1b	add missing files for GNU/Hurd	2014-10-24 10:59:15 -05:00
Gabriele Giacone	91734d20be	Fix rc_svcdir for GNU/kFreeBSD	2014-10-24 10:59:15 -05:00
Gabriele Giacone	b4194fef43	Add missing files for GNU/kFreeBSD	2014-10-24 10:59:15 -05:00
Svante Signell	5f23128f30	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.	2014-10-24 10:59:15 -05:00
Anthony G. Basile	a634534167	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.	2014-10-24 10:59:15 -05:00
Anthony G. Basile	f77006b58e	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.	2014-10-24 10:59:15 -05:00
William Hubbs	ef22f78a48	Update news file wrt chroot variable	2014-10-20 16:03:27 -05:00
Alexander Vershilov	735dc45c39	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	2014-10-20 16:03:27 -05:00
William Hubbs	0d3fdd3769	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	2014-10-20 16:03:27 -05:00
William Hubbs	5a1a94b2cc	Add NEWS file	2014-10-20 16:03:27 -05:00
William Hubbs	a76e5a827c	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	2014-10-20 16:03:27 -05:00
William Hubbs	b964de8287	man: Document start_inactive and in_background_fake	2014-10-16 11:42:38 -05:00
William Hubbs	2c1051ad3f	typo fix	2014-10-16 11:32:48 -05:00
Roy Marples	a2187e897e	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	2014-10-16 11:09:36 -05:00
Rick Farina (ZeroChaos)	e8043fe378	localmount: unmount aufs branches	2014-10-13 15:41:03 -05:00
William Hubbs	082fd53d9e	runscript: move verbose mode setting near debug setting	2014-10-13 15:40:54 -05:00
Joe M	61fd8b2996	savecache: check permissions on the correct directory	2014-10-13 15:39:56 -05:00
Andrew Gregory	43d727dc3f	tmpfiles.sh: add support for C action Recursively copies files or directories. Added by systemd in 849958d1.	2014-10-13 15:39:36 -05:00
Andrew Gregory	b8e52583ca	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.	2014-10-13 15:39:22 -05:00
William Hubbs	1a7af5bbde	Start work on 0.13.2	2014-10-13 15:39:12 -05:00
William Hubbs	785b61e872	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	2014-08-22 14:19:03 -05:00
William Hubbs	54ed42503f	start work on 0.13.1	2014-08-22 14:18:33 -05:00