update ChangeLog

We do not need to care about the path on the shebang line of a service
script as long as the shebang line ends with "openrc-run".
This fixes #119 and #120.

ChangeLog

@@ -1,4 +1,198 @@
-commit 2e22b32f600676495e5d5a6ccbf7b307c0588b1a
+commit 477e3dd8c13705affe87cc2c0e9286b2653a5688
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    sh/gendepends.sh.in: fix detection of service scripts
+    
+    We do not need to care about the path on the shebang line of a service
+    script as long as the shebang line ends with "openrc-run".
+    This fixes #119 and #120.
+
+commit 678e7adeb237edd080a13e463e5d8c40d2acdea7
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    version 0.24.2
+
+commit b087a751deb06986e0d77873046e08ca4864175c
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    update ChangeLog
+
+commit bc05fb75515b3f65f3c63ae5972c749fac00924f
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    update news file
+
+commit e5c2a378f3000cd20826ec6b59ecca15d31190ae
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    Remove all occurances of 'before *' from dependencies
+    
+    Using wildcards in dependencies causes issues when rc_parallel is set to
+    yes because it can lead to deadlocks.
+    All dependencies need to be explicit rather than implicit.
+    
+    This is the first stage of moving this direction.
+
+commit 3c1a71bd9db50fd410eb64e715a99911c8fad978
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    init.d/sysfs.in: efivarfs tweaks
+    
+    Since we check for /sys/firmware/efi/efivars, we do not need to check
+    for /sys/firmware/efi
+    
+    Since Failing to mount efivarfs is not critical, we silence the error
+    message from mount.
+
+commit fcb826a45137fec589bf945fe23deeba55879a34
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    version 0.24.1
+
+commit fde3902d069dfdce9c59555186a5541d6d99c8aa
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    update ChangeLog
+
+commit d7bbb0f5830e1ec4df1ec52714d70ac6b0a81878
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    add agetty service
+    
+    The agetty service is an alternate way to manage gettys with agetty
+    under Linux which is separate from an external init system.
+
+commit 21ca2b746cce67e2b3578fb7015c9d4c243e3a0c
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    init.d/sysfs: drop modules completely from the dependencies
+    
+    This is for #112.
+
+commit 6a79aef0159d7035778fd852b26ecfac903cd029
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    init.d/sysfs: Do not load efivarfs module
+    
+    My understanding is that the kernel can autoload this module. If it
+    doesn't, the module should be built in or loaded from an initramfs.
+    
+    This fixes https://github.com/openrc/openrc/pulls/112.
+
+commit 4a269674b765e5267f024fa55c8644480a7304ea
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    make sure netmount and localmount start after root
+
+commit eea4decdd1c84e4b8775a255d8ed85bce5eb40a5
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    net-online: typo fix
+
+commit d4d0f25a4844ecaed43de913e8b729e7a2e894db
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    net-online: updates to make the service more usable
+    
+    - switch from attempting to ping the default gateway to a host outside
+    the local network, defaulting to google.com.
+    - along with this, change the name of the variable that requests a ping
+    test to include_ping_test so the meaning is more clear.
+
+commit 1cb44092fce298004ab4c4547c6fbcac29c5997f
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    sh/rc-functions.sh.in: add get_bootparam_value function
+
+commit 4207e46622f584eb5f0cc10bbfd36f92f001a2e2
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    move init.d examples under support and install them
+
+commit f6ea16159ec8583a6f2182578334aa00578cb080
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    scripts: make sure the rc-sstat symlink is always replaced
+
+commit 9047ea4cb0d0e5e27704369380e128d26c3e86b2
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    install support files
+    
+    These files have been in the distribution for some time but haven't been
+    installed. They are good examples of how to do things, so we should
+    install them.
+
+commit d7f5a696c173e7af67dd4b3f90744e0a056441e1
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    support: rename all README files to README.md
+
+commit 6f614cd3f33dbdea3a67ac2fb414b1130674ee04
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    Move deptree2dot to the support folder
+    
+    Since deptree2dot and the perl requirement are completely optional, we
+    can move this tool to the support folder. This gives the user the option
+    of using it if they have perl installed, and means we do not have an
+    optional runtime dependency on perl.
+    
+    Documentation for this tool has also been added to the support folder.
+    
+    X-Gentoo-Bug: 600742
+    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=600742
+
+commit 85c1930acf15b0c9d3c5537fb2b0409c6a11c982
+Author: William Pitcock <nenolod@dereferenced.org>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    test/setup_env: ensure that eval_ecolors is available on the path.
+    
+    The test environment previously used the system default paths instead of installing the necessary $PATH environment
+    variable to make finding eval_ecolors work.
+    This closes #117.
+    
+    X-Gentoo-Bug: 374191.
+    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=374191.
+
+commit 96bd0c004c9549e5a2ef64277216a15da6f96a8e
+Author: Nicolas Porcel <nicolasporcel06@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    Fix typo in guide.md
+    
+    This fixes #115.
+
+commit b693af90556ac9b055ba5c6e589066c1e08b2146
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    Revert "scripts: do not substitute for @SHELL@ in rc-sstat"
+    
+    This reverts commit e2e652e469efa5f3ebcd69828ff16d8f5ad3f1b8.
+
+commit 6dcb6929869c2f81c1f8d0930191f74fc6dfaa3e
 Author: Doug Freed <dwfreed@mtu.edu>
 Commit: William Hubbs <w.d.hubbs@gmail.com>
 
@@ -10,19 +204,13 @@ Commit: William Hubbs <w.d.hubbs@gmail.com>
     X-Gentoo-Bug: 604986
     X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=604986
 
-commit c283fb6b67efc83b9567e63aae5ef12cd8a463f4
+commit e2e652e469efa5f3ebcd69828ff16d8f5ad3f1b8
 Author: William Hubbs <w.d.hubbs@gmail.com>
 Commit: William Hubbs <w.d.hubbs@gmail.com>
 
-    version 0.23.2
+    scripts: do not substitute for @SHELL@ in rc-sstat
 
-commit cf5ccbc7599c0fed7e189c5f73cb632d5ab929c6
+commit b73941f0c3020e3dbd1684d09685e114c678b520
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    update ChangeLog
-
-commit 90ee9cd49df773b2aef2acb2ca72ac92c3e62835
 Author: William Hubbs <w.d.hubbs@gmail.com>
 Commit: William Hubbs <w.d.hubbs@gmail.com>
 
@@ -36,7 +224,7 @@ Commit: William Hubbs <w.d.hubbs@gmail.com>
     X-Gentoo-Bug: 604646
     X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=604646
 
-commit a7f92e3219d0a5278fe8bd742e2e5cb68048210e
+commit c304522131a795cf882444b5f94e81db4baf65b3
 Author: Benda Xu <heroxbd@gentoo.org>
 Commit: William Hubbs <w.d.hubbs@gmail.com>
 
@@ -45,7 +233,7 @@ Commit: William Hubbs <w.d.hubbs@gmail.com>
     X-Gentoo-Bug: 604666
     X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=604666
 
-commit 8ae9a9b85614d6c3b246805c3be9e01d49f0b986
+commit 92325b44ba58a7ca04d88ae8ca202b402b032b43
 Author: Benda Xu <heroxbd@gentoo.org>
 Commit: William Hubbs <w.d.hubbs@gmail.com>
 
@@ -54,17 +242,35 @@ Commit: William Hubbs <w.d.hubbs@gmail.com>
     X-Gentoo-Bug: 604666
     X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=604666
 
-commit c4ebd431c9997e21c82ba020f36c549d1e1bb53c
+commit 074d90f5a4e3b66e532a0becde372acf38346397
-Author: Doug Freed <dwfreed@mtu.edu>
+Author: Benda Xu <heroxbd@gentoo.org>
 Commit: William Hubbs <w.d.hubbs@gmail.com>
 
+    Drop the use of the _BSD_SOURCE macro on Linux
+    
+    X-Gentoo-Bug: 604666
+    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=604666
+
+commit 7056b56b3ccc9cbde4ef8297b923919c49c7c242
+Author: Benda Xu <heroxbd@gentoo.org>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    Drop the use of the _BSD_SOURCE macro on GNU/Hurd
+    
+    X-Gentoo-Bug: 604666
+    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=604666
+
+commit d5c3b85e3fbddbba149687244d607fcdae222f95
+Author: Doug Freed <dwfreed@mtu.edu>
+Commit: Doug Freed <dwfreed@mtu.edu>
+
     loopback: drop explicit route for BSD too
 
-commit 7e885f37bbe40e098bb84562348a776b60cf17a3
+commit 1ab2249448ba24a591b561f53aa64ff3df1e41f6
 Author: William Hubbs <w.d.hubbs@gmail.com>
 Commit: William Hubbs <w.d.hubbs@gmail.com>
 
-    version 0.23.1
+    version 0.24
 
 commit a15cff21c63f2ad951af1c59a74fc7d37f78e91b
 Author: William Hubbs <w.d.hubbs@gmail.com>
@@ -1139,69 +1345,3 @@ Commit: William Hubbs <w.d.hubbs@gmail.com>
     
     X-Gentoo-Bug: 577362
     X-Gentoo-Bug-URL: https://bugs.gentoo.org/577362
-
-commit beaa71df0ab2cfa61beba4be0303099aa6c75e6a
-Author: Dustin C. Hatch <dustin@hatch.name>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    binfmt.sh: use read in raw mode
-    
-    The read builtin in most shells will interpret backslash characters
-    as escapes, and they are lost when reading binfmt files line-by-line.
-    This causes magic strings containing backslashes to be mangled and
-    become invalid, resulting in erroneous 'invalid entry' messages.
-    
-    The -r option to read disables special handling of backslashes and
-    keeps all lines intact.
-    
-    X-Gentoo-Bug: 575114
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=575114
-
-commit 7eaf71176b87ae69bfa622aa621341a19a9d32b0
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    Fix rc_env_allow wildcard usage
-    
-    Before this commit, using * in rc_env_allow did not work.
-    
-    This fixes #60.
-
-commit 2c1f6a16e10a45397e0872585dcb0e16684b6cbf
-Author: Mike Frysinger <vapier@gentoo.org>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    sysfs: mount pstore when available
-
-commit e82653782e1803e3c924aef055113333b18dafd9
-Author: Patrick Lauer <patrick@gentoo.org>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    Add a basic OpenRC users guide
-    
-    X-Gentoo-Bug: 513024
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=513024
-
-commit e52b5f59c22283b22e2b5a0d2ab9de6b92a73ebf
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    savecache: stop saving nettree
-    
-    Netifrc is no longer part of OpenRC, so we shouldn't save its dep tree
-    as part of savecache.
-    
-    This should have been removed when netifrc was split out. also, it
-    might be related to the following bug.
-    
-    X-Gentoo-Bug: 563720
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=563720
-
-commit 8a7e4d38a74c714e1a532e1b7a53fd2a5c528b63
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    rc-service: add --ifinactive and --ifnotstarted flags
-    
-    X-Gentoo-Bug: 523174
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=523174

Makefile

@@ -13,7 +13,7 @@ MK=			${TOP}/mk
 
 include ${TOP}/Makefile.inc
 
-SUBDIR=		conf.d etc init.d local.d man scripts sh src sysctl.d
+SUBDIR=		conf.d etc init.d local.d man scripts sh src support sysctl.d
 
 # Build pkgconfig or not
 MKPKGCONFIG?=	yes

Makefile.inc

@@ -1,3 +1,3 @@
 NAME=		openrc
-VERSION=	0.23.2
+VERSION=	0.24.2
 PKG=		${NAME}-${VERSION}

NEWS.md

@@ -3,6 +3,28 @@
 This file will contain a list of notable changes for each release. Note
 the information in this file is in reverse order.
 
+## OpenRC-0.24.1
+
+This version starts cleaning up the dependencies so that rc_parallel
+will work correctly.
+
+The first step in this process is to remove the 'before *' from the
+depend functions in the clock services. This means some  services not
+controlled by OpenRC may now start before instead of after the clock
+service. If it is important for these services to start after the clock
+service, they need to have 'after clock' added to their depend
+functions.
+
+## OpenRC-0.24
+
+Since the deptree2dot tool and the perl requirement are completely
+optional, the deptree2dot tool has been moved to the support directory.
+As a result, the MKTOOLS=yes/no switch has been removed from the makefiles.
+
+This version adds the agetty service which can be used to spawn
+agetty on a specific terminal. This is currently documented in the
+agetty-guide.md file at the top level of this distribution.
+
 ## OpenRC-0.23
 
 The tmpfiles.d processing code, which was part of previous versions of

README.md

@@ -30,7 +30,6 @@ MKSELINUX=yes
 MKSTATICLIBS=no
 MKTERMCAP=ncurses
 MKTERMCAP=termcap
-MKTOOLS=yes
 PKG_PREFIX=/usr/pkg
 LOCAL_PREFIX=/usr/local
 PREFIX=/usr/local
@@ -73,10 +72,6 @@ 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

agetty-guide.md

@@ -0,0 +1,19 @@
+# Setting up the agetty service in OpenRC
+
+The agetty service is an OpenRC specific way to monitor and respawn a
+getty, using agetty, on Linux. To use this method, make sure you aren't
+spawning a getty manager for this port some other way (such as through
+sysvinit/inittab), then run the following commands as root.
+
+Note that [port] refers to the port you are spawning the getty on, and
+not the full path to it. For example, tty0 or ttyS0instead of /dev/tty0
+or /dev/ttyS0.
+tty0 or ttyS0, not the full path to it (for example, tty0 or ttyS0 and
+
+```
+# cd /etc/init.d
+# ln -s agetty agetty.[port]
+# cd /etc/conf.d
+# cp agetty agetty.[port]
+#rc-update add agetty.[port] [runlevel]
+```

conf.d/Makefile

@@ -12,8 +12,8 @@ include ${MK}/os.mk
 
 CONF-FreeBSD=	ipfw modules moused powerd rarpd savecore syscons
 
-CONF-Linux=	consolefont devfs dmesg hwclock keymaps killprocs modules mtab \
+CONF-Linux=	agetty consolefont devfs dmesg hwclock keymaps killprocs modules \
-	net-online
+	mtab net-online
 
 CONF-NetBSD=	moused rarpd savecore
 

conf.d/agetty

@@ -0,0 +1,8 @@
+# Set the baud rate of the terminal line
+#baud=""
+
+# set the terminal type
+#termtype="linux"
+
+# extra options to pass to agetty for this port
+#agetty_options=""

conf.d/net-online

@@ -3,10 +3,13 @@
 # default is all interfaces that support ethernet.
 #interfaces=""
 
-# This setting controls whether a ping to the default gateway is
+# This setting controls whether a ping test is included in the test for
-# included in the test for network connectivity after all interfaces
+# network connectivity after all interfaces are active.
-# are active.
+#include_ping_test=no
-#ping_default_gateway=no
+
+# This setting is the host to attempt to ping if the above is yes.
+# The default is google.com.
+#ping_test_host=some.host.name
 
 # The timeout setting controls how long the net-online service waits
 # for the network to be configured.

guide.md

@@ -198,7 +198,7 @@ script:
 command=
 command_args=
 pidfile=
-``
+```
 
 Thus the 'smallest' service scripts can be half a dozen lines long
 

init.d/Makefile

@@ -21,9 +21,9 @@ SRCS-FreeBSD=	hostid.in modules.in moused.in newsyslog.in pf.in rarpd.in \
 SRCS-FreeBSD+=	adjkerntz.in devd.in dumpon.in encswap.in ipfw.in \
 		modules.in modules-load.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=	agetty.in binfmt.in devfs.in dmesg.in hwclock.in consolefont.in \
-		killprocs.in modules.in modules-load.in mount-ro.in mtab.in numlock.in \
+	keymaps.in killprocs.in modules.in modules-load.in mount-ro.in mtab.in \
-		procfs.in net-online.in sysfs.in termencoding.in
+	numlock.in procfs.in net-online.in sysfs.in termencoding.in
 
 # Generic BSD scripts
 SRCS-NetBSD=	hostid.in moused.in newsyslog.in pf.in rarpd.in rc-enabled.in \

init.d/agetty.in

@@ -0,0 +1,31 @@
+#!@SBINDIR@/openrc-run
+# Copyright (c) 2017 The OpenRC Authors.
+# See the Authors file at the top-level directory of this distribution and
+# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+#
+# This file is part of OpenRC. It is subject to the license terms in
+# the LICENSE file found in the top-level directory of this
+# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# This file may not be copied, modified, propagated, or distributed
+# except according to the terms contained in the LICENSE file.
+
+description="start agetty on a terminal line"
+supervisor=supervise-daemon
+port="${RC_SVCNAME#*.}"
+term_type="${term_type:-linux}"
+command=/sbin/agetty
+command_args_foreground="${agetty_options} ${port} ${baud} ${termtype}"
+pidfile="/run/${RC_SVCNAME}.pid"
+
+depend() {
+	after local
+}
+
+start_pre() {
+	if [ -z "$port" ]; then
+		eerror "${RC_SVCNAME} cannot be started directly. You must create"
+		eerror "symbolic links to it for the ports you want to start"
+		eerror "agetty on and add those to the appropriate runlevels."
+		return 1
+	fi
+}

init.d/hwclock.in

@@ -34,7 +34,8 @@ depend()
 	if yesno $clock_adjfile; then
 		use root
 	else
-		before *
+		before binfmt bootmisc fsck hostname keymaps localmount loopback mtab
+		before procfs root swap sysctl termencoding urandom
 	fi
 	keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu
 }

init.d/localmount.in

@@ -14,8 +14,8 @@ description="Mounts disks and swap according to /etc/fstab."
 depend()
 {
 	need fsck
-	use lvm modules mtab
+	use lvm modules mtab root
-	after lvm modules
+	after lvm modules root
 	keyword -docker -jail -lxc -prefix -systemd-nspawn -vserver
 }
 

init.d/net-online.in

@@ -15,6 +15,7 @@ depend()
 {
 	after modules
 	need sysfs
+	provide network-online
 	keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn -uml -vserver
 }
 
@@ -27,19 +28,6 @@ get_interfaces()
 	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
@@ -66,10 +54,15 @@ start ()
 	: $((timeout -= 1))
  done
  ! $infinite && [ $timeout -eq 0 ] && rc=1
- if [ $rc -eq 0 ] && yesno ${ping_default_gateway:-no}; then
+ include_ping_test=${include_ping_test:-${ping_default_gateway}}
- 	gateway="$(get_default_gateway)"
+ if [ -n "${ping_default_gateway}" ]; then
- 	if [ -n "$gateway" ] && ! ping -c 1 $gateway > /dev/null 2>&1; then
+ ewarn "ping_default_gateway is deprecated, please use include_ping_test"
-		rc=1
+ fi
+ if [ $rc -eq 0 ] && yesno ${include_ping_test:-no}; then
+ 	ping_test_host="${ping_test_host:-google.com}"
+ 	if [ -n "$ping_test_host" ]; then
+		ping -c 1 $ping_test_host > /dev/null 2>&1
+		rc=$?
 	fi
  fi
  eend $rc "The network is offline"

init.d/netmount.in

@@ -20,10 +20,12 @@ depend()
 			*) mywant="$mywant nfsclient"; break ;;
 		esac
 	done
+	after root
  	config /etc/fstab
 	want $mywant
 	use afc-client amd openvpn
 	use dns
+	use root
 	keyword -docker -jail -lxc -prefix -systemd-nspawn -vserver
 }
 

init.d/swclock.in

@@ -13,7 +13,10 @@ description="Sets the local clock to the mtime of a given file."
 
 depend()
 {
-	before *
+	before adjkerntz binfmt bootmisc devdb dumpon fsck hostid hostname keymaps
+	before localmount loopback modules mtab network newsyslog procfs root
+	before savecore staticroute swap swap-blk syscons sysctl syslogd
+	before termencoding ttys urandom wscons
 	provide clock
 	keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu
 }

init.d/sysfs.in

@@ -15,7 +15,6 @@ sysfs_opts=nodev,noexec,nosuid
 
 depend()
 {
-	want modules
 	keyword -docker -lxc -prefix -systemd-nspawn -vserver
 }
 
@@ -99,23 +98,12 @@ mount_misc()
 	fi
 
 	# set up kernel support for efivarfs
-	# The presence of /sys/firmware/efi indicates that the system was
+	if [ -d /sys/firmware/efi/efivars ] &&
-	# booted in efi mode.
+		! mountinfo -q /sys/firmware/efi/efivars; then
-	if [ -d /sys/firmware/efi ]; then
+		ebegin "Mounting efivarfs filesystem"
-		if [ ! -d /sys/firmware/efi/efivars ] &&
+		mount -n -t efivarfs -o ${sysfs_opts} \
-			modprobe -q efivarfs; then
+			efivarfs /sys/firmware/efi/efivars 2> /dev/null
-			ewarn "The efivarfs module needs to be configured in " \
+		eend 0
-				  "@SYSCONFDIR@/conf.d/modules or built in"
-		fi
-		if [ -d /sys/firmware/efi/efivars ] &&
-			! mountinfo -q /sys/firmware/efi/efivars; then
-			if grep -qs efivarfs /proc/filesystems; then
-				ebegin "Mounting efivarfs filesystem"
-				mount -n -t efivarfs -o ${sysfs_opts} \
-					efivarfs /sys/firmware/efi/efivars
-				eend $?
-			fi
-		fi
 	fi
 }
 

mk/os-GNU.mk

@@ -11,5 +11,5 @@
 SFX=		.GNU.in
 PKG_PREFIX?=	/usr
 
-CPPFLAGS+=	-D_BSD_SOURCE -D_XOPEN_SOURCE=700 -DMAXPATHLEN=4096 -DPATH_MAX=4096
+CPPFLAGS+=	-D_DEFAULT_SOURCE -D_XOPEN_SOURCE=700 -DMAXPATHLEN=4096 -DPATH_MAX=4096
 LIBDL=		-Wl,-Bdynamic -ldl

mk/os-Linux.mk

@@ -11,7 +11,7 @@
 SFX=		.Linux.in
 PKG_PREFIX?=	/usr
 
-CPPFLAGS+=	-D_BSD_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=700
+CPPFLAGS+=	-D_DEFAULT_SOURCE -D_XOPEN_SOURCE=700
 LIBDL=		-Wl,-Bdynamic -ldl
 
 ifeq (${MKSELINUX},yes)

mk/sys.mk

@@ -59,6 +59,9 @@ MANPREFIX?=		${UPREFIX}/share
 MANDIR?=		${MANPREFIX}/man
 MANMODE?=		0444
 
+DATADIR?=		${UPREFIX}/share/openrc
+DATAMODE?=		0644
+
 DOCDIR?=		${UPREFIX}/share/doc
 DOCMODE?=		0644
 

scripts/Makefile

@@ -13,7 +13,7 @@ endif
 _installafter:
 ifeq (${OS},Linux)
 	${INSTALL} -d ${DESTDIR}${SBINDIR}
-	ln -s ${DIR}/rc-sstat ${DESTDIR}/${SBINDIR}/rc-sstat
+	ln -sf ${DIR}/rc-sstat ${DESTDIR}/${SBINDIR}/rc-sstat
 endif
 
 include ${MK}/scripts.mk

sh/gendepends.sh.in

@@ -74,11 +74,22 @@ do
 
 		# Only generate dependencies for OpenRC scripts
 		read one two three <"$RC_SERVICE"
-		[ "$one" = "#!@SBINDIR@/runscript" ] || \
+		case "$one" in
-		[ "$one" = "#!@SBINDIR@/openrc-run" ] || \
+			\#*/openrc-run) ;;
-		[ "$one" = "#!" -a "$two" = "@SBINDIR@/runscript" ] || \
+			\#*/runscript) ;;
-		[ "$one" = "#!" -a "$two" = "@SBINDIR@/openrc-run" ] || \
+			\#!)
-			continue
+				case "$two" in
+					*/openrc-run) ;;
+					*/runscript) ;;
+					*)
+						continue
+						;;
+				esac
+				;;
+			*)
+				continue
+				;;
+		esac
 		unset one two three
 
 		RC_SVCNAME=${RC_SERVICE##*/} ; export RC_SVCNAME

sh/rc-functions.sh.in

@@ -85,6 +85,40 @@ get_bootparam()
 	return 1
 }
 
+get_bootparam_value()
+{
+	local match="$1" which_value="$2" sep="$3" result value
+	if [ -n "$match" -a -r /proc/cmdline ]; then
+		set -- $(cat /proc/cmdline)
+		while [ -n "$1" ]; do
+			case "$1" in
+				$match=*)
+					value="${1##*=}"
+					case "$which_value" in
+						all)
+							[ -z "$sep" ] && sep=' '
+							if [ -z "$result" ]; then
+								result="$value"
+							else
+								result="${result}${sep}${value}"
+							fi
+							;;
+						last)
+							result="$value"
+							;;
+						*)
+							result="$value"
+							break
+							;;
+					esac
+					;;
+			esac
+			shift
+		done
+	fi
+	echo $result
+}
+
 # Called from openrc-run.sh or gendepends.sh
 _get_containers() {
 	local c

src/Makefile

@@ -3,9 +3,5 @@
 
 SUBDIR=		test libeinfo librc rc
 
-ifeq (${MKTOOLS},yes)
-SUBDIR+= tools
-endif
-
 MK=		../mk
 include		${MK}/subdir.mk

src/tools/Makefile

@@ -1,5 +0,0 @@
-DIR=	${UPREFIX}/bin
-BIN=	deptree2dot
-
-MK=	../../mk
-include ${MK}/scripts.mk

support/Makefile

@@ -0,0 +1,20 @@
+# Copyright (c) 2017 the OpenRC Authors.
+# See the Authors file at the top-level directory of this distribution and
+# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+#
+# This file is part of OpenRC. It is subject to the license terms in
+# the LICENSE file found in the top-level directory of this
+# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# This file may not be copied, modified, propagated, or distributed
+# except according to the terms contained in the LICENSE file.
+
+MK=		../mk
+include		${MK}/os.mk
+
+SUBDIR=		deptree2dot init.d.examples openvpn
+
+ifeq (${OS},Linux)
+SUBDIR+=	sysvinit
+endif
+
+include		${MK}/subdir.mk

support/deptree2dot/Makefile

@@ -0,0 +1,9 @@
+MK=	../../mk
+include ${MK}/os.mk
+
+DIR=	${DATADIR}/support/deptree2dot
+BIN=	deptree2dot
+INC=	README.md
+
+
+include ${MK}/scripts.mk

support/deptree2dot/README.md

@@ -0,0 +1,11 @@
+# deptree2dot - Graph the OpenRC Dependency Tree
+
+This utility can be used to graph the OpenRC dependency tree. It
+requires perl5.x and converts the tree to a .dot file which can be
+processed by graphviz.
+
+Example usage:
+
+$ chmod +x deptree2dot
+$deptree2dot > deptree.dot
+$deptree2dot | dot -Tpng -o deptree.png

support/init.d.examples/Makefile

@@ -1,9 +1,11 @@
-DIR=	${INITDIR}
+DIR=	${DATADIR}/support/init.d.examples
+INC=	README.md
 SRCS=	avahi-dnsconfd.in avahid.in dhcpcd.in dbus.in \
 	hald.in named.in ntpd.in \
 	openvpn.in polkitd.in sshd.in wpa_supplicant.in
+BIN=	${OBJS}
 
-MK=	../mk
+MK=	../../mk
 
 SED_EXTRA+= -e 's:@VARBASE@:/var:g'
 

support/init.d.examples/README.md

@@ -0,0 +1,3 @@
+The service scripts in this directory are meant as examples only.
+They are 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.

support/openvpn/Makefile

@@ -0,0 +1,9 @@
+MK=	../../mk
+include ${MK}/os.mk
+
+DIR=	${DATADIR}/support/openvpn
+BIN=	down.sh up.sh
+INC=	README.md
+
+
+include ${MK}/scripts.mk

support/sysvinit/Makefile

@@ -0,0 +1,8 @@
+MK=	../../mk
+include ${MK}/os.mk
+
+DIR=	${DATADIR}/support/sysvinit
+INC=	inittab README.md
+
+
+include ${MK}/scripts.mk

test/setup_env.sh

@@ -9,6 +9,10 @@ srcdir=${srcdir:-.}
 top_builddir=${top_builddir:-${top_srcdir}}
 builddir=${builddir:-${srcdir}}
 
+LD_LIBRARY_PATH=${top_builddir}/src/libeinfo:${top_builddir}/src/librc:${LD_LIBRARY_PATH}
+PATH=${top_builddir}/src/rc:${PATH}
+export LD_LIBRARY_PATH PATH
+
 if [ ! -f ${top_srcdir}/sh/functions.sh ] ; then
 	echo "functions.sh not yet created !?" 1>&2
 	exit 1
@@ -17,7 +21,3 @@ elif ! . ${top_srcdir}/sh/functions.sh; then
 	exit 1
 fi
 
-LD_LIBRARY_PATH=${top_builddir}/src/libeinfo:${top_builddir}/src/librc:${LD_LIBRARY_PATH}
-PATH=${top_builddir}/src/rc:${PATH}
-export LD_LIBRARY_PATH PATH
-