[gentoo-commits] proj/openrc:master commit in: init.d/

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     25c229cf830c8e822a206f2e08f9c94964a47aa9
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Mon Jul 14 20:58:50 2014 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Jul 14 20:58:50 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=25c229cf

sysfs.in: fix indentation

---
 init.d/sysfs.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/init.d/sysfs.in b/init.d/sysfs.in
index 9edd915..e01dcc8 100644
--- a/init.d/sysfs.in
+++ b/init.d/sysfs.in
@@ -99,8 +99,8 @@ mount_misc()
 
 mount_cgroups()
 {
-		mountinfo -q /sys/fs/cgroup || return 0
-		mountinfo -q /sys/fs/cgroup/openrc || return 0
+	mountinfo -q /sys/fs/cgroup || return 0
+	mountinfo -q /sys/fs/cgroup/openrc || return 0
 
 	local agent="@LIBEXECDIR@/sh/cgroup-release-agent.sh"
 	mkdir /sys/fs/cgroup/openrc

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     d70b1c55b67b44b98c23ceed25bc428481f7e00a
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Tue Oct 23 21:47:37 2018 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Oct 23 21:47:37 2018 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=d70b1c55

modules: Add --first-time switch to modprobe commands

On Linux, kernel modules should be loaded once during boot, either in an
initramfs or by this service.

This does not change anything other than printing out messages if a
module is loaded more than once.

X-Gentoo-Bug: 659530
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=659530

 init.d/modules.in | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/init.d/modules.in b/init.d/modules.in
index 998972ba..abaab85b 100644
--- a/init.d/modules.in
+++ b/init.d/modules.in
@@ -56,11 +56,12 @@ load_modules()
 		ebegin "Loading module $x"
 		case "$RC_UNAME" in
 			FreeBSD) kldload "$x"; rc=$? ;;
-			Linux) modprobe --use-blacklist -q "$x"; rc=$? ;;
+			Linux) modprobe --first-time -q --use-blacklist "$x"; rc=$? ;;
 			*) ;;
 		esac
 		eend $rc "Failed to load $x"
 	done
+	return 0
 }
 
 modules_load_d()
@@ -118,7 +119,7 @@ Linux_modules()
 			[ -n "${args}" ] && break
 		done
 		[ -z "$args" ] && eval args=\$module_${xx}_args
-		eval modprobe --use-blacklist --verbose "$x" "$args"
+		eval modprobe --first-time --use-blacklist --verbose "$x" "$args"
 	done
 	[ -n "$list" ] && eend
 }

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     f0ad647303daca528cb9b75f9a07d422318635c2
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Wed May  9 22:54:18 2018 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri May 11 16:54:48 2018 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=f0ad6473

Revert "savecache: stop saving the dependency tree"

It is safe to save the deptree, but we also need to regenerate it at
boot time.

 init.d/savecache.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/init.d/savecache.in b/init.d/savecache.in
index 949600cd..74f17798 100644
--- a/init.d/savecache.in
+++ b/init.d/savecache.in
@@ -49,7 +49,7 @@ start()
 	fi
 	ebegin "Saving dependency cache"
 	local rc=0 save=
-	for x in shutdowntime softlevel rc.log; do
+	for x in depconfig deptree rc.log shutdowntime softlevel; do
 		[ -e "$RC_SVCDIR/$x" ] && save="$save $RC_SVCDIR/$x"
 	done
 	if [ -n "$save" ]; then

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     b302b0c094c2c99b810aec9c8877adcd1effabac
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Fri Mar 16 18:48:05 2018 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Mar 16 18:53:02 2018 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=b302b0c0

net-online: always start after net

X-Gentoo-Bug: 650600
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=650600

 init.d/net-online.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/init.d/net-online.in b/init.d/net-online.in
index 484fe87d..b496e258 100644
--- a/init.d/net-online.in
+++ b/init.d/net-online.in
@@ -13,7 +13,7 @@ description="Delays until the network is online or a specific timeout"
 
 depend()
 {
-	after modules
+	after modules net
 	need sysfs
 	provide network-online
 	keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn -uml -vserver

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     40aa69cf3a99fa080375a702631da4d2311ebf3e
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Thu Mar 15 01:37:02 2018 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Mar 15 01:37:02 2018 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=40aa69cf

agetty.in: allow status to be displayed

 init.d/agetty.in | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/init.d/agetty.in b/init.d/agetty.in
index 390b1317..971ee86c 100644
--- a/init.d/agetty.in
+++ b/init.d/agetty.in
@@ -16,7 +16,6 @@ term_type="${term_type:-linux}"
 command=/sbin/agetty
 command_args_foreground="${agetty_options} ${port} ${baud} ${term_type}"
 pidfile="/run/${RC_SVCNAME}.pid"
-export EINFO_QUIET="${quiet:-yes}"
 
 depend() {
 	after local
@@ -29,5 +28,12 @@ start_pre() {
 		eerror "symbolic links to it for the ports you want to start"
 		eerror "agetty on and add those to the appropriate runlevels."
 		return 1
+	else
+		export EINFO_QUIET="${quiet:-yes}"
 	fi
 }
+
+stop_pre()
+{
+	export EINFO_QUIET="${quiet:-yes}"
+}

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     3e68013631765e00eddf118bc24e38254e7f6d64
Author:     Scall <Scall <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Tue Mar  6 01:16:26 2018 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Mar  6 01:16:26 2018 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=3e680136

init.d: swap should always be started after root

Otherwise if a swap file is being used, and swap is started before
root, swapon may fail because of a read-only filesystem.

 init.d/swap.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/init.d/swap.in b/init.d/swap.in
index 546cb5f5..c40b263d 100644
--- a/init.d/swap.in
+++ b/init.d/swap.in
@@ -11,7 +11,7 @@
 
 depend()
 {
-	after clock
+	after clock root
 	before localmount
 	keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn -vserver
 }

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     e51dc29e2f3b2718a62347e8588115e786a9f3c8
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Tue Feb 27 21:56:54 2018 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Feb 27 21:56:54 2018 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=e51dc29e

cgroups: fix indentation

 init.d/cgroups.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/init.d/cgroups.in b/init.d/cgroups.in
index 01f5dd48..3d5bfa7b 100644
--- a/init.d/cgroups.in
+++ b/init.d/cgroups.in
@@ -57,7 +57,7 @@ cgroup1_controllers()
 				mkdir "/sys/fs/cgroup/${name}"
 				mount -n -t cgroup -o "${cgroup_opts},${name}" \
 					"${name}" "/sys/fs/cgroup/${name}"
-					yesno "${rc_cgroup_memory_use_hierarchy:-no}" &&
+				yesno "${rc_cgroup_memory_use_hierarchy:-no}" &&
 					[ "${name}" = memory ] &&
 					echo 1 > /sys/fs/cgroup/memory/memory.use_hierarchy
 				;;

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     38032626a6c2f8e869197999f32ac3634667cc86
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Fri Feb 23 21:07:04 2018 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Feb 23 21:07:04 2018 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=38032626

improve cgroup configuration checks

make the base/controller functions return successfully if cgroups v1/v2
are not configured in the kernel

 init.d/cgroups.in | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/init.d/cgroups.in b/init.d/cgroups.in
index fe21904c..8ec91ef6 100644
--- a/init.d/cgroups.in
+++ b/init.d/cgroups.in
@@ -42,7 +42,8 @@ cgroup1_base()
 
 cgroup1_controllers()
 {
-	yesno "${rc_controller_cgroups:-YES}" && [ -e /proc/cgroups ] || return 0
+	yesno "${rc_controller_cgroups:-YES}" && [ -e /proc/cgroups ]  &&
+	grep -qw cgroup /proc/filesystems || return 0
 	while read -r name _ _ enabled _; do
 		case "${enabled}" in
 			1)	mountinfo -q "/sys/fs/cgroup/${name}" && continue
@@ -64,6 +65,7 @@ cgroup1_controllers()
 
 cgroup2_base()
 {
+	grep -qw cgroup2 /proc/filesystems || return 0
 	local base
 	base="$(cgroup2_find_path)"
 	mkdir -p "${base}"
@@ -74,6 +76,7 @@ cgroup2_base()
 
 cgroup2_controllers()
 {
+	grep -qw cgroup2 /proc/filesystems || return 0
 	local active cgroup_path x y
 	cgroup_path="$(cgroup2_find_path)"
 	[ -z "${cgroup_path}" ] && return 0
@@ -91,19 +94,15 @@ cgroup2_controllers()
 
 cgroups_hybrid()
 {
-	grep -qw cgroup /proc/filesystems || return 0
 	cgroup1_base
-	if grep -qw cgroup2 /proc/filesystems; then
-		cgroup2_base
-		cgroup2_controllers
-	fi
+	cgroup2_base
+	cgroup2_controllers
 	cgroup1_controllers
 	return 0
 }
 
 cgroups_legacy()
 {
-	grep -qw cgroup /proc/filesystems || return 0
 	cgroup1_base
 	cgroup1_controllers
 	return 0

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     f42ec82f21f3760b829507344ad0ae761e1d59aa
Author:     3PO <r2d2 <AT> freakmail <DOT> de>
AuthorDate: Sun Dec 31 21:50:57 2017 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Jan  5 20:56:33 2018 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=f42ec82f

net-online: only process symbolic links in /sys/class/net

The /sys/class/net directory contains files which are not symlinks if
the system has bonded devices [1].  We should ignore these files.

This fixes #196.

[1] https://elkano.org/blog/manage-interface-bondings-sysfs-interface/

 init.d/net-online.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/init.d/net-online.in b/init.d/net-online.in
index 1175f29c..484fe87d 100644
--- a/init.d/net-online.in
+++ b/init.d/net-online.in
@@ -23,6 +23,7 @@ get_interfaces()
 {
 	local ifname iftype
 	for ifname in /sys/class/net/*; do
+		[ -h "${ifname}" ] && continue
 		read iftype < ${ifname}/type
 		[ "$iftype" = "1" ] && printf "%s " ${ifname##*/}
 	done

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     4f750933fd8ef944be58bfeef071a8e35fc0c606
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Thu Dec 14 23:31:57 2017 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Dec 14 23:31:57 2017 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=4f750933

procfs: remove the @sysconfdir@ reference

 init.d/procfs.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/init.d/procfs.in b/init.d/procfs.in
index 343b30d1..8fed9514 100644
--- a/init.d/procfs.in
+++ b/init.d/procfs.in
@@ -27,8 +27,8 @@ start()
 		[ ! -e /proc/sys/fs/binfmt_misc/register ]; then
 		if ! grep -qs binfmt_misc /proc/filesystems &&
 			modprobe -q binfmt-misc; then
-			ewarn "The binfmt-misc module needs to be configured in" \
-				"@SYSCONFDIR@/conf.d/modules or built in."
+			ewarn "The binfmt-misc module needs to be loaded by" \
+				"the modules service or built in."
 		fi
 		if grep -qs binfmt_misc /proc/filesystems; then
 			ebegin "Mounting misc binary format filesystem"

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     50b69d564a8f89b8137bb6d9d53aac1e44f6c23c
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Thu Dec 14 23:07:31 2017 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Dec 14 23:07:31 2017 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=50b69d56

hostname: replace @SYSCONFDIR@ references with /etc

I do not know of any situation where /etc/hostname is at any other
location. Also, this does not run on prefix.

 init.d/hostname.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/init.d/hostname.in b/init.d/hostname.in
index d7913bed..823008fd 100644
--- a/init.d/hostname.in
+++ b/init.d/hostname.in
@@ -20,9 +20,9 @@ depend()
 start()
 {
 	local h source x
-	if [ -s @SYSCONFDIR@/hostname ] && [ -r @SYSCONFDIR@/hostname ]; then
-		read h x <@SYSCONFDIR@/hostname
-		source="from @SYSCONFDIR@/hostname"
+	if [ -s /etc/hostname ] && [ -r /etc/hostname ]; then
+		read h x </etc/hostname
+		source="from /etc/hostname"
 	else
 		# HOSTNAME variable used to be defined in caps in conf.d/hostname.
 		# It is also a magic variable in bash.

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     eb18f4f3483b99705f944c7274b4a6b451716df7
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Thu Dec 14 22:38:09 2017 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Dec 14 22:38:09 2017 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=eb18f4f3

hwclock: use shell variables for configuration file path

This removes a reference to @SYSCONFDIR@.

 init.d/hwclock.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/init.d/hwclock.in b/init.d/hwclock.in
index 0fce88f1..024bff0c 100644
--- a/init.d/hwclock.in
+++ b/init.d/hwclock.in
@@ -105,7 +105,7 @@ start()
 			done
 			[ -n "$modname" ] &&
 				ewarn "The $modname module needs to be configured in" \
-					"@SYSCONFDIR@/conf.d/modules or built in."
+					"${RC_SERVICE%/*/*}/conf.d/modules or built in."
 		fi
 	fi
 

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     d5f3fe52c87928095bd2659823b985d231f0718c
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Thu Dec 14 19:52:55 2017 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Dec 14 20:18:39 2017 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=d5f3fe52

sysctl: hard code paths for sysctl files on *bsd

For *BSD,the sysctl*.conf files are always in /etc.

 init.d/sysctl.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/init.d/sysctl.in b/init.d/sysctl.in
index ae9f17fe..e49f4db2 100644
--- a/init.d/sysctl.in
+++ b/init.d/sysctl.in
@@ -21,7 +21,7 @@ BSD_sysctl()
 	[ -e /etc/sysctl.conf ] || return 0
 	local retval=0 var= comments= conf=
 	eindent
-	for conf in @SYSCONFDIR@/sysctl.conf @SYSCONFDIR@/sysctl.d/*.conf; do
+	for conf in /etc/sysctl.conf /etc/sysctl.d/*.conf; do
 		if [ -r "$conf" ]; then
 			vebegin "applying $conf"
 			while read var comments; do

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     53844fd0dcd9741b5f19dee7c00787be7e904c3c
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Thu Dec 14 18:06:07 2017 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Dec 14 18:08:38 2017 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=53844fd0

devfs: cleanup

clean up local definitions. Also remove @SYSCONFDIR@ substitutions since
they can be calculated at runtime.

 init.d/devfs.in | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/init.d/devfs.in b/init.d/devfs.in
index 8038c541..61ba45f8 100644
--- a/init.d/devfs.in
+++ b/init.d/devfs.in
@@ -20,9 +20,12 @@ depend()
 
 mount_dev()
 {
-	local action=--mount devfstype msg=Mounting
+	local action conf_d_dir devfstype msg mountopts
+	action=--mount
+	conf_d_dir="${RC_SERVICE%/*/*}/conf.d"
+	msg=Mounting
 	# Some devices require exec, Bug #92921
-	local mountopts="exec,nosuid,mode=0755"
+	mountopts="exec,nosuid,mode=0755"
 	if yesno ${skip_mount_dev:-no} ; then
 		einfo "/dev will not be mounted due to user request"
 		return 0
@@ -33,7 +36,7 @@ mount_dev()
 		msg=Remounting
 	fi
 	if fstabinfo -q /dev; then
-		ebegin "$msg /dev according to @SYSCONFDIR@/fstab"
+		ebegin "$msg /dev according to fstab"
 		fstabinfo -q $action /dev
 		eend $?
 		return 0
@@ -54,7 +57,7 @@ mount_dev()
 		ewarn "is no entry for /dev in fstab."
 		ewarn "This means /dev will not be mounted."
 		ewarn "To avoid this message, set CONFIG_DEVTMPFS or CONFIG_TMPFS to y"
-		ewarn "in your kernel configuration or see @SYSCONFDIR@/conf.d/devfs"
+		ewarn "in your kernel configuration or see ${conf_d_dir}/${RC_SVCNAME}"
 	fi
 	return 0
 }

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     bb1bc6eeb73b3483a1ebdfc142a11240b58588cf
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Thu Dec 14 18:44:45 2017 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Dec 14 18:52:03 2017 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=bb1bc6ee

local: misc cleanups

Remove references to @SYSCONFDIR@ since these can be calculated at
runtime.
Also style fixes.

 init.d/local.in | 37 ++++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/init.d/local.in b/init.d/local.in
index 001a4fb1..2bb1696c 100644
--- a/init.d/local.in
+++ b/init.d/local.in
@@ -9,7 +9,10 @@
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.
 
-description="Executes user programs in @SYSCONFDIR@/local.d"
+conf_d_dir="${RC_SERVICE%/*/*}/conf.d"
+local_d_dir="${RC_SERVICE%/*/*}/local.d"
+
+description="Executes user programs in ${local_d_dir}"
 
 depend()
 {
@@ -19,12 +22,12 @@ depend()
 
 start()
 {
-	ebegin "Starting local"
-
-	local file has_errors=0 redirect retval
+	local file has_errors redirect retval
+	has_errors=0
 	yesno $rc_verbose || redirect='> /dev/null 2>&1'
+	ebegin "Starting local"
 	eindent
-	for file in @SYSCONFDIR@/local.d/*.start; do
+	for file in "${local_d_dir}"/*.start; do
 		if [ -x "${file}" ]; then
 			vebegin "Executing \"${file}\""
 			eval "${file}" $redirect
@@ -38,32 +41,32 @@ start()
 	eoutdent
 
 	if command -v local_start >/dev/null 2>&1; then
-		ewarn "\"@SYSCONFDIR@/conf.d/local\" should be removed."
+		ewarn "\"${conf_d_dir}/local\" should be removed."
 		ewarn "Please move the code from the local_start function"
 		ewarn "to executable scripts with an .start extension"
-		ewarn "in \"@SYSCONFDIR@/local.d\""
+		ewarn "in \"${local_d_dir}\""
 		local_start
 	fi
 
 	eend ${has_errors}
 
 	# We have to end with a zero exit code, because a failed execution
-	# of an executable @SYSCONFDIR@/local.d/*.start file shouldn't result in
+	# of an executable ${local_d_dir}/*.start file shouldn't result in
 	# marking the local service as failed. Otherwise we are unable to
-	# execute any executable @SYSCONFDIR@/local.d/*.stop file, because a failed
+	# execute any executable ${local_d_dir}/*.stop file, because a failed
 	# marked service cannot be stopped (and the stop function would
-	# actually call the executable @SYSCONFDIR@/local.d/*.stop file(s)).
+	# actually call the executable ${local_d_dir}/*.stop file(s)).
 	return 0
 }
 
 stop()
 {
-	ebegin "Stopping local"
-
-	local file has_errors=0 redirect retval
+	local file has_errors redirect retval
+	has_errors=0
 	yesno $rc_verbose || redirect='> /dev/null 2>&1'
+	ebegin "Stopping local"
 	eindent
-	for file in @SYSCONFDIR@/local.d/*.stop; do
+	for file in "${local_d_dir}"/*.stop; do
 		if [ -x "${file}" ]; then
 			vebegin "Executing \"${file}\""
 			eval "${file}" $redirect
@@ -77,16 +80,16 @@ stop()
 	eoutdent
 
 	if command -v local_stop >/dev/null 2>&1; then
-		ewarn "\"@SYSCONFDIR@/conf.d/local\" should be removed."
+		ewarn "\"${conf_d_dir}/local\" should be removed."
 		ewarn "Please move the code from the local_stop function"
 		ewarn "to executable scripts with an .stop extension"
-		ewarn "in \"@SYSCONFDIR@/local.d\""
+		ewarn "in \"${local_d_dir}\""
 		local_stop
 	fi
 
 	eend ${has_errors}
 
-	# An executable @SYSCONFDIR@/local.d/*.stop file which failed with a
+	# An executable ${local_d_dir}/*.stop file which failed with a
 	# non-zero exit status is not a reason to mark this service
 	# as failed, therefore we have to end with a zero exit code.
 	return 0

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     14938c29cefe869872b987f8e606da72024fa8bb
Author:     bell07 <web.alexander <AT> web <DOT> de>
AuthorDate: Tue Dec 12 20:51:55 2017 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Dec 12 22:29:34 2017 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=14938c29

net-online: wait for ping_test_host

The script should wait till the ping host is available or timeout reached
Closes : #179
Closes : #191

 init.d/net-online.in | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/init.d/net-online.in b/init.d/net-online.in
index 5ea6bf64..1175f29c 100644
--- a/init.d/net-online.in
+++ b/init.d/net-online.in
@@ -63,8 +63,12 @@ start ()
  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=$?
+		while $infinite || [ $timeout -gt 0 ]; do
+			ping -c 1 $ping_test_host > /dev/null 2>&1
+			rc=$?
+			[ $rc -eq 0 ] && break
+			: $((timeout -= 1))
+		done
 	fi
  fi
  eend $rc "The network is offline"

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     8bf501aaf2cb60b8ddf1b2fa2d1ba0ef970fb790
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Tue Dec 12 20:23:04 2017 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Dec 12 20:23:04 2017 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=8bf501aa

network: use 'command -v ip' to test for the ip executable

This is an improved test because it doesn't require the ip executable to be
in a specific path.

 init.d/network.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/init.d/network.in b/init.d/network.in
index 56d3e7b3..fa9f8de0 100644
--- a/init.d/network.in
+++ b/init.d/network.in
@@ -76,7 +76,7 @@ tentative()
 
 	case "$RC_UNAME" in
 	Linux)
-		[ -x /sbin/ip ] || [ -x /bin/ip ] || return 1
+		[ -n "$(command -v ip)" ] || return 1
 		[ -n "$(ip -f inet6 addr show tentative)" ]
 		;;
 	*)
@@ -174,7 +174,7 @@ runip()
 routeflush()
 {
 	if [ "$RC_UNAME" = Linux ]; then
-		if [ -x /sbin/ip ] || [ -x /bin/ip ]; then
+		if [ -n "$(command -v ip)"  ]; then
 			ip route flush scope global
 			ip route delete default 2>/dev/null
 		else
@@ -346,7 +346,7 @@ stop()
 		then
 			veinfo "$int"
 			runargs /etc/ifdown."$int" "$downcmd"
-			if [ -x /sbin/ip ] || [ -x /bin/ip ]; then
+			if [ -n "$(command -v ip)" ]; then
 				# We need to do this, otherwise we may
 				# fail to add things correctly on restart
 				ip address flush dev "$int" 2>/dev/null

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     9d05f68b51d7b31634cde30a482ec0e3da3b1c21
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Tue Dec 12 18:45:52 2017 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Dec 12 18:45:52 2017 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=9d05f68b

Do not use file tests in net-online

https://unix.stackexchange.com/questions/252002/help-testing-special-file-in-sys-class-net

This is for #189

 init.d/net-online.in | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/init.d/net-online.in b/init.d/net-online.in
index cd0cb4e2..5ea6bf64 100644
--- a/init.d/net-online.in
+++ b/init.d/net-online.in
@@ -44,13 +44,11 @@ start ()
 	ifcount=0
  	for dev in ${interfaces}; do
 		: $((ifcount += 1))
-		carrier=
-		[ -e /sys/class/net/$dev/carrier ] &&
-			read carrier < /sys/class/net/$dev/carrier
+		read carrier < /sys/class/net/$dev/carrier 2> /dev/null ||
+			carrier=
 		[ "$carrier" = 1 ] && : $((carriers += 1))
-		operstate=
-		[ -e /sys/class/net/$dev/operstate ] &&
-			read operstate < /sys/class/net/$dev/operstate
+		read operstate < /sys/class/net/$dev/operstate 2> /dev/null ||
+			operstate=
 		[ "$operstate" = up ] && : $((configured += 1))
 	done
 	[ $configured -eq $ifcount ] && [ $carriers -ge 1 ] && break

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     ee2524cd1d0305e207f7dfac52742a1d5e77ea4a
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Mon Dec 11 23:41:04 2017 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Dec 11 23:41:04 2017 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=ee2524cd

net-online: clean up quoting and test for existence

This is for #178.

 init.d/net-online.in | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/init.d/net-online.in b/init.d/net-online.in
index 41910fa0..cd0cb4e2 100644
--- a/init.d/net-online.in
+++ b/init.d/net-online.in
@@ -44,9 +44,13 @@ start ()
 	ifcount=0
  	for dev in ${interfaces}; do
 		: $((ifcount += 1))
-		read carrier < /sys/class/net/$dev/carrier 2> /dev/null
-		[ $carrier -eq 1 ] && : $((carriers += 1))
-		read operstate < /sys/class/net/$dev/operstate 2> /dev/null
+		carrier=
+		[ -e /sys/class/net/$dev/carrier ] &&
+			read carrier < /sys/class/net/$dev/carrier
+		[ "$carrier" = 1 ] && : $((carriers += 1))
+		operstate=
+		[ -e /sys/class/net/$dev/operstate ] &&
+			read operstate < /sys/class/net/$dev/operstate
 		[ "$operstate" = up ] && : $((configured += 1))
 	done
 	[ $configured -eq $ifcount ] && [ $carriers -ge 1 ] && break

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     5c81661d4758dea039860ae2481476a70e78ac47
Author:     Marcel Greter <marcel.greter <AT> ocbnet <DOT> ch>
AuthorDate: Sat Dec  9 22:18:03 2017 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Dec 11 20:46:16 2017 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=5c81661d

Gracefully handle unreadable /sys/class/net/dev/ nodes

Fixes https://bugs.gentoo.org/629228
Fixes #189
Fixes #185
Fixes #178

 init.d/net-online.in | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/init.d/net-online.in b/init.d/net-online.in
index 45041c80..41910fa0 100644
--- a/init.d/net-online.in
+++ b/init.d/net-online.in
@@ -31,7 +31,7 @@ get_interfaces()
 start ()
 {
 	local carriers configured dev gateway ifcount infinite
-	local rc state x
+	local carrier operstate rc
 
 	ebegin "Checking to see if the network is online"
 	rc=0
@@ -44,10 +44,10 @@ start ()
 	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))
+		read carrier < /sys/class/net/$dev/carrier 2> /dev/null
+		[ $carrier -eq 1 ] && : $((carriers += 1))
+		read operstate < /sys/class/net/$dev/operstate 2> /dev/null
+		[ "$operstate" = up ] && : $((configured += 1))
 	done
 	[ $configured -eq $ifcount ] && [ $carriers -ge 1 ] && break
 	sleep 1

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     0d15898f58cc254d79777c791d4798a9b2542cf2
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Tue Nov 14 19:17:01 2017 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Nov 14 19:20:49 2017 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=0d15898f

adjust mtab and localmount dependencies

localmount had mtab in its "use" dependencies; however, it makes more
sense to add "before localmount" to the mtab service and remove
"use mtab" from the localmount service.

 init.d/localmount.in | 2 +-
 init.d/mtab.in       | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/init.d/localmount.in b/init.d/localmount.in
index 6785a0be..31684191 100644
--- a/init.d/localmount.in
+++ b/init.d/localmount.in
@@ -14,7 +14,7 @@ description="Mounts disks and swap according to /etc/fstab."
 depend()
 {
 	need fsck
-	use lvm modules mtab root
+	use lvm modules root
 	after clock lvm modules root
 	keyword -docker -jail -lxc -prefix -systemd-nspawn -vserver
 }

diff --git a/init.d/mtab.in b/init.d/mtab.in
index 80ef275c..9e0c1a6e 100644
--- a/init.d/mtab.in
+++ b/init.d/mtab.in
@@ -14,6 +14,7 @@ description="Update /etc/mtab to match what the kernel knows about"
 depend()
 {
 	after clock
+	before localmount
 	need root
 	keyword -prefix -systemd-nspawn
 }

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     a15de23e5713d840d871c526b46050983dc6ea1e
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Tue Oct 10 15:56:27 2017 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Oct 10 15:56:27 2017 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=a15de23e

typo fix

 init.d/staticroute.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/init.d/staticroute.in b/init.d/staticroute.in
index d970b519..c5be6ca2 100644
--- a/init.d/staticroute.in
+++ b/init.d/staticroute.in
@@ -1,4 +1,4 @@
-S#!@BINDIR@/openrc-run
+#!@SBINDIR@/openrc-run
 # Copyright (c) 2009-2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
 # https://github.com/OpenRC/openrc/blob/master/AUTHORS

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     efa9ba485d9328f780f3e60dc18339c75974c6c6
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Mon Oct  9 20:54:06 2017 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Oct  9 20:54:06 2017 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=efa9ba48

init.d/sysfs.in: fix reference to RC_LIBEXECDIR

The sysfs init script referred to @LIBEXECDIR@ before this change, but
it is better to refer to RC_LIBEXECDIR so that we get rid of a sed
substitution.

 init.d/sysfs.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/init.d/sysfs.in b/init.d/sysfs.in
index 23e8821c..892528ca 100644
--- a/init.d/sysfs.in
+++ b/init.d/sysfs.in
@@ -118,7 +118,7 @@ cgroup1_base()
 	fi
 
 	if ! mountinfo -q /sys/fs/cgroup/openrc; then
-		local agent="@LIBEXECDIR@/sh/cgroup-release-agent.sh"
+		local agent="${RC_LIBEXECDIR}/sh/cgroup-release-agent.sh"
 		mkdir /sys/fs/cgroup/openrc
 		mount -n -t cgroup \
 			-o none,${sysfs_opts},name=openrc,release_agent="$agent" \

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     3fafd7a76e6adf15ec72a7ba5f44583eff8fab7a
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Sat Sep 16 22:02:52 2017 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Sep 16 22:02:52 2017 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=3fafd7a7

sysfs: fix cgroup hybrid mode

In hybrid mode, we should not try to mount cgroup2 if it is not
available in the kernel.

This fixes #164.

 init.d/sysfs.in | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/init.d/sysfs.in b/init.d/sysfs.in
index 9f39fb57..23e8821c 100644
--- a/init.d/sysfs.in
+++ b/init.d/sysfs.in
@@ -150,6 +150,16 @@ cgroup1_controllers()
 	return 0
 }
 
+cgroup2_base()
+{
+	local base
+	base="$(cgroup2_find_path)"
+	mkdir -p "${base}"
+	mount -t cgroup2 none -o "${sysfs_opts},nsdelegate" "${base}" 2> /dev/null ||
+		mount -t cgroup2 none -o "${sysfs_opts}" "${base}"
+	return 0
+}
+
 cgroup2_controllers()
 {
 	local active cgroup_path x y
@@ -169,13 +179,12 @@ cgroup2_controllers()
 
 cgroups_hybrid()
 {
-	grep -qw cgroup /proc/filesystems &&
-		grep -qw cgroup2 /proc/filesystems ||
-		return 0
+	grep -qw cgroup /proc/filesystems || return 0
 	cgroup1_base
-	mkdir /sys/fs/cgroup/unified
-	mount -t cgroup2 none -o "${sysfs_opts},nsdelegate" /sys/fs/cgroup/unified
-	cgroup2_controllers
+	if grep -qw cgroup2 /proc/filesystems; then
+		cgroup2_base
+		cgroup2_controllers
+	fi
 	cgroup1_controllers
 	return 0
 }
@@ -190,8 +199,8 @@ cgroups_legacy()
 
 cgroups_unified()
 {
-	grep -qw cgroup2 /proc/filesystems || return 0
-	mount -t cgroup2 none -o "${sysfs_opts},nsdelegate" /sys/fs/cgroup
+	cgroup2_base
+	cgroup2_controllers
 	return 0
 }
 

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     a511a48d77b1dcb8a3fb0dd1abddb750a152869b
Author:     Nuno Silva <nuno.m.ribeiro.silva <AT> tecnico <DOT> ulisboa <DOT> pt>
AuthorDate: Sat Jun 10 02:12:49 2017 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Jun 12 15:44:27 2017 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=a511a48d

init.d/hostname: fix default parameter syntax

The syntax for expanding a variable with a default value is
	${parameter:-word}
not
	${parameter-word}
although the latter still works for a reason I could not explain.

This fixes #143.

 init.d/hostname.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/init.d/hostname.in b/init.d/hostname.in
index c144a710..d7913bed 100644
--- a/init.d/hostname.in
+++ b/init.d/hostname.in
@@ -26,7 +26,7 @@ start()
 	else
 		# HOSTNAME variable used to be defined in caps in conf.d/hostname.
 		# It is also a magic variable in bash.
-		h=${hostname-${HOSTNAME}} # checkbashisms: false positive
+		h=${hostname:-${HOSTNAME}} # checkbashisms: false positive (HOSTNAME var)
 	fi
 	if [ -z "$h" ]; then
 		einfo "Using default system hostname"

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     1e5322e5c55ec744a2cdcc3342ef6547eab7c46f
Author:     Nuno Silva <nuno.m.ribeiro.silva <AT> tecnico <DOT> ulisboa <DOT> pt>
AuthorDate: Sat Jun 10 02:05:09 2017 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Jun 12 15:43:55 2017 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=1e5322e5

init.d/hostname: fix indentation

This is for #143.

 init.d/hostname.in | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/init.d/hostname.in b/init.d/hostname.in
index af01241b..c144a710 100644
--- a/init.d/hostname.in
+++ b/init.d/hostname.in
@@ -11,7 +11,8 @@
 
 description="Sets the hostname of the machine."
 
-depend() {
+depend()
+{
 	after clock
 	keyword -docker -lxc -prefix -systemd-nspawn
 }
@@ -20,8 +21,8 @@ start()
 {
 	local h source x
 	if [ -s @SYSCONFDIR@/hostname ] && [ -r @SYSCONFDIR@/hostname ]; then
-	read h x <@SYSCONFDIR@/hostname
-	source=" from @SYSCONFDIR@/hostname"
+		read h x <@SYSCONFDIR@/hostname
+		source="from @SYSCONFDIR@/hostname"
 	else
 		# HOSTNAME variable used to be defined in caps in conf.d/hostname.
 		# It is also a magic variable in bash.

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     1801561c2d36c330df7fd02c7508f503a61ff5ba
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Fri Jun  2 23:21:53 2017 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Jun  5 16:52:50 2017 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=1801561c

init.d/bootmisc: use openrc-shutdown instead of halt to write halt record

This fixes #139 and fixes #128.
and fixes #124.

 init.d/bootmisc.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/init.d/bootmisc.in b/init.d/bootmisc.in
index 40d3c933..bf79f03d 100644
--- a/init.d/bootmisc.in
+++ b/init.d/bootmisc.in
@@ -241,7 +241,7 @@ stop()
 {
 	# Write a halt record if we're shutting down
 	if [ "$RC_RUNLEVEL" = shutdown ]; then
-		[ "$RC_UNAME" = Linux ] && halt -w
+		[ "$RC_UNAME" = Linux ] && openrc-shutdown -w
 		if [ "$RC_SYS" = OPENVZ ]; then
 			yesno $RC_REBOOT && printf "" >/reboot
 		fi

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     6f88ee4ec6f59e545346a7422facc3e5b6adac04
Author:     i.Dark_Templar <darktemplar <AT> dark-templar-archives <DOT> net>
AuthorDate: Mon Apr 10 14:07:17 2017 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Apr 10 15:15:28 2017 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=6f88ee4e

bootmisc: do not remove ld-elf32.so.hints

File /var/run/ld-elf32.so.hints is used on FreeBSD 64bit multilib
This fixes #125.

 init.d/bootmisc.in | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/init.d/bootmisc.in b/init.d/bootmisc.in
index efc1c572..40d3c933 100644
--- a/init.d/bootmisc.in
+++ b/init.d/bootmisc.in
@@ -71,7 +71,8 @@ cleanup_var_run_dir()
 	ebegin "Cleaning /var/run"
 	for x in $(find /var/run ! -type d ! -name utmp \
 		! -name random-seed ! -name dev.db \
-		! -name ld-elf.so.hints ! -name ld.so.hints);
+		! -name ld-elf.so.hints ! -name ld-elf32.so.hints \
+		! -name ld.so.hints);
 	do
 		# Clean stale sockets
 		if [ -S "$x" ]; then

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     79a9edc73068244ad843f2edbe4206ce696c91c8
Author:     i.Dark_Templar <darktemplar <AT> dark-templar-archives <DOT> net>
AuthorDate: Wed Apr  5 13:54:53 2017 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Apr  5 13:54:53 2017 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=79a9edc7

Fix make install on FreeBSD: don't try to install /etc/init.d/modules twice

 init.d/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/init.d/Makefile b/init.d/Makefile
index 3ecab06b..c6cdbd97 100644
--- a/init.d/Makefile
+++ b/init.d/Makefile
@@ -19,7 +19,7 @@ SRCS-FreeBSD=	hostid.in modules.in moused.in newsyslog.in pf.in rarpd.in \
 		rc-enabled.in rpcbind.in savecore.in syslogd.in
 # These are FreeBSD specific
 SRCS-FreeBSD+=	adjkerntz.in devd.in dumpon.in encswap.in ipfw.in \
-		modules.in modules-load.in mixer.in nscd.in powerd.in syscons.in
+		modules-load.in mixer.in nscd.in powerd.in syscons.in
 
 SRCS-Linux=	agetty.in binfmt.in devfs.in dmesg.in hwclock.in consolefont.in \
 	keymaps.in killprocs.in modules.in modules-load.in mount-ro.in mtab.in \

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     55a87a30ec845eb725e8a923c8f8eb7aa75baa72
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Fri Mar 31 21:21:28 2017 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Mar 31 21:21:28 2017 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=55a87a30

init.d/agetty.in: add -prefix keyword

 init.d/agetty.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/init.d/agetty.in b/init.d/agetty.in
index 297733cb..d2ba9449 100644
--- a/init.d/agetty.in
+++ b/init.d/agetty.in
@@ -19,6 +19,7 @@ pidfile="/run/${RC_SVCNAME}.pid"
 
 depend() {
 	after local
+	keyword -prefix
 }
 
 start_pre() {

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     a912029462ae988ab4e2a96a0958e54a3c2e822f
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Fri Mar 31 18:39:42 2017 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Mar 31 18:39:42 2017 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=a9120294

init.d/mount-ro: change dependency on killprocs and savecache to after

killprocs always succeeds and savecache is not required by mount-ro, so
we can just start after both of these have run.

 init.d/mount-ro.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/init.d/mount-ro.in b/init.d/mount-ro.in
index 3553b7a3..aa7a57cb 100644
--- a/init.d/mount-ro.in
+++ b/init.d/mount-ro.in
@@ -13,7 +13,7 @@ description="Re-mount filesytems read-only for a clean reboot."
 
 depend()
 {
-	need killprocs savecache
+	after killprocs savecache
 	keyword -docker -lxc -openvz -prefix -systemd-nspawn -vserver
 }
 

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     51a292e09b9362f13d5747d4eedaa521ddf9ce72
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Tue Mar 28 22:52:53 2017 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Mar 28 22:52:53 2017 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=51a292e0

init.d: add agetty to ignore patterns

 init.d/.gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/init.d/.gitignore b/init.d/.gitignore
index b8cbb487..95ad4aad 100644
--- a/init.d/.gitignore
+++ b/init.d/.gitignore
@@ -1,3 +1,4 @@
+agetty
 binfmt
 modules-load
 bootmisc

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     9bd63b5d4a16601712a65eb8962214cdd4d26ce5
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Thu Mar 16 15:16:39 2017 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Mar 16 15:16:39 2017 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=9bd63b5d

update dependencies for clock service

The clock services had a very long list of "before" dependencies that
referred to other services within OpenRC. For ease of maintenance,
convert these to "after clock" dependencies in the individual services.

 init.d/adjkerntz.in    | 1 +
 init.d/binfmt.in       | 2 +-
 init.d/devdb.in        | 1 +
 init.d/dumpon.in       | 1 +
 init.d/fsck.in         | 1 +
 init.d/hostid.in       | 1 +
 init.d/hostname.in     | 1 +
 init.d/hwclock.in      | 3 ---
 init.d/keymaps.in      | 2 +-
 init.d/localmount.in   | 2 +-
 init.d/loopback.in     | 1 +
 init.d/mtab.in         | 1 +
 init.d/network.in      | 2 +-
 init.d/newsyslog.in    | 1 +
 init.d/procfs.in       | 1 +
 init.d/root.in         | 1 +
 init.d/savecore.in     | 1 +
 init.d/staticroute.in  | 4 ++--
 init.d/swap-blk.in     | 1 +
 init.d/swap.in         | 1 +
 init.d/swclock.in      | 4 ----
 init.d/syscons.in      | 1 +
 init.d/sysctl.in       | 1 +
 init.d/syslogd.in      | 2 +-
 init.d/termencoding.in | 2 +-
 init.d/ttys.in         | 2 +-
 init.d/urandom.in      | 1 +
 init.d/wscons.in       | 1 +
 28 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/init.d/adjkerntz.in b/init.d/adjkerntz.in
index 7f8b0076..ba373c14 100644
--- a/init.d/adjkerntz.in
+++ b/init.d/adjkerntz.in
@@ -23,6 +23,7 @@ fi
 
 depend()
 {
+	after swclock
 	provide clock
 	# BSD adjkerntz needs to be able to write to /etc
 	if [ "$clock" = "UTC" -a -e /etc/wall_cmos_clock ] ||

diff --git a/init.d/binfmt.in b/init.d/binfmt.in
index 4afb83be..67120eaf 100644
--- a/init.d/binfmt.in
+++ b/init.d/binfmt.in
@@ -13,7 +13,7 @@ description="Register misc binary format handlers"
 
 depend()
 {
-	after procfs
+	after clock procfs
 	use modules devfs
 	keyword -docker -lxc -openvz -prefix -systemd-nspawn -vserver
 }

diff --git a/init.d/devdb.in b/init.d/devdb.in
index 3fdf5306..a6d38066 100644
--- a/init.d/devdb.in
+++ b/init.d/devdb.in
@@ -13,6 +13,7 @@ description="Creates the dev database"
 
 depend()
 {
+	after clock
 	need localmount
 }
 

diff --git a/init.d/dumpon.in b/init.d/dumpon.in
index 349276e3..8a72e69d 100644
--- a/init.d/dumpon.in
+++ b/init.d/dumpon.in
@@ -12,6 +12,7 @@
 description="Configures a specific kernel dump device."
 
 depend() {
+	after clock
 	need swap
 	keyword -jail -prefix
 }

diff --git a/init.d/fsck.in b/init.d/fsck.in
index 7d12482f..7052d808 100644
--- a/init.d/fsck.in
+++ b/init.d/fsck.in
@@ -15,6 +15,7 @@ _IFS="
 
 depend()
 {
+	after clock
 	use dev clock modules
 	keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn -timeout -vserver -uml
 }

diff --git a/init.d/hostid.in b/init.d/hostid.in
index ec6f6979..107b7f5c 100644
--- a/init.d/hostid.in
+++ b/init.d/hostid.in
@@ -15,6 +15,7 @@ extra_commands="reset"
 depend()
 {
 	use root
+	after clock
 	before devd net
 	keyword -jail -prefix
 }

diff --git a/init.d/hostname.in b/init.d/hostname.in
index 253d338d..af01241b 100644
--- a/init.d/hostname.in
+++ b/init.d/hostname.in
@@ -12,6 +12,7 @@
 description="Sets the hostname of the machine."
 
 depend() {
+	after clock
 	keyword -docker -lxc -prefix -systemd-nspawn
 }
 

diff --git a/init.d/hwclock.in b/init.d/hwclock.in
index 3bfcab1d..0fce88f1 100644
--- a/init.d/hwclock.in
+++ b/init.d/hwclock.in
@@ -33,9 +33,6 @@ depend()
 	want modules
 	if yesno $clock_adjfile; then
 		use root
-	else
-		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
 }

diff --git a/init.d/keymaps.in b/init.d/keymaps.in
index dbe054ae..2cc8a39f 100644
--- a/init.d/keymaps.in
+++ b/init.d/keymaps.in
@@ -14,7 +14,7 @@ description="Applies a keymap for the consoles."
 depend()
 {
 	need localmount termencoding
-	after bootmisc
+	after bootmisc clock
 	keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu
 }
 

diff --git a/init.d/localmount.in b/init.d/localmount.in
index 9920dc9e..6785a0be 100644
--- a/init.d/localmount.in
+++ b/init.d/localmount.in
@@ -15,7 +15,7 @@ depend()
 {
 	need fsck
 	use lvm modules mtab root
-	after lvm modules root
+	after clock lvm modules root
 	keyword -docker -jail -lxc -prefix -systemd-nspawn -vserver
 }
 

diff --git a/init.d/loopback.in b/init.d/loopback.in
index 706ea797..70faf2b8 100644
--- a/init.d/loopback.in
+++ b/init.d/loopback.in
@@ -13,6 +13,7 @@ description="Configures the loopback interface."
 
 depend()
 {
+	after clock
 	keyword -jail -prefix -systemd-nspawn -vserver
 }
 

diff --git a/init.d/mtab.in b/init.d/mtab.in
index 99eb90d0..80ef275c 100644
--- a/init.d/mtab.in
+++ b/init.d/mtab.in
@@ -13,6 +13,7 @@ description="Update /etc/mtab to match what the kernel knows about"
 
 depend()
 {
+	after clock
 	need root
 	keyword -prefix -systemd-nspawn
 }

diff --git a/init.d/network.in b/init.d/network.in
index de31695f..56d3e7b3 100644
--- a/init.d/network.in
+++ b/init.d/network.in
@@ -18,7 +18,7 @@ __nl="
 depend()
 {
 	need localmount
-	after bootmisc
+	after bootmisc clock
 	if [ -n "$(interfaces)" ]; then
 		provide net
 	fi

diff --git a/init.d/newsyslog.in b/init.d/newsyslog.in
index da1b0ab5..bcfff862 100644
--- a/init.d/newsyslog.in
+++ b/init.d/newsyslog.in
@@ -13,6 +13,7 @@ required_files="/etc/newsyslog.conf"
 
 depend()
 {
+	after clock
 	need localmount
 	keyword -prefix
 }

diff --git a/init.d/procfs.in b/init.d/procfs.in
index 2abeb03a..343b30d1 100644
--- a/init.d/procfs.in
+++ b/init.d/procfs.in
@@ -13,6 +13,7 @@ description="Mounts misc filesystems in /proc."
 
 depend()
 {
+	after clock
 	use devfs
 	want modules
 	need localmount

diff --git a/init.d/root.in b/init.d/root.in
index ec22699d..9d053448 100644
--- a/init.d/root.in
+++ b/init.d/root.in
@@ -13,6 +13,7 @@ description="Mount the root fs read/write"
 
 depend()
 {
+	after clock
 	need fsck
 	keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn -vserver
 }

diff --git a/init.d/savecore.in b/init.d/savecore.in
index 8640fe54..b568d5ab 100644
--- a/init.d/savecore.in
+++ b/init.d/savecore.in
@@ -14,6 +14,7 @@ description="Saves a kernel dump."
 depend()
 {
 	need dumpon localmount
+	after clock
 	before encswap
 	keyword -jail -prefix
 }

diff --git a/init.d/staticroute.in b/init.d/staticroute.in
index 85f90597..d970b519 100644
--- a/init.d/staticroute.in
+++ b/init.d/staticroute.in
@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+S#!@BINDIR@/openrc-run
 # Copyright (c) 2009-2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
 # https://github.com/OpenRC/openrc/blob/master/AUTHORS
@@ -14,9 +14,9 @@
 description="Configures static routes."
 __nl="
 "
-
 depend()
 {
+	after clock
 	provide net
 	use network
 	keyword -jail -prefix -vserver

diff --git a/init.d/swap-blk.in b/init.d/swap-blk.in
index 277cc88d..415cfaf6 100644
--- a/init.d/swap-blk.in
+++ b/init.d/swap-blk.in
@@ -11,6 +11,7 @@
 
 depend()
 {
+	after clock
 	before fsck
 	keyword -jail -prefix
 }

diff --git a/init.d/swap.in b/init.d/swap.in
index 63087e86..546cb5f5 100644
--- a/init.d/swap.in
+++ b/init.d/swap.in
@@ -11,6 +11,7 @@
 
 depend()
 {
+	after clock
 	before localmount
 	keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn -vserver
 }

diff --git a/init.d/swclock.in b/init.d/swclock.in
index 67baaab0..b5556eb5 100644
--- a/init.d/swclock.in
+++ b/init.d/swclock.in
@@ -13,10 +13,6 @@ description="Sets the local clock to the mtime of a given file."
 
 depend()
 {
-	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
 }

diff --git a/init.d/syscons.in b/init.d/syscons.in
index c915762b..9fde54e9 100644
--- a/init.d/syscons.in
+++ b/init.d/syscons.in
@@ -10,6 +10,7 @@
 # except according to the terms contained in the LICENSE file.
 
 depend() {
+	after clock
 	need localmount
 	keyword -jail -prefix
 }

diff --git a/init.d/sysctl.in b/init.d/sysctl.in
index cb756f3a..ae9f17fe 100644
--- a/init.d/sysctl.in
+++ b/init.d/sysctl.in
@@ -11,6 +11,7 @@
 
 depend()
 {
+	after clock
 	before bootmisc logger
 	keyword -prefix -systemd-nspawn -vserver
 }

diff --git a/init.d/syslogd.in b/init.d/syslogd.in
index 7ddde9a6..504b953b 100644
--- a/init.d/syslogd.in
+++ b/init.d/syslogd.in
@@ -22,6 +22,6 @@ depend()
 	provide logger
 	use net newsyslog
 	need localmount
-	after bootmisc
+	after bootmisc clock
 	keyword -prefix
 }

diff --git a/init.d/termencoding.in b/init.d/termencoding.in
index 9f33eb6c..86f5b588 100644
--- a/init.d/termencoding.in
+++ b/init.d/termencoding.in
@@ -18,7 +18,7 @@ depend()
 {
 	keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu
 	use root
-	after bootmisc
+	after bootmisc clock
 }
 
 start()

diff --git a/init.d/ttys.in b/init.d/ttys.in
index db9a8f01..e32f3e69 100644
--- a/init.d/ttys.in
+++ b/init.d/ttys.in
@@ -11,7 +11,7 @@
 
 depend()
 {
-	after fsck
+	after clock fsck
 	keyword -prefix
 }
 

diff --git a/init.d/urandom.in b/init.d/urandom.in
index 54706ac9..91b54f3a 100644
--- a/init.d/urandom.in
+++ b/init.d/urandom.in
@@ -14,6 +14,7 @@ description="Initializes the random number generator."
 
 depend()
 {
+	after clock
 	need localmount
 	keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn
 }

diff --git a/init.d/wscons.in b/init.d/wscons.in
index cf5aee99..1f4acf01 100644
--- a/init.d/wscons.in
+++ b/init.d/wscons.in
@@ -11,6 +11,7 @@
 
 depend()
 {
+	after clock
 	need localmount
 	keyword -prefix
 }

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     c333707cba356f4cacfd58a6fcc78f7c073dddcd
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Tue Mar 14 23:04:31 2017 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Mar 14 23:04:31 2017 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=c333707c

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.

 init.d/hwclock.in | 3 ++-
 init.d/swclock.in | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/init.d/hwclock.in b/init.d/hwclock.in
index f78cc7c3..3bfcab1d 100644
--- a/init.d/hwclock.in
+++ b/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
 }

diff --git a/init.d/swclock.in b/init.d/swclock.in
index 9ceba444..67baaab0 100644
--- a/init.d/swclock.in
+++ b/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
 }

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     5f5b1f7cbefd0bc14352e86a9c33260266f98d9b
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Sun Mar 12 18:55:49 2017 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Mar 12 18:55:49 2017 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=5f5b1f7c

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.

 init.d/sysfs.in | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/init.d/sysfs.in b/init.d/sysfs.in
index 8030ea84..e493f584 100644
--- a/init.d/sysfs.in
+++ b/init.d/sysfs.in
@@ -98,16 +98,12 @@ mount_misc()
 	fi
 
 	# set up kernel support for efivarfs
-	# The presence of /sys/firmware/efi indicates that the system was
-	# booted in efi mode.
-	if [ -d /sys/firmware/efi ]; then
-		if [ -d /sys/firmware/efi/efivars ] &&
-			! mountinfo -q /sys/firmware/efi/efivars; then
-			ebegin "Mounting efivarfs filesystem"
-			mount -n -t efivarfs -o ${sysfs_opts} \
-				efivarfs /sys/firmware/efi/efivars
-			eend $?
-		fi
+	if [ -d /sys/firmware/efi/efivars ] &&
+		! mountinfo -q /sys/firmware/efi/efivars; then
+		ebegin "Mounting efivarfs filesystem"
+		mount -n -t efivarfs -o ${sysfs_opts} \
+			efivarfs /sys/firmware/efi/efivars 2> /dev/null
+		eend 0
 	fi
 }
 

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     21ca2b746cce67e2b3578fb7015c9d4c243e3a0c
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Wed Mar  8 16:41:31 2017 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Mar  8 16:44:10 2017 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=21ca2b74

init.d/sysfs: drop modules completely from the dependencies

This is for #112.

 init.d/sysfs.in | 1 -
 1 file changed, 1 deletion(-)

diff --git a/init.d/sysfs.in b/init.d/sysfs.in
index ff0c4e7d..8030ea84 100644
--- a/init.d/sysfs.in
+++ b/init.d/sysfs.in
@@ -15,7 +15,6 @@ sysfs_opts=nodev,noexec,nosuid
 
 depend()
 {
-	use modules
 	keyword -docker -lxc -prefix -systemd-nspawn -vserver
 }
 

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     6a79aef0159d7035778fd852b26ecfac903cd029
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Tue Mar  7 23:40:18 2017 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Mar  7 23:49:42 2017 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=6a79aef0

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.

 init.d/sysfs.in | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/init.d/sysfs.in b/init.d/sysfs.in
index 6d6ec62c..ff0c4e7d 100644
--- a/init.d/sysfs.in
+++ b/init.d/sysfs.in
@@ -15,7 +15,7 @@ sysfs_opts=nodev,noexec,nosuid
 
 depend()
 {
-	want modules
+	use modules
 	keyword -docker -lxc -prefix -systemd-nspawn -vserver
 }
 
@@ -102,19 +102,12 @@ mount_misc()
 	# The presence of /sys/firmware/efi indicates that the system was
 	# booted in efi mode.
 	if [ -d /sys/firmware/efi ]; then
-		if [ ! -d /sys/firmware/efi/efivars ] &&
-			modprobe -q efivarfs; then
-			ewarn "The efivarfs module needs to be configured in " \
-				  "@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
+			ebegin "Mounting efivarfs filesystem"
+			mount -n -t efivarfs -o ${sysfs_opts} \
+				efivarfs /sys/firmware/efi/efivars
+			eend $?
 		fi
 	fi
 }

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     eea4decdd1c84e4b8775a255d8ed85bce5eb40a5
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Mon Feb 27 01:09:56 2017 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Feb 27 01:09:56 2017 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=eea4decd

net-online: typo fix

 init.d/net-online.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/init.d/net-online.in b/init.d/net-online.in
index 31af4dd1..45041c80 100644
--- a/init.d/net-online.in
+++ b/init.d/net-online.in
@@ -56,7 +56,7 @@ start ()
  ! $infinite && [ $timeout -eq 0 ] && rc=1
  include_ping_test=${include_ping_test:-${ping_default_gateway}}
  if [ -n "${ping_default_gateway}" ]; then
- ewarn "ping_default_gateway is deprecated, please use include_ping_test'
+ ewarn "ping_default_gateway is deprecated, please use include_ping_test"
  fi
  if [ $rc -eq 0 ] && yesno ${include_ping_test:-no}; then
  	ping_test_host="${ping_test_host:-google.com}"

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     4a269674b765e5267f024fa55c8644480a7304ea
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Tue Feb 28 23:44:06 2017 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Feb 28 23:44:06 2017 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=4a269674

make sure netmount and localmount start after root

 init.d/localmount.in | 4 ++--
 init.d/netmount.in   | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/init.d/localmount.in b/init.d/localmount.in
index cae80c34..9920dc9e 100644
--- a/init.d/localmount.in
+++ b/init.d/localmount.in
@@ -14,8 +14,8 @@ description="Mounts disks and swap according to /etc/fstab."
 depend()
 {
 	need fsck
-	use lvm modules mtab
-	after lvm modules
+	use lvm modules mtab root
+	after lvm modules root
 	keyword -docker -jail -lxc -prefix -systemd-nspawn -vserver
 }
 

diff --git a/init.d/netmount.in b/init.d/netmount.in
index 7be08e11..96f5d3e0 100644
--- a/init.d/netmount.in
+++ b/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
 }
 

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     d5c3b85e3fbddbba149687244d607fcdae222f95
Author:     Doug Freed <dwfreed <AT> mtu <DOT> edu>
AuthorDate: Wed Dec 21 18:00:02 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Dec 21 18:00:02 2016 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=d5c3b85e

loopback: drop explicit route for BSD too

 init.d/loopback.in | 1 -
 1 file changed, 1 deletion(-)

diff --git a/init.d/loopback.in b/init.d/loopback.in
index 61f21cd..706ea79 100644
--- a/init.d/loopback.in
+++ b/init.d/loopback.in
@@ -29,7 +29,6 @@ start()
 	else
 		ebegin "Bringing up network interface lo0"
 		ifconfig lo0 127.0.0.1 netmask 255.0.0.0
-		route -q add -inet 127.0.0.0 -netmask 255.0.0.0 127.0.0.1
 	fi
 	eend $?
 }

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     abe552b969b6601f47ba0474f683d8cd80d53c9d
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Sun Dec 18 01:13:48 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Dec 18 01:21:13 2016 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=abe552b9

modules: get rid of printing each module on Linux

Now that we respect the module blacklists, don't print every module we
try to load, because it might not end up loaded due to the blacklist,
and modprobe doesn't consider that a failure.

 init.d/modules.in | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/init.d/modules.in b/init.d/modules.in
index 3431c4a..2eab77f 100644
--- a/init.d/modules.in
+++ b/init.d/modules.in
@@ -31,7 +31,7 @@ FreeBSD_modules()
 
 Linux_modules()
 {
-	# Should not fail if kernel do not have module
+	# Should not fail if kernel does not have module
 	# support compiled in ...
 	[ ! -f /proc/modules ] && return 0
 
@@ -48,22 +48,21 @@ Linux_modules()
 		x=${x%.*}
 	done
 
-	local list= x= xx= y= args= mpargs= cnt=0 a=
+	local list= x= xx= y= args= mpargs= a=
 	for x in $kv_variant_list ; do
 		eval list=\$modules_$(shell_var "$x")
 		[ -n "$list" ] && break
 	done
 	[ -z "$list" ] && list=$modules
 
+	[ -n "$list" ] && ebegin "Loading kernel modules"
 	for x in $list; do
 		a=${x#*:}
 		if [ "$a" = "$x" ]; then
 			unset mpargs
-			ebegin "Loading module $x"
 		else
 			x=${x%%:*}
 			mpargs="-o $a"
-			ebegin "Loading module $x as $a"
 		fi
 		aa=$(shell_var "$a")
 		xx=$(shell_var "$x")
@@ -75,10 +74,9 @@ Linux_modules()
 		done
 		[ -z "$args" ] && eval args=\$module_${aa}_args
 		[ -z "$args" ] && eval args=\$module_${xx}_args
-		eval modprobe --use-blacklist -q "$mpargs" "$x" "$args"
-		eend $? "Failed to load $x" && : $(( cnt += 1 ))
+		eval modprobe --use-blacklist --verbose "$mpargs" "$x" "$args"
 	done
-	einfo "Autoloaded $cnt module(s)"
+	[ -n "$list" ] && eend
 }
 
 start()

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     5b7e3490ef2ce96c35e6c18b4c64e8c61586bb7a
Author:     Alan Somers <asomers <AT> gmail <DOT> com>
AuthorDate: Sat Dec 17 05:51:13 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Dec 17 18:35:58 2016 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=5b7e3490

Localmount shouldn't mount remote filesystems

The /etc/init.d/localmount script has a syntax error that causes it to
attempt to mount remote filesystems, causing the boot to fail. The
script appends a "no" to each remote filesystem type, but it should only
be append the "no" to the beginning of the list.  This patch fixes
localmount on FreeBSD 12.0.  A review of the mount(8) manpage on Ubuntu
12.04 suggests that this patch is correct for Linux, too.

 init.d/localmount.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/init.d/localmount.in b/init.d/localmount.in
index c953524..f02f929 100644
--- a/init.d/localmount.in
+++ b/init.d/localmount.in
@@ -24,7 +24,7 @@ start()
 	# Mount local filesystems in /etc/fstab.
 	local critical= types="noproc" x= no_netdev= rc=
 	for x in $net_fs_list $extra_net_fs_list; do
-		types="${types},no${x}"
+		types="${types},${x}"
 	done
 
 	if [ "$RC_UNAME" = Linux ]; then

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     72c0824961fc257b634a9439496e04d1b3392ef1
Author:     Doug Freed <dwfreed <AT> mtu <DOT> edu>
AuthorDate: Sat Dec 17 18:39:53 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Dec 17 18:39:53 2016 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=72c08249

localmount: add comment about types variable

 init.d/localmount.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/init.d/localmount.in b/init.d/localmount.in
index f02f929..cae80c3 100644
--- a/init.d/localmount.in
+++ b/init.d/localmount.in
@@ -22,6 +22,7 @@ depend()
 start()
 {
 	# Mount local filesystems in /etc/fstab.
+	# The types variable must start with no, and must be a type
 	local critical= types="noproc" x= no_netdev= rc=
 	for x in $net_fs_list $extra_net_fs_list; do
 		types="${types},${x}"

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     4f9bd7e4db185ce6debbebb5242344d8ffadc3ae
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Thu Nov  3 17:47:01 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Nov  3 17:47:01 2016 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=4f9bd7e4

init.d/loopback.in: drop the route to the loopback interface on Linux

This is related to #103.

 init.d/loopback.in | 2 --
 1 file changed, 2 deletions(-)

diff --git a/init.d/loopback.in b/init.d/loopback.in
index 59bdae2..61f21cd 100644
--- a/init.d/loopback.in
+++ b/init.d/loopback.in
@@ -22,11 +22,9 @@ start()
 		ebegin "Bringing up network interface lo"
 		if command -v ip > /dev/null 2>&1; then
 			ip addr add 127.0.0.1/8 dev lo brd +
-			ip route add 127.0.0.0/8 dev lo
 			ip link set lo up
 		else
 			ifconfig lo 127.0.0.1 netmask 255.0.0.0
-			route add -net 127.0.0.0 netmask 255.0.0.0 gw 127.0.0.1
 		fi
 	else
 		ebegin "Bringing up network interface lo0"

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     bf539f2196290864ce5c5fd0d679b74ee016e2da
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Thu Nov  3 17:29:21 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Nov  3 17:29:21 2016 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=bf539f21

init.d/mount-ro: do not remount /usr read only if it is premounted

X-Gentoo-Bug: 573760
X-Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=573760

 init.d/mount-ro.in | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/init.d/mount-ro.in b/init.d/mount-ro.in
index 589f1a2..3553b7a 100644
--- a/init.d/mount-ro.in
+++ b/init.d/mount-ro.in
@@ -34,6 +34,9 @@ start()
 
 	local m="/dev|/dev/.*|/proc|/proc.*|/sys|/sys/.*|/run|${rc_svcdir}" x= fs=
 	m="$m|/bin|/sbin|/lib(32|64)?|/libexec"
+	if [ -e "$rc_svcdir"/usr_premounted ]; then
+		m="$m|/usr"
+	fi
 	# RC_NO_UMOUNTS is an env var that can be set by plugins
 	local IFS="$IFS:"
 	for x in $no_umounts $RC_NO_UMOUNTS; do

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     f53c8baef3a6215077c00901759cbbcbe8f10e9b
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Thu Nov  3 16:18:20 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Nov  3 16:18:20 2016 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=f53c8bae

init.d/net-online: remove interfaces and timeout from local declarations

X-Gentoo-Bug:  598621
X-Gentoo-Bug-URL:  https://bugs.gentoo.org/show_bug.cgi?id=598621

 init.d/net-online.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/init.d/net-online.in b/init.d/net-online.in
index 3e18ba9..dd3548d 100644
--- a/init.d/net-online.in
+++ b/init.d/net-online.in
@@ -42,8 +42,8 @@ get_default_gateway()
 
 start ()
 {
-	local carriers configured dev gateway ifcount infinite interfaces
-	local rc state timeout x
+	local carriers configured dev gateway ifcount infinite
+	local rc state x
 
 	ebegin "Checking to see if the network is online"
 	rc=0

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     deaae7ab5c499191426cec81f6e803c972f0cca3
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Thu Oct  6 03:43:56 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Oct  6 03:48:17 2016 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=deaae7ab

init.d/sysfs: load efivarfs module when booting in efi mode:1

The presence of /sys/firmware/efi is used to indicate that the system
was booted in efi mode.

 init.d/sysfs.in | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/init.d/sysfs.in b/init.d/sysfs.in
index 7183e5d..6d6ec62 100644
--- a/init.d/sysfs.in
+++ b/init.d/sysfs.in
@@ -99,17 +99,22 @@ mount_misc()
 	fi
 
 	# set up kernel support for efivarfs
-	if [ ! -d /sys/firmware/efi/efivars ] && modprobe -q efivarfs; then
-		ewarn "The efivarfs module needs to be configured in " \
-			  "@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 $?
+	# The presence of /sys/firmware/efi indicates that the system was
+	# booted in efi mode.
+	if [ -d /sys/firmware/efi ]; then
+		if [ ! -d /sys/firmware/efi/efivars ] &&
+			modprobe -q efivarfs; then
+			ewarn "The efivarfs module needs to be configured in " \
+				  "@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
 }

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     3d2c2f0b871944492036d04b0c220ccba1fa2dd5
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Tue Oct  4 23:18:05 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Oct  4 23:18:17 2016 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=3d2c2f0b

init.d/sysfs: fix efivarfs module test

 init.d/sysfs.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/init.d/sysfs.in b/init.d/sysfs.in
index acaae16..7183e5d 100644
--- a/init.d/sysfs.in
+++ b/init.d/sysfs.in
@@ -99,7 +99,7 @@ mount_misc()
 	fi
 
 	# set up kernel support for efivarfs
-	if [ ! -d /sys/module/efivarfs ] && modprobe -q efivarfs; then
+	if [ ! -d /sys/firmware/efi/efivars ] && modprobe -q efivarfs; then
 		ewarn "The efivarfs module needs to be configured in " \
 			  "@SYSCONFDIR@/conf.d/modules or built in"
 	fi

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     6a0c033a64ce18056625cd37a94b9810dc5784e3
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Tue Oct  4 16:51:24 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Oct  4 17:06:58 2016 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=6a0c033a

init.d/sysfs: fix efivarfs handling

Separate loading the module, if it isn't built in or loaded, from
mounting the file system.

This also makes sure the warning about configuring the module in
/etc/conf.d/modules or building it in is displayed only if it is loaded
successfully.

X-Gentoo-Bug: 595836
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=595836

 init.d/sysfs.in | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/init.d/sysfs.in b/init.d/sysfs.in
index b9478f8..acaae16 100644
--- a/init.d/sysfs.in
+++ b/init.d/sysfs.in
@@ -98,15 +98,13 @@ mount_misc()
 		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
-	if [ -d /sys/firmware/efi/efivars ] \
-		&& ! mountinfo -q /sys/firmware/efi/efivars; then
-		if modprobe -q efivarfs; then
-			ewarn "The efivarfs module needs to be configured in" \
-				"@SYSCONFDIR@/conf.d/modules or built in"
-		fi
+	# set up kernel support for efivarfs
+	if [ ! -d /sys/module/efivarfs ] && modprobe -q efivarfs; then
+		ewarn "The efivarfs module needs to be configured in " \
+			  "@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} \

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     2b115f3879bd2cbb5d525349f47391d412de2d62
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Tue Oct  4 16:51:24 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Oct  4 16:51:24 2016 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=2b115f38

init.d/sysfs: fix efivarfs handling

Separate loading the module, if it isn't built in or loaded, from
mounting the file system.

This also makes sure the warning about configuring the module in
/etc/conf.d/modules or building it in is displayed only if it is loaded
successfully.

X-Gentoo-Bug: 595836
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=595836

 init.d/sysfs.in | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/init.d/sysfs.in b/init.d/sysfs.in
index b9478f8..7183e5d 100644
--- a/init.d/sysfs.in
+++ b/init.d/sysfs.in
@@ -98,15 +98,13 @@ mount_misc()
 		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
-	if [ -d /sys/firmware/efi/efivars ] \
-		&& ! mountinfo -q /sys/firmware/efi/efivars; then
-		if modprobe -q efivarfs; then
-			ewarn "The efivarfs module needs to be configured in" \
-				"@SYSCONFDIR@/conf.d/modules or built in"
-		fi
+	# set up kernel support for efivarfs
+	if [ ! -d /sys/firmware/efi/efivars ] && modprobe -q efivarfs; then
+		ewarn "The efivarfs module needs to be configured in " \
+			  "@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} \

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     61882821e0d6110a2ca2f67fad7c362983a85cf0
Author:     Doug Freed <dwfreed <AT> mtu <DOT> edu>
AuthorDate: Wed Sep 28 19:00:40 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Sep 28 19:00:40 2016 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=61882821

init.d: Clean up some bad ewarn output

 init.d/hwclock.in    | 4 ++--
 init.d/localmount.in | 4 ++--
 init.d/procfs.in     | 4 ++--
 init.d/sysfs.in      | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/init.d/hwclock.in b/init.d/hwclock.in
index e69c561..f78cc7c 100644
--- a/init.d/hwclock.in
+++ b/init.d/hwclock.in
@@ -106,8 +106,8 @@ start()
 				modprobe -q $x && rtc_exists && modname="$x" && break
 			done
 			[ -n "$modname" ] &&
-				ewarn "The $modname module needs to be configured in \
-					@SYSCONFDIR@/conf.d/modules or built in."
+				ewarn "The $modname module needs to be configured in" \
+					"@SYSCONFDIR@/conf.d/modules or built in."
 		fi
 	fi
 

diff --git a/init.d/localmount.in b/init.d/localmount.in
index d2c9321..c953524 100644
--- a/init.d/localmount.in
+++ b/init.d/localmount.in
@@ -99,8 +99,8 @@ stop()
 				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"
+					ewarn "Failed to remove branch $aufs_branch from aufs" \
+					"$aufs_mount_point"
 				fi
 				eoutdent
 				sync

diff --git a/init.d/procfs.in b/init.d/procfs.in
index e04355e..2abeb03 100644
--- a/init.d/procfs.in
+++ b/init.d/procfs.in
@@ -26,8 +26,8 @@ start()
 		[ ! -e /proc/sys/fs/binfmt_misc/register ]; then
 		if ! grep -qs binfmt_misc /proc/filesystems &&
 			modprobe -q binfmt-misc; then
-			ewarn "The  binfmt-misc module needs to be configured in \
-				@SYSCONFDIR@/conf.d/modules or built in."
+			ewarn "The binfmt-misc module needs to be configured in" \
+				"@SYSCONFDIR@/conf.d/modules or built in."
 		fi
 		if grep -qs binfmt_misc /proc/filesystems; then
 			ebegin "Mounting misc binary format filesystem"

diff --git a/init.d/sysfs.in b/init.d/sysfs.in
index 87adacd..b9478f8 100644
--- a/init.d/sysfs.in
+++ b/init.d/sysfs.in
@@ -104,8 +104,8 @@ mount_misc()
 	if [ -d /sys/firmware/efi/efivars ] \
 		&& ! mountinfo -q /sys/firmware/efi/efivars; then
 		if modprobe -q efivarfs; then
-			ewarn "The efivarfs module needs to be configured in \
-				@SYSCONFDIR@/conf.d/modules or built in"
+			ewarn "The efivarfs module needs to be configured in" \
+				"@SYSCONFDIR@/conf.d/modules or built in"
 		fi
 		if grep -qs efivarfs /proc/filesystems; then
 			ebegin "Mounting efivarfs filesystem"

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     0a76627345a173fc00be9864f3f3f5c3b15319cd
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Fri Sep 23 19:17:14 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Sep 23 19:17:14 2016 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=0a766273

init.d/swap: remove the case for linux

I am removing the separate case for Linux, because we are droppping the
"-e" switch.

 init.d/swap.in | 1 -
 1 file changed, 1 deletion(-)

diff --git a/init.d/swap.in b/init.d/swap.in
index c030ad8..63087e8 100644
--- a/init.d/swap.in
+++ b/init.d/swap.in
@@ -19,7 +19,6 @@ start()
 {
 	ebegin "Activating swap devices"
 	case "$RC_UNAME" in
-		Linux)		swapon -a -e >/dev/null;;
 		NetBSD|OpenBSD) swapctl -A -t noblk >/dev/null;;
 		*)		swapon -a >/dev/null;;
 	esac

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     bf73363f220ff086d2559e7c2015801f80862749
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Tue Sep 20 17:55:53 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Sep 20 18:15:39 2016 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=bf73363f

Add --use-blacklist to modprobe calls in modules and modules-load

This means that we will honor the modprobe black lists.

X-Gentoo-Bug: 594012
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=594012

 init.d/modules-load.in | 2 +-
 init.d/modules.in      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/init.d/modules-load.in b/init.d/modules-load.in
index c8fe422..f71f704 100644
--- a/init.d/modules-load.in
+++ b/init.d/modules-load.in
@@ -54,7 +54,7 @@ load_modules()
 		ebegin "Loading module $x"
 		case "$RC_UNAME" in
 			FreeBSD) kldload "$x"; rc=$? ;;
-			Linux) modprobe -q "$x"; rc=$? ;;
+			Linux) modprobe --use-blacklist -q "$x"; rc=$? ;;
 			*) ;;
 		esac
 		eend $rc "Failed to load $x"

diff --git a/init.d/modules.in b/init.d/modules.in
index 2568f73..3431c4a 100644
--- a/init.d/modules.in
+++ b/init.d/modules.in
@@ -75,7 +75,7 @@ Linux_modules()
 		done
 		[ -z "$args" ] && eval args=\$module_${aa}_args
 		[ -z "$args" ] && eval args=\$module_${xx}_args
-		eval modprobe -q "$mpargs" "$x" "$args"
+		eval modprobe --use-blacklist -q "$mpargs" "$x" "$args"
 		eend $? "Failed to load $x" && : $(( cnt += 1 ))
 	done
 	einfo "Autoloaded $cnt module(s)"

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     b02ff466fa75cc4b5bcfaff3f2989cc65c823f43
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Fri Sep  9 16:12:32 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Sep 12 17:58:31 2016 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=b02ff466

savecache: stop saving the dependency tree

This fixes #85.

 init.d/savecache.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/init.d/savecache.in b/init.d/savecache.in
index 665f840..949600c 100644
--- a/init.d/savecache.in
+++ b/init.d/savecache.in
@@ -49,7 +49,7 @@ start()
 	fi
 	ebegin "Saving dependency cache"
 	local rc=0 save=
-	for x in deptree depconfig shutdowntime softlevel rc.log; do
+	for x in shutdowntime softlevel rc.log; do
 		[ -e "$RC_SVCDIR/$x" ] && save="$save $RC_SVCDIR/$x"
 	done
 	if [ -n "$save" ]; then

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     6bd0f2d096f149906061a4ac7b66b7e85516784a
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Mon Sep 12 17:58:01 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Sep 12 17:58:01 2016 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=6bd0f2d0

init.d/procfs: typo fix

 init.d/procfs.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/init.d/procfs.in b/init.d/procfs.in
index 36eca7c..e04355e 100644
--- a/init.d/procfs.in
+++ b/init.d/procfs.in
@@ -23,7 +23,7 @@ start()
 {
 	# Setup Kernel Support for miscellaneous Binary Formats
 	if [ -d /proc/sys/fs/binfmt_misc ] &&
-		[! -e /proc/sys/fs/binfmt_misc/register ]; then
+		[ ! -e /proc/sys/fs/binfmt_misc/register ]; then
 		if ! grep -qs binfmt_misc /proc/filesystems &&
 			modprobe -q binfmt-misc; then
 			ewarn "The  binfmt-misc module needs to be configured in \

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     841b883825ddf9982a673b3964757f6df25acd46
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Thu Sep  8 17:39:52 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Sep  8 18:36:13 2016 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=841b8838

hwclock: fix module load warning

 init.d/hwclock.in | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/init.d/hwclock.in b/init.d/hwclock.in
index d28ac85..e69c561 100644
--- a/init.d/hwclock.in
+++ b/init.d/hwclock.in
@@ -80,6 +80,15 @@ get_noadjfile()
 	fi
 }
 
+rtc_exists()
+{
+	local rtc=
+	for rtc in /dev/rtc /dev/rtc[0-9]*; do
+		[ -e "$rtc" ] && break
+	done
+	[ -e "$rtc" ]
+}
+
 start()
 {
 	local retval=0 errstr="" modname
@@ -92,17 +101,13 @@ start()
 
 	ebegin "Setting system clock using the hardware clock [$utc]"
 	if [ -e /proc/modules ]; then
-		local rtc=
-		for rtc in /dev/rtc /dev/rtc[0-9]*; do
-			[ -e "$rtc" ] && break
-		done
-		if [ ! -e "${rtc}" ]; then
-		for x in rtc-cmos rtc genrtc; do
-		 modprobe -q $x && modname=$x && break
-		done
-		[ -n "$modname" ] &&
-			ewarn "The $modname module needs to be configured in \
-				@SYSCONFDIR@/conf.d/modules or built in."
+		if ! rtc_exists; then
+			for x in rtc-cmos rtc genrtc; do
+				modprobe -q $x && rtc_exists && modname="$x" && break
+			done
+			[ -n "$modname" ] &&
+				ewarn "The $modname module needs to be configured in \
+					@SYSCONFDIR@/conf.d/modules or built in."
 		fi
 	fi
 

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     ba10793b0b85b11fae04e6526716c6f7976afde1
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Tue Sep  6 23:15:27 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Sep  8 16:53:20 2016 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=ba10793b

init.d/procfs: fix binfmt_misc module load warning

This reworks the logic so that the warning about configuring the
binfmt_misc module is only displayed if the module actually has to be
loaded.

 init.d/procfs.in | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/init.d/procfs.in b/init.d/procfs.in
index 055b5f4..36eca7c 100644
--- a/init.d/procfs.in
+++ b/init.d/procfs.in
@@ -22,8 +22,10 @@ depend()
 start()
 {
 	# Setup Kernel Support for miscellaneous Binary Formats
-	if [ -d /proc/sys/fs/binfmt_misc -a ! -e /proc/sys/fs/binfmt_misc/register ]; then
-		if modprobe -q binfmt-misc; then
+	if [ -d /proc/sys/fs/binfmt_misc ] &&
+		[! -e /proc/sys/fs/binfmt_misc/register ]; then
+		if ! grep -qs binfmt_misc /proc/filesystems &&
+			modprobe -q binfmt-misc; then
 			ewarn "The  binfmt-misc module needs to be configured in \
 				@SYSCONFDIR@/conf.d/modules or built in."
 		fi

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     d5db5489be135ae9295e378e789b4b7b13367fdd
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Mon Sep  5 18:24:27 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Sep  5 18:39:51 2016 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=d5db5489

init.d/swap: do not unmount all tmpfs file systems

X-Gentoo-Bug: 568162
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=568162

 init.d/swap.in | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/init.d/swap.in b/init.d/swap.in
index 4fb2b35..c030ad8 100644
--- a/init.d/swap.in
+++ b/init.d/swap.in
@@ -29,12 +29,6 @@ start()
 stop()
 {
 	ebegin "Deactivating swap devices"
-
-	# Try to unmount all tmpfs filesystems not in use, else a deadlock may
-	# occur. As $RC_SVCDIR may also be tmpfs we cd to it to lock it
-	cd "$RC_SVCDIR"
-	umount -a -t tmpfs 2>/dev/null
-
 	case "$RC_UNAME" in
 		NetBSD|OpenBSD)	swapctl -U -t noblk >/dev/null;;
 		*)		swapoff -a >/dev/null;;

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     8c14d0c476e06fff7598c526e26b6a13d53a4600
Author:     Martin Väth <martin <AT> mvath <DOT> de>
AuthorDate: Tue Aug 30 17:47:13 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Aug 30 17:47:13 2016 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=8c14d0c4

Fix typo in RC_UNAME check of modules-load

The $RC_UNAME "Linux" had been misspelled as "linux".
As a consequence, entries in e.g. /etc/modules-load.d failed to
load any module succesfully under Linux(!)

 init.d/modules-load.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/init.d/modules-load.in b/init.d/modules-load.in
index 2387a8d..c8fe422 100644
--- a/init.d/modules-load.in
+++ b/init.d/modules-load.in
@@ -54,7 +54,7 @@ load_modules()
 		ebegin "Loading module $x"
 		case "$RC_UNAME" in
 			FreeBSD) kldload "$x"; rc=$? ;;
-			linux) modprobe -q "$x"; rc=$? ;;
+			Linux) modprobe -q "$x"; rc=$? ;;
 			*) ;;
 		esac
 		eend $rc "Failed to load $x"

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     c289774b00d0d7dc38fdc1f0f623569bd184a4b1
Author:     Doug Freed <dwfreed <AT> mtu <DOT> edu>
AuthorDate: Fri Aug 26 19:23:54 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Aug 26 19:23:54 2016 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=c289774b

modules-load: handle comments better

This handles comments without a trailing space after the comment
character.

Reported-By: josef64

 init.d/modules-load.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/init.d/modules-load.in b/init.d/modules-load.in
index 0f80396..2387a8d 100644
--- a/init.d/modules-load.in
+++ b/init.d/modules-load.in
@@ -44,8 +44,8 @@ load_modules()
 	[ -z "$file" ] && return 0
 	while read m x; do
 		case $m in
-			\;) continue ;;
-			\#) continue ;;
+			\;*) continue ;;
+			\#*) continue ;;
 			*) modules="$modules $m"
 			;;
 		esac

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     686e172207ac9e23560da18a6f877be777ded935
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Thu Aug 25 22:02:14 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Aug 25 22:04:06 2016 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=686e1722

init.d: add modules-load to ignore patterns

 init.d/.gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/init.d/.gitignore b/init.d/.gitignore
index efbf647..f856699 100644
--- a/init.d/.gitignore
+++ b/init.d/.gitignore
@@ -1,4 +1,5 @@
 binfmt
+modules-load
 bootmisc
 fsck
 hostname

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     fef6268f8d03e3ab3e2564cbf3634d0db2bcd99e
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Thu Aug 25 21:10:45 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Aug 25 21:12:33 2016 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=fef6268f

modules-load.d: cleanups

Move list of directories to a local variable and create the fn variable
to use for an individual file name rather than using path.

 init.d/modules-load.in | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/init.d/modules-load.in b/init.d/modules-load.in
index 8c19a36..0f80396 100644
--- a/init.d/modules-load.in
+++ b/init.d/modules-load.in
@@ -16,12 +16,11 @@ depend()
 	keyword -docker -lxc -openvz -prefix -systemd-nspawn -vserver
 }
 
-modules_dirs="/usr/lib/modules-load.d /run/modules-load.d /etc/modules-load.d"
-
 find_modfiles()
 {
-	local basenames files x y
-	for x in $modules_dirs; do
+	local dirs="/usr/lib/modules-load.d /run/modules-load.d /etc/modules-load.d"
+	local basenames files fn x y
+	for x in $dirs; do
 		[ ! -d $x ] && continue
 		for y in $x/*.conf; do
 			[ -f $y ] && basenames="${basenames}\n${y##*/}"
@@ -29,11 +28,11 @@ find_modfiles()
 	done
 	basenames=$(printf "$basenames" | sort -u)
 	for x in $basenames; do
-		for y in $modules_dirs; do
+		for y in $dirs; do
 			[ -r $y/$x ] &&
-				path=$y/$x
+				fn=$y/$x
 		done
-		files="$files $path"
+		files="$files $fn"
 	done
 	echo $files
 }

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     556dbff99d53cdcc00e6b1ec67e1679f72b6f284
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Tue Aug 23 22:48:39 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Aug 25 17:08:44 2016 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=556dbff9

Add modules-load.d support

 init.d/Makefile        |  4 +--
 init.d/modules-load.in | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++
 init.d/modules.in      |  1 +
 3 files changed, 76 insertions(+), 2 deletions(-)

diff --git a/init.d/Makefile b/init.d/Makefile
index a1d2ec7..8eb62e4 100644
--- a/init.d/Makefile
+++ b/init.d/Makefile
@@ -20,10 +20,10 @@ SRCS-FreeBSD=	hostid.in modules.in moused.in newsyslog.in pf.in rarpd.in \
 		rc-enabled.in rpcbind.in savecore.in syslogd.in
 # These are FreeBSD specific
 SRCS-FreeBSD+=	adjkerntz.in devd.in dumpon.in encswap.in ipfw.in \
-		mixer.in nscd.in powerd.in syscons.in
+		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 \
-		killprocs.in modules.in mount-ro.in mtab.in numlock.in \
+		killprocs.in modules.in modules-load.in mount-ro.in mtab.in numlock.in \
 		procfs.in net-online.in sysfs.in termencoding.in tmpfiles.dev.in
 
 # Generic BSD scripts

diff --git a/init.d/modules-load.in b/init.d/modules-load.in
new file mode 100644
index 0000000..8c19a36
--- /dev/null
+++ b/init.d/modules-load.in
@@ -0,0 +1,73 @@
+#!@SBINDIR@/openrc-run
+# Copyright (c) 2016 The OpenRC Authors.
+# See the Authors file at the top-level directory of this distribution and
+# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+#
+# 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="Loads a list of modules from systemd-compatible locations."
+
+depend()
+{
+	keyword -docker -lxc -openvz -prefix -systemd-nspawn -vserver
+}
+
+modules_dirs="/usr/lib/modules-load.d /run/modules-load.d /etc/modules-load.d"
+
+find_modfiles()
+{
+	local basenames files x y
+	for x in $modules_dirs; do
+		[ ! -d $x ] && continue
+		for y in $x/*.conf; do
+			[ -f $y ] && basenames="${basenames}\n${y##*/}"
+		done
+	done
+	basenames=$(printf "$basenames" | sort -u)
+	for x in $basenames; do
+		for y in $modules_dirs; do
+			[ -r $y/$x ] &&
+				path=$y/$x
+		done
+		files="$files $path"
+	done
+	echo $files
+}
+
+load_modules()
+{
+	local file m modules rc x
+	file=$1
+	[ -z "$file" ] && return 0
+	while read m x; do
+		case $m in
+			\;) continue ;;
+			\#) continue ;;
+			*) modules="$modules $m"
+			;;
+		esac
+	done < $file
+	for x in $modules; do
+		ebegin "Loading module $x"
+		case "$RC_UNAME" in
+			FreeBSD) kldload "$x"; rc=$? ;;
+			linux) modprobe -q "$x"; rc=$? ;;
+			*) ;;
+		esac
+		eend $rc "Failed to load $x"
+	done
+}
+
+start()
+{
+	local x
+	files=$(find_modfiles)
+	for x in $files; do
+		load_modules $x
+	done
+	return 0
+}

diff --git a/init.d/modules.in b/init.d/modules.in
index 5bfae6d..2568f73 100644
--- a/init.d/modules.in
+++ b/init.d/modules.in
@@ -14,6 +14,7 @@ description="Loads a user defined list of kernel modules."
 depend()
 {
 	use isapnp
+	want modules-load
 	keyword -docker -lxc -openvz -prefix -systemd-nspawn -vserver
 }
 

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     353bb9bc9a0ab3c6650d72d2ceb14c990762a2a0
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Tue Aug 23 18:22:19 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Aug 23 18:22:19 2016 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=353bb9bc

init.d/hostname: add support for /etc/hostname

 init.d/hostname.in | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/init.d/hostname.in b/init.d/hostname.in
index 21ed701..74866b4 100644
--- a/init.d/hostname.in
+++ b/init.d/hostname.in
@@ -17,10 +17,16 @@ depend() {
 
 start()
 {
-	# HOSTNAME variable used to be defined in caps in conf.d/hostname.
-	# It is also a magic variable in bash.
-	hostname=${hostname-${HOSTNAME-localhost}} # checkbashisms: false positive
-	ebegin "Setting hostname to $hostname"
-	hostname "$hostname"
+	local h source x
+	if [ -s @SYSCONFDIR@/hostname ] && [ -r @SYSCONFDIR@/hostname ]; then
+	read h x <@SYSCONFDIR@/hostname
+	source=" from @SYSCONFDIR@/hostname"
+	else
+		# HOSTNAME variable used to be defined in caps in conf.d/hostname.
+		# It is also a magic variable in bash.
+		h=${hostname-${HOSTNAME-localhost}} # checkbashisms: false positive
+	fi
+	ebegin "Setting hostname to $h $source"
+	hostname "$h"
 	eend $? "Failed to set the hostname"
 }

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     4018dfc8de4818101c336ff8bcf0f4762b318c6a
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Wed Aug 24 18:43:11 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Aug 24 18:43:11 2016 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=4018dfc8

init.d/hostname: do not use localhost as a default hostname

This allows the operating system default hostname to be used if no
hostname is configured.

 init.d/hostname.in | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/init.d/hostname.in b/init.d/hostname.in
index 74866b4..253d338 100644
--- a/init.d/hostname.in
+++ b/init.d/hostname.in
@@ -24,7 +24,11 @@ start()
 	else
 		# HOSTNAME variable used to be defined in caps in conf.d/hostname.
 		# It is also a magic variable in bash.
-		h=${hostname-${HOSTNAME-localhost}} # checkbashisms: false positive
+		h=${hostname-${HOSTNAME}} # checkbashisms: false positive
+	fi
+	if [ -z "$h" ]; then
+		einfo "Using default system hostname"
+		return 0
 	fi
 	ebegin "Setting hostname to $h $source"
 	hostname "$h"

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     73cdf10f1f513be7b5dec4f1cc91e0c68cda689b
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Thu Aug 18 21:25:56 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Aug 19 16:08:27 2016 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=73cdf10f

Deprecate automatic loading of modules

In the hwclock, procfs and sysfs service scripts, we automatically
attempt to load the kernel modules we need before we take any action. We
shouldn't do this, because there are systems which do not use kernel
modules and do not have the kmod package installed.

With this change, we continue to load the modules ourselves, but we warn
the admin that they need to be added to /etc/conf.d/modules or built
into the kernel.

In the future, this automatic loading will be dropped.

X-Gentoo-Bug: 342313
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=342313

 init.d/hwclock.in | 10 ++++++++--
 init.d/procfs.in  |  8 ++++++--
 init.d/sysfs.in   |  6 +++++-
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/init.d/hwclock.in b/init.d/hwclock.in
index 2cd1ef3..d28ac85 100644
--- a/init.d/hwclock.in
+++ b/init.d/hwclock.in
@@ -30,6 +30,7 @@ fi
 depend()
 {
 	provide clock
+	want modules
 	if yesno $clock_adjfile; then
 		use root
 	else
@@ -81,7 +82,7 @@ get_noadjfile()
 
 start()
 {
-	local retval=0 errstr=""
+	local retval=0 errstr="" modname
 	setupopts
 
 	if [ -z "$utc_cmd" ]; then
@@ -96,7 +97,12 @@ start()
 			[ -e "$rtc" ] && break
 		done
 		if [ ! -e "${rtc}" ]; then
-			modprobe -q rtc-cmos || modprobe -q rtc || modprobe -q genrtc
+		for x in rtc-cmos rtc genrtc; do
+		 modprobe -q $x && modname=$x && break
+		done
+		[ -n "$modname" ] &&
+			ewarn "The $modname module needs to be configured in \
+				@SYSCONFDIR@/conf.d/modules or built in."
 		fi
 	fi
 

diff --git a/init.d/procfs.in b/init.d/procfs.in
index de61873..055b5f4 100644
--- a/init.d/procfs.in
+++ b/init.d/procfs.in
@@ -13,7 +13,8 @@ description="Mounts misc filesystems in /proc."
 
 depend()
 {
-	use modules devfs
+	use devfs
+	want modules
 	need localmount
 	keyword -docker -lxc -openvz -prefix -systemd-nspawn -vserver
 }
@@ -22,7 +23,10 @@ start()
 {
 	# 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 modprobe -q binfmt-misc; then
+			ewarn "The  binfmt-misc module needs to be configured in \
+				@SYSCONFDIR@/conf.d/modules or built in."
+		fi
 		if grep -qs binfmt_misc /proc/filesystems; then
 			ebegin "Mounting misc binary format filesystem"
 			mount -t binfmt_misc -o nodev,noexec,nosuid \

diff --git a/init.d/sysfs.in b/init.d/sysfs.in
index 6929810..87adacd 100644
--- a/init.d/sysfs.in
+++ b/init.d/sysfs.in
@@ -15,6 +15,7 @@ sysfs_opts=nodev,noexec,nosuid
 
 depend()
 {
+	want modules
 	keyword -docker -lxc -prefix -systemd-nspawn -vserver
 }
 
@@ -102,7 +103,10 @@ mount_misc()
 	# it will NOT appear in /proc/filesystems yet
 	if [ -d /sys/firmware/efi/efivars ] \
 		&& ! mountinfo -q /sys/firmware/efi/efivars; then
-		modprobe -q efivarfs
+		if modprobe -q efivarfs; then
+			ewarn "The efivarfs module needs to be configured in \
+				@SYSCONFDIR@/conf.d/modules or built in"
+		fi
 		if grep -qs efivarfs /proc/filesystems; then
 			ebegin "Mounting efivarfs filesystem"
 			mount -n -t efivarfs -o ${sysfs_opts} \

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     da28a3d367b6078deda6bc205806b43b971e67a9
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Sun Jul 31 18:01:17 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Jul 31 18:01:17 2016 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=da28a3d3

init.d: initial service adjustments for docker support

Add -docker keyword to the same scripts that have -lxc keyword.

 init.d/binfmt.in       | 2 +-
 init.d/consolefont.in  | 2 +-
 init.d/devfs.in        | 2 +-
 init.d/dmesg.in        | 2 +-
 init.d/fsck.in         | 2 +-
 init.d/hostname.in     | 2 +-
 init.d/hwclock.in      | 2 +-
 init.d/keymaps.in      | 2 +-
 init.d/localmount.in   | 2 +-
 init.d/modules.in      | 2 +-
 init.d/mount-ro.in     | 2 +-
 init.d/net-online.in   | 2 +-
 init.d/netmount.in     | 2 +-
 init.d/numlock.in      | 2 +-
 init.d/procfs.in       | 2 +-
 init.d/root.in         | 2 +-
 init.d/swap.in         | 2 +-
 init.d/swapfiles.in    | 2 +-
 init.d/swclock.in      | 2 +-
 init.d/sysfs.in        | 2 +-
 init.d/termencoding.in | 2 +-
 init.d/urandom.in      | 2 +-
 22 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/init.d/binfmt.in b/init.d/binfmt.in
index 39978a0..4afb83b 100644
--- a/init.d/binfmt.in
+++ b/init.d/binfmt.in
@@ -15,7 +15,7 @@ depend()
 {
 	after procfs
 	use modules devfs
-	keyword -openvz -prefix -systemd-nspawn -vserver -lxc
+	keyword -docker -lxc -openvz -prefix -systemd-nspawn -vserver
 }
 
 start()

diff --git a/init.d/consolefont.in b/init.d/consolefont.in
index de2d448..9fe95af 100644
--- a/init.d/consolefont.in
+++ b/init.d/consolefont.in
@@ -15,7 +15,7 @@ depend()
 {
 	need localmount termencoding
 	after hotplug bootmisc modules
-	keyword -openvz -prefix -systemd-nspawn -uml -vserver -xenu -lxc
+	keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu
 }
 
 start()

diff --git a/init.d/devfs.in b/init.d/devfs.in
index c869326..8038c54 100644
--- a/init.d/devfs.in
+++ b/init.d/devfs.in
@@ -15,7 +15,7 @@ depend()
 {
 	provide dev-mount
 	before dev
-	keyword -prefix -systemd-nspawn -vserver -lxc
+	keyword -docker -lxc -prefix -systemd-nspawn -vserver
 }
 
 mount_dev()

diff --git a/init.d/dmesg.in b/init.d/dmesg.in
index a3696d2..641f36f 100644
--- a/init.d/dmesg.in
+++ b/init.d/dmesg.in
@@ -14,7 +14,7 @@ description="Set the dmesg level for a cleaner boot"
 depend()
 {
 	before dev modules
-	keyword -lxc -prefix -systemd-nspawn -vserver
+	keyword -docker -lxc -prefix -systemd-nspawn -vserver
 }
 
 start()

diff --git a/init.d/fsck.in b/init.d/fsck.in
index 005e87f..7d12482 100644
--- a/init.d/fsck.in
+++ b/init.d/fsck.in
@@ -16,7 +16,7 @@ _IFS="
 depend()
 {
 	use dev clock modules
-	keyword -jail -openvz -prefix -systemd-nspawn -timeout -vserver -lxc -uml
+	keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn -timeout -vserver -uml
 }
 
 _abort() {

diff --git a/init.d/hostname.in b/init.d/hostname.in
index cc3d148..21ed701 100644
--- a/init.d/hostname.in
+++ b/init.d/hostname.in
@@ -12,7 +12,7 @@
 description="Sets the hostname of the machine."
 
 depend() {
-	keyword -prefix -systemd-nspawn -lxc
+	keyword -docker -lxc -prefix -systemd-nspawn
 }
 
 start()

diff --git a/init.d/hwclock.in b/init.d/hwclock.in
index 7fee7b7..2cd1ef3 100644
--- a/init.d/hwclock.in
+++ b/init.d/hwclock.in
@@ -35,7 +35,7 @@ depend()
 	else
 		before *
 	fi
-	keyword -openvz -prefix -systemd-nspawn -uml -vserver -xenu -lxc
+	keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu
 }
 
 setupopts()

diff --git a/init.d/keymaps.in b/init.d/keymaps.in
index a9da423..dbe054a 100644
--- a/init.d/keymaps.in
+++ b/init.d/keymaps.in
@@ -15,7 +15,7 @@ depend()
 {
 	need localmount termencoding
 	after bootmisc
-	keyword -openvz -prefix -systemd-nspawn -uml -vserver -xenu -lxc
+	keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu
 }
 
 start()

diff --git a/init.d/localmount.in b/init.d/localmount.in
index b7de0d8..d2c9321 100644
--- a/init.d/localmount.in
+++ b/init.d/localmount.in
@@ -16,7 +16,7 @@ depend()
 	need fsck
 	use lvm modules mtab
 	after lvm modules
-	keyword -jail -prefix -systemd-nspawn -vserver -lxc
+	keyword -docker -jail -lxc -prefix -systemd-nspawn -vserver
 }
 
 start()

diff --git a/init.d/modules.in b/init.d/modules.in
index 7a02c3a..5bfae6d 100644
--- a/init.d/modules.in
+++ b/init.d/modules.in
@@ -14,7 +14,7 @@ description="Loads a user defined list of kernel modules."
 depend()
 {
 	use isapnp
-	keyword -openvz -prefix -systemd-nspawn -vserver -lxc
+	keyword -docker -lxc -openvz -prefix -systemd-nspawn -vserver
 }
 
 FreeBSD_modules()

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

diff --git a/init.d/net-online.in b/init.d/net-online.in
index 53855d9..3e18ba9 100644
--- a/init.d/net-online.in
+++ b/init.d/net-online.in
@@ -15,7 +15,7 @@ depend()
 {
 	after modules
 	need sysfs
-	keyword -jail -lxc -openvz -prefix -systemd-nspawn -uml -vserver
+	keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn -uml -vserver
 }
 
 get_interfaces()

diff --git a/init.d/netmount.in b/init.d/netmount.in
index ede4d32..7be08e1 100644
--- a/init.d/netmount.in
+++ b/init.d/netmount.in
@@ -24,7 +24,7 @@ depend()
 	want $mywant
 	use afc-client amd openvpn
 	use dns
-	keyword -jail -prefix -systemd-nspawn -vserver -lxc
+	keyword -docker -jail -lxc -prefix -systemd-nspawn -vserver
 }
 
 start()

diff --git a/init.d/numlock.in b/init.d/numlock.in
index 950b583..875ffc0 100644
--- a/init.d/numlock.in
+++ b/init.d/numlock.in
@@ -16,7 +16,7 @@ ttyn=${rc_tty_number:-${RC_TTY_NUMBER:-12}}
 depend()
 {
 	need localmount
-	keyword -openvz -prefix -systemd-nspawn -vserver -lxc
+	keyword -docker -lxc -openvz -prefix -systemd-nspawn -vserver
 }
 
 _setleds()

diff --git a/init.d/procfs.in b/init.d/procfs.in
index b78afc7..de61873 100644
--- a/init.d/procfs.in
+++ b/init.d/procfs.in
@@ -15,7 +15,7 @@ depend()
 {
 	use modules devfs
 	need localmount
-	keyword -openvz -prefix -systemd-nspawn -vserver -lxc
+	keyword -docker -lxc -openvz -prefix -systemd-nspawn -vserver
 }
 
 start()

diff --git a/init.d/root.in b/init.d/root.in
index 409a63c..ec22699 100644
--- a/init.d/root.in
+++ b/init.d/root.in
@@ -14,7 +14,7 @@ description="Mount the root fs read/write"
 depend()
 {
 	need fsck
-	keyword -jail -openvz -prefix -systemd-nspawn -vserver -lxc
+	keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn -vserver
 }
 
 start()

diff --git a/init.d/swap.in b/init.d/swap.in
index c6d705d..4fb2b35 100644
--- a/init.d/swap.in
+++ b/init.d/swap.in
@@ -12,7 +12,7 @@
 depend()
 {
 	before localmount
-	keyword -jail -openvz -prefix -systemd-nspawn -vserver -lxc
+	keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn -vserver
 }
 
 start()

diff --git a/init.d/swapfiles.in b/init.d/swapfiles.in
index f61c4ec..92b5c89 100644
--- a/init.d/swapfiles.in
+++ b/init.d/swapfiles.in
@@ -12,7 +12,7 @@
 depend()
 {
 	need localmount
-	keyword -jail -openvz -prefix -systemd-nspawn -vserver -lxc
+	keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn -vserver
 }
 
 start()

diff --git a/init.d/swclock.in b/init.d/swclock.in
index b09afad..9ceba44 100644
--- a/init.d/swclock.in
+++ b/init.d/swclock.in
@@ -15,7 +15,7 @@ depend()
 {
 	before *
 	provide clock
-	keyword -openvz -prefix -systemd-nspawn -uml -vserver -xenu -lxc
+	keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu
 }
 
 # swclock is an OpenRC built in

diff --git a/init.d/sysfs.in b/init.d/sysfs.in
index cc4007f..6929810 100644
--- a/init.d/sysfs.in
+++ b/init.d/sysfs.in
@@ -15,7 +15,7 @@ sysfs_opts=nodev,noexec,nosuid
 
 depend()
 {
-	keyword -lxc -prefix -systemd-nspawn -vserver
+	keyword -docker -lxc -prefix -systemd-nspawn -vserver
 }
 
 mount_sys()

diff --git a/init.d/termencoding.in b/init.d/termencoding.in
index a739f97..9f33eb6 100644
--- a/init.d/termencoding.in
+++ b/init.d/termencoding.in
@@ -16,7 +16,7 @@ ttyn=${rc_tty_number:-${RC_TTY_NUMBER:-12}}
 
 depend()
 {
-	keyword -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu
+	keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu
 	use root
 	after bootmisc
 }

diff --git a/init.d/urandom.in b/init.d/urandom.in
index 9f4350b..54706ac 100644
--- a/init.d/urandom.in
+++ b/init.d/urandom.in
@@ -15,7 +15,7 @@ description="Initializes the random number generator."
 depend()
 {
 	need localmount
-	keyword -jail -lxc -openvz -prefix -systemd-nspawn
+	keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn
 }
 
 save_seed()

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     cae3976ef1276ce33aa7e49474f13499a48a3fe6
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Sun Jul 31 19:02:30 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Jul 31 19:02:30 2016 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=cae3976e

init.d: Add runsvdir to ignore patterns

 init.d/.gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/init.d/.gitignore b/init.d/.gitignore
index b548177..efbf647 100644
--- a/init.d/.gitignore
+++ b/init.d/.gitignore
@@ -37,6 +37,7 @@ pf
 rarpd
 rc-enabled
 rpcbind
+runsvdir
 savecore
 swap-blk
 swclock

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     f2c2e2dd5a5e0a22da4dcabea6615d0f4697a962
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Wed Jul 27 19:09:24 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Jul 27 19:09:24 2016 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=f2c2e2dd

init.d/sysctl.in: typo fix

 init.d/sysctl.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/init.d/sysctl.in b/init.d/sysctl.in
index 05f5c4c..cb756f3 100644
--- a/init.d/sysctl.in
+++ b/init.d/sysctl.in
@@ -49,7 +49,7 @@ start()
 	local rc=0
 
 	ebegin "Configuring kernel parameters"
-	case $RC_UNAME" in
+	case "$RC_UNAME" in
 	*BSD|GNU) BSD_sysctl; rc=$? ;;
 	Linux) Linux_sysctl; rc=$? ;;
 	esac

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     b19d0a40d7f20987323d5af91469c720ead39561
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Tue Jul 26 16:14:39 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Jul 26 16:14:50 2016 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=b19d0a40

init.d/loopback: remove unnecessary stop function

 init.d/loopback.in | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/init.d/loopback.in b/init.d/loopback.in
index f5ee09d..f76dfce 100644
--- a/init.d/loopback.in
+++ b/init.d/loopback.in
@@ -35,8 +35,3 @@ start()
 	fi
 	eend $?
 }
-
-stop()
-{
-	return 0
-}

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     daf93977641201f16c477b075ce9055a1da8f7b3
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Tue Jul 19 20:56:06 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Jul 19 21:21:48 2016 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=daf93977

init.d: combine sysctl scripts

We had separate sysctl scripts for each operating system. However, there
is no need to do this since we can detect the operating system at
runtime with $RC_UNAME.

 init.d/Makefile                     |  3 ---
 init.d/sysctl.GNU-kFreeBSD.in       | 38 ------------------------------------
 init.d/sysctl.GNU.in                | 39 -------------------------------------
 init.d/sysctl.Linux.in              | 26 -------------------------
 init.d/{sysctl.BSD.in => sysctl.in} | 27 +++++++++++++++++++++----
 5 files changed, 23 insertions(+), 110 deletions(-)

diff --git a/init.d/Makefile b/init.d/Makefile
index 55db3d1..a44c4e6 100644
--- a/init.d/Makefile
+++ b/init.d/Makefile
@@ -31,9 +31,6 @@ SRCS-NetBSD=	hostid.in moused.in newsyslog.in pf.in rarpd.in rc-enabled.in \
 # These are NetBSD specific
 SRCS-NetBSD+=	devdb.in swap-blk.in ttys.in wscons.in
 
-%.in: %${SFX}
-	sed ${SED_REPLACE} ${SED_EXTRA} $< > $@
-
 include ${MK}/scripts.mk
 
 _installafter_: realinstall

diff --git a/init.d/sysctl.GNU-kFreeBSD.in b/init.d/sysctl.GNU-kFreeBSD.in
deleted file mode 100644
index 7097d47..0000000
--- a/init.d/sysctl.GNU-kFreeBSD.in
+++ /dev/null
@@ -1,38 +0,0 @@
-#!@SBINDIR@/openrc-run
-# Copyright (c) 2007-2015 The OpenRC Authors.
-# See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
-#
-# 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.
-
-depend()
-{
-	before bootmisc logger
-	keyword -prefix
-}
-
-start()
-{
-	[ -e /etc/sysctl.conf ] || return 0
-	local retval=0 var= comments= conf=
-	ebegin "Configuring kernel parameters"
-	eindent
-	for conf in @SYSCONFDIR@/sysctl.conf @SYSCONFDIR@/sysctl.d/*.conf; do
-		if [ -r "$conf" ]; then
-			vebegin "applying $conf"
-			while read var comments; do
-				case "$var" in
-				""|"#"*) continue;;
-				esac
-				sysctl -w "$var" >/dev/null || retval=1
-			done < "$conf"
-			veend $retval
-		fi
-	done
-	eoutdent
-	eend $retval "Some errors were encountered"
-}

diff --git a/init.d/sysctl.GNU.in b/init.d/sysctl.GNU.in
deleted file mode 100644
index be7b42e..0000000
--- a/init.d/sysctl.GNU.in
+++ /dev/null
@@ -1,39 +0,0 @@
-#!@PREFIX@/sbin/openrc-run
-# Copyright (c) 2007-2015 The OpenRC Authors.
-# See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
-#
-# 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.
-#FIXME: Modify for GNU/Hurd
-
-depend()
-{
-	before bootmisc logger
-	keyword -prefix
-}
-
-start()
-{
-	[ -e /etc/sysctl.conf ] || return 0
-	local retval=0 var= comments= conf=
-	ebegin "Configuring kernel parameters"
-	eindent
-	for conf in @SYSCONFDIR@/sysctl.conf @SYSCONFDIR@/sysctl.d/*.conf; do
-		if [ -r "$conf" ]; then
-			vebegin "applying $conf"
-			while read var comments; do
-				case "$var" in
-				""|"#"*) continue;;
-				esac
-				sysctl -w "$var" >/dev/null || retval=1
-			done < "$conf"
-			veend $retval
-		fi
-	done
-	eoutdent
-	eend $retval "Some errors were encountered"
-}

diff --git a/init.d/sysctl.Linux.in b/init.d/sysctl.Linux.in
deleted file mode 100644
index f5e0ab6..0000000
--- a/init.d/sysctl.Linux.in
+++ /dev/null
@@ -1,26 +0,0 @@
-#!@SBINDIR@/openrc-run
-# Copyright (c) 2007-2015 The OpenRC Authors.
-# See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
-#
-# 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.
-
-depend()
-{
-	before bootmisc logger
-	keyword -prefix -systemd-nspawn -vserver
-}
-
-start()
-{
-	local quiet
-	yesno $rc_verbose || quiet=-q
-
-	ebegin "Configuring kernel parameters"
-	sysctl ${quiet} --system
-	eend $? "Unable to configure some kernel parameters"
-}

diff --git a/init.d/sysctl.BSD.in b/init.d/sysctl.in
similarity index 75%
rename from init.d/sysctl.BSD.in
rename to init.d/sysctl.in
index 7097d47..05f5c4c 100644
--- a/init.d/sysctl.BSD.in
+++ b/init.d/sysctl.in
@@ -12,14 +12,13 @@
 depend()
 {
 	before bootmisc logger
-	keyword -prefix
+	keyword -prefix -systemd-nspawn -vserver
 }
 
-start()
+BSD_sysctl()
 {
 	[ -e /etc/sysctl.conf ] || return 0
 	local retval=0 var= comments= conf=
-	ebegin "Configuring kernel parameters"
 	eindent
 	for conf in @SYSCONFDIR@/sysctl.conf @SYSCONFDIR@/sysctl.d/*.conf; do
 		if [ -r "$conf" ]; then
@@ -34,5 +33,25 @@ start()
 		fi
 	done
 	eoutdent
-	eend $retval "Some errors were encountered"
+	return $retval
+}
+
+Linux_sysctl()
+{
+	local quiet
+	yesno $rc_verbose || quiet=-q
+
+	sysctl ${quiet} --system
+}
+
+start()
+{
+	local rc=0
+
+	ebegin "Configuring kernel parameters"
+	case $RC_UNAME" in
+	*BSD|GNU) BSD_sysctl; rc=$? ;;
+	Linux) Linux_sysctl; rc=$? ;;
+	esac
+	eend $rc "Unable to configure some kernel parameters"
 }

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     ac8ad169ae59fece38066c2e08ff57d53d737edd
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Wed Jul  6 15:40:31 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Jul  6 15:40:31 2016 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=ac8ad169

hwclock: always use --noadjfile if available

When we use the --utc or --localtime switch, also use --noadjfile if it
is available. This means hwclock will not use a drift file.

X-Gentoo-Bug: 584722
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=584722

 init.d/hwclock.in | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/init.d/hwclock.in b/init.d/hwclock.in
index d3e19f1..7fee7b7 100644
--- a/init.d/hwclock.in
+++ b/init.d/hwclock.in
@@ -69,6 +69,16 @@ _hwclock()
 	return 1
 }
 
+get_noadjfile()
+{
+	if ! yesno $clock_adjfile; then
+		# Some implementations don't handle adjustments
+		if LC_ALL=C hwclock --help 2>&1 | grep -q "\-\-noadjfile"; then
+			echo --noadjfile
+		fi
+	fi
+}
+
 start()
 {
 	local retval=0 errstr=""
@@ -91,16 +101,16 @@ start()
 	fi
 
 	# Always set the kernel's time zone.
-	_hwclock --systz $utc_cmd $clock_args
+	_hwclock --systz $utc_cmd $(get_noadjfile) $clock_args
 	: $(( retval += $? ))
 
 	if [ -e /etc/adjtime ] && yesno $clock_adjfile; then
-		_hwclock --adjust $utc_cmd
+		_hwclock --adjust $utc_cmd $(get_noadjfile)
 		: $(( retval += $? ))
 	fi
 
 	if yesno ${clock_hctosys:-YES}; then
-		_hwclock --hctosys $utc_cmd $clock_args
+		_hwclock --hctosys $utc_cmd $(get_noadjfile) $clock_args
 		: $(( retval += $? ))
 	fi
 
@@ -122,14 +132,7 @@ stop()
 
 	ebegin "Setting hardware clock using the system clock" "[$utc]"
 
-	if ! yesno $clock_adjfile; then
-		# Some implementations don't handle adjustments
-		if LC_ALL=C hwclock --help 2>&1 | grep -q "\-\-noadjfile"; then
-			utc_cmd="$utc_cmd --noadjfile"
-		fi
-	fi
-
-	_hwclock --systohc $utc_cmd $clock_args
+	_hwclock --systohc $utc_cmd $(get_noadjfile) $clock_args
 	retval=$?
 
 	eend $retval "Failed to sync clocks"
@@ -144,5 +147,5 @@ save()
 show()
 {
 	setupopts
-	hwclock --show "$utc_cmd" $clock_args
+	hwclock --show "$utc_cmd" $(get_noadjfile) $clock_args
 }

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     92e2f2c7cc958effcec0ef773dda954a153d8e42
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Thu May  5 22:02:39 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu May  5 22:02:39 2016 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=92e2f2c7

killprocs: remove calls to sleep

X-Gentoo-Bug: 487084
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=487084

 init.d/killprocs.in | 2 --
 1 file changed, 2 deletions(-)

diff --git a/init.d/killprocs.in b/init.d/killprocs.in
index 2f79a46..d1409c5 100644
--- a/init.d/killprocs.in
+++ b/init.d/killprocs.in
@@ -20,10 +20,8 @@ start()
 {
 	ebegin "Terminating remaining processes"
 	killall5 -15 ${killall5_opts}
-	sleep 1
 	eend 0
 	ebegin "Killing remaining processes"
 	killall5 -9 ${killall5_opts}
-	sleep 1
 	eend 0
 }

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     fd80b6fc67ec6a0fe4853167fb67ee40bb51b742
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Tue Apr 26 17:43:50 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Apr 26 17:43:50 2016 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=fd80b6fc

localmount/netmount: clean up critical mount processing

Fix a typo and do not fail if a path in critical_mounts is not listed as
a critical mount does not get mounted.

 init.d/localmount.in | 8 ++++++--
 init.d/netmount.in   | 8 ++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/init.d/localmount.in b/init.d/localmount.in
index 96ccc44..b7de0d8 100644
--- a/init.d/localmount.in
+++ b/init.d/localmount.in
@@ -41,9 +41,13 @@ start()
 		rc=0
 	else
 		for x in ${critical_mounts}; do
-		mountinfo -q $x || critical=x
+		fstabinfo -q $x || continue
+		if ! mountinfo -q $x; then
+			critical=x
+			eerror "Failed to mount $x"
+		fi
 		done
-		[-z "$critical" ] && rc=0
+		[ -z "$critical" ] && rc=0
 	fi
 	return $rc
 }

diff --git a/init.d/netmount.in b/init.d/netmount.in
index 0febde2..ede4d32 100644
--- a/init.d/netmount.in
+++ b/init.d/netmount.in
@@ -46,9 +46,13 @@ start()
 		rc=0
 	else
 		for x in ${critical_mounts}; do
-		mountinfo -q $x || critical=x
+		fstabinfo -q $x || continue
+		if ! mountinfo -q $x; then
+			critical=x
+			eerror "Failed to mount $x"
+		fi
 		done
-		[-z "$critical" ] && rc=0
+		[ -z "$critical" ] && rc=0
 	fi
 	return $rc
 }

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     1c3c2cf6d8cb060d03919297f5fe706f6027a4c6
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Fri Apr 15 16:30:44 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Apr 15 16:30:44 2016 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=1c3c2cf6

netmount: fix mounting on Linux

Before this commit, on Linux, we were always trying to mount file
systems marked with _netdev, even when the previous mount command
failed. Now, we do not run the second mount if the first fails.

X-Gentoo-Bug: 579876
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=579876

 init.d/netmount.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/init.d/netmount.in b/init.d/netmount.in
index 0acf15e..f7237f1 100644
--- a/init.d/netmount.in
+++ b/init.d/netmount.in
@@ -37,7 +37,7 @@ start()
 	ebegin "Mounting network filesystems"
 	mount -at $fs
 	rc=$?
-	if [ "$RC_UNAME" = Linux ]; then
+	if [ "$RC_UNAME" = Linux ] && [ $rc = 0 ]; then
 		mount -a -O _netdev
 		rc=$?
 	fi
@@ -72,7 +72,7 @@ stop()
 	retval=$?
 
 	eoutdent
-	if [ "$RC_UNAME" = Linux ]; then
+	if [ "$RC_UNAME" = Linux ] && [ $retval = 0 ]; then
 		umount -a -O _netdev
 		retval=$?
 	fi

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     2c1f6a16e10a45397e0872585dcb0e16684b6cbf
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  6 01:00:41 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Feb  9 21:39:43 2016 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=2c1f6a16

sysfs: mount pstore when available

 init.d/sysfs.in | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/init.d/sysfs.in b/init.d/sysfs.in
index 4f214f6..cc4007f 100644
--- a/init.d/sysfs.in
+++ b/init.d/sysfs.in
@@ -88,6 +88,15 @@ mount_misc()
 		fi
 	fi
 
+	# Setup Kernel Support for persistent storage
+	if [ -d /sys/fs/pstore ] && ! mountinfo -q /sys/fs/pstore; then
+		if grep -qs 'pstore$' /proc/filesystems; then
+			ebegin "Mounting persistent storage (pstore) filesystem"
+			mount -t pstore pstore -o ${sysfs_opts} /sys/fs/pstore
+			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

[gentoo-commits] proj/openrc:master commit in: init.d/

[Mike Frysinger]

commit:     dbb5ebeb25ca68b00de309282d64d18c2567fc5b
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  6 01:00:41 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sat Feb  6 01:00:49 2016 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=dbb5ebeb

sysfs: mount pstore when available

 init.d/sysfs.in | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/init.d/sysfs.in b/init.d/sysfs.in
index 4f214f6..cc4007f 100644
--- a/init.d/sysfs.in
+++ b/init.d/sysfs.in
@@ -88,6 +88,15 @@ mount_misc()
 		fi
 	fi
 
+	# Setup Kernel Support for persistent storage
+	if [ -d /sys/fs/pstore ] && ! mountinfo -q /sys/fs/pstore; then
+		if grep -qs 'pstore$' /proc/filesystems; then
+			ebegin "Mounting persistent storage (pstore) filesystem"
+			mount -t pstore pstore -o ${sysfs_opts} /sys/fs/pstore
+			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

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     e52b5f59c22283b22e2b5a0d2ab9de6b92a73ebf
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Mon Oct 26 13:41:11 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Jan 28 23:06:25 2016 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=e52b5f59

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

 init.d/savecache.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/init.d/savecache.in b/init.d/savecache.in
index b3c0bdc..665f840 100644
--- a/init.d/savecache.in
+++ b/init.d/savecache.in
@@ -49,7 +49,7 @@ start()
 	fi
 	ebegin "Saving dependency cache"
 	local rc=0 save=
-	for x in deptree depconfig shutdowntime softlevel nettree rc.log; do
+	for x in deptree depconfig shutdowntime softlevel rc.log; do
 		[ -e "$RC_SVCDIR/$x" ] && save="$save $RC_SVCDIR/$x"
 	done
 	if [ -n "$save" ]; then

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     5d3e85bc310e12411135e98a397b35fb920a72a3
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Fri Jan  1 15:19:49 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Jan  1 15:19:49 2016 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=5d3e85bc

add ignore patterns for init.d directory

 init.d/.gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/init.d/.gitignore b/init.d/.gitignore
index 04f725d..b548177 100644
--- a/init.d/.gitignore
+++ b/init.d/.gitignore
@@ -1,3 +1,4 @@
+binfmt
 bootmisc
 fsck
 hostname
@@ -22,9 +23,11 @@ killprocs
 modules
 mount-ro
 mtab
+net-online
 numlock
 osclock
 procfs
+s6-svscan
 staticroute
 sysfs
 devdb

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     c45313dfa9880c4aedb72da1b2ac3159eee05a93
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  8 22:02:31 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Dec 11 19:56:03 2015 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=c45313df

netmount: use want dependency to start nfsclient

add in parsing of fstab to determine if nfsclient should be automatically
started so that netmount can mount nfs without adding nfsclient
to the default runlevel

This fixes #71.

 init.d/netmount.in | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/init.d/netmount.in b/init.d/netmount.in
index d1f3cff..ac909e0 100644
--- a/init.d/netmount.in
+++ b/init.d/netmount.in
@@ -6,8 +6,16 @@ description="Mounts network shares according to /etc/fstab."
 
 depend()
 {
-	config /etc/fstab
-	use afc-client amd nfsclient autofs openvpn
+	local opts mywant=""
+	for opts in $(fstabinfo -o -t nfs,nfs4); do
+		case $opts in
+			noauto) ;;
+			*) mywant="$mywant nfsclient"; break ;;
+		esac
+	done
+ 	config /etc/fstab
+	want $mywant	
+	use afc-client amd openvpn
 	use dns
 	keyword -jail -prefix -systemd-nspawn -vserver -lxc
 }

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     4cf6b0ecf7f5b35a6d80d76c60e77c3e1c7fee5c
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Thu Oct 29 16:27:27 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Oct 29 16:27:27 2015 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=4cf6b0ec

consolefont: add after modules to dependencies

X-Gentoo-Bug: 559540
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=559540

 init.d/consolefont.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     d26013494db8ea8699db9815ef4c4b0eb2f55e7f
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Wed Oct 14 22:43:12 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Oct 14 22:48:32 2015 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=d2601349

mtab: typo fix

 init.d/mtab.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/init.d/mtab.in b/init.d/mtab.in
index 4deaba6..f9febe6 100644
--- a/init.d/mtab.in
+++ b/init.d/mtab.in
@@ -17,7 +17,7 @@ start()
 	if ! checkpath -W /etc; then
 		rc=1
 	elif ! yesno ${mtab_is_file:-no}; then
-		[ ! -L /etc/mtab ] && [ -f /etc/mtab] &&
+		[ ! -L /etc/mtab ] && [ -f /etc/mtab ] &&
 			ewarn "Removing /etc/mtab file"
 		einfo "Creating mtab symbolic link"
 		ln -snf /proc/self/mounts /etc/mtab

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     9d53d436ae22d6f0f6fc1537e836dd1b4d31cf35
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Tue Oct 13 19:53:43 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Oct 13 20:07:53 2015 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=9d53d436

sysfs: consolidate cgroup processing code in a single function

 init.d/sysfs.in | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/init.d/sysfs.in b/init.d/sysfs.in
index f0bb313..96fa460 100644
--- a/init.d/sysfs.in
+++ b/init.d/sysfs.in
@@ -61,16 +61,6 @@ 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
@@ -108,6 +98,16 @@ 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

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     d5116cc697c9eb275ab8497939ab41504e5ce578
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Thu Oct  8 18:20:14 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Oct  8 18:20:14 2015 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=d5116cc6

localmount: white space cleanup

 init.d/localmount.in | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/init.d/localmount.in b/init.d/localmount.in
index dde94af..1812089 100644
--- a/init.d/localmount.in
+++ b/init.d/localmount.in
@@ -74,22 +74,21 @@ stop()
 
 		local aufs_branch aufs_mount_point aufs_si_id aufs_br_id branches
 		for aufs_si_dir in /sys/fs/aufs/si*; do
-			if [ -d "${aufs_si_dir}" ]; then
-				aufs_si_id="si=${aufs_si_dir#/sys/fs/aufs/si_}"
-				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
-					aufs_branch=$(sed 's/=.*//g' $x)
-					eindent
-					if ! mount -o "remount,del:$aufs_branch" "$aufs_mount_point" > /dev/null 2>&1; then
-						ewarn "Failed to remove branch $aufs_branch from aufs \
-						$aufs_mount_point"
-					fi
-					eoutdent
-					sync
-				done
-			fi
+			[ -d "${aufs_si_dir}" ] || continue
+			aufs_si_id="si=${aufs_si_dir#/sys/fs/aufs/si_}"
+			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
+				aufs_branch=$(sed 's/=.*//g' $x)
+				eindent
+				if ! mount -o "remount,del:$aufs_branch" "$aufs_mount_point" > /dev/null 2>&1; then
+					ewarn "Failed to remove branch $aufs_branch from aufs \
+					$aufs_mount_point"
+				fi
+				eoutdent
+				sync
+			done
 		done
 	fi
 

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     b86d170037197d7bdcda57c7d4c09c17bda97f31
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  8 17:49:09 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Oct  8 17:49:09 2015 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=b86d1700

localmount: clean up handling of aufs branches

X-Gentoo-Bug: 560008
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=560008

 init.d/localmount.in | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/init.d/localmount.in b/init.d/localmount.in
index 29e7348..dde94af 100644
--- a/init.d/localmount.in
+++ b/init.d/localmount.in
@@ -72,21 +72,24 @@ stop()
 			sync
 		fi
 
-		local aufs_branch aufs_mount_dir aufs_mount_point aufs_si_dir aufs_si_id
-		for aufs_si_dir in /sys/fs/aufs/*; do
-			aufs_mount_dir=${aufs_si_dir#/sys/fs/aufs/}
-			aufs_si_id="$(printf "%s" $aufs_mount_dir | sed 's/_/=/g')"
-			aufs_mount_point="$(mountinfo -o ${aufs_si_id})"
-			for x in $aufs_si_dir/br[0-9][0-9][0-9]; do
-				aufs_branch=$(sed 's/=.*//g' $x)
-				eindent
-				if ! mount -o "remount,del:$aufs_branch" "$aufs_mount_point" > /dev/null 2>&1; then
-					ewarn "Failed to remove branch $aufs_branch from aufs \
+		local aufs_branch aufs_mount_point aufs_si_id aufs_br_id branches
+		for aufs_si_dir in /sys/fs/aufs/si*; do
+			if [ -d "${aufs_si_dir}" ]; then
+				aufs_si_id="si=${aufs_si_dir#/sys/fs/aufs/si_}"
+				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
+					aufs_branch=$(sed 's/=.*//g' $x)
+					eindent
+					if ! mount -o "remount,del:$aufs_branch" "$aufs_mount_point" > /dev/null 2>&1; then
+						ewarn "Failed to remove branch $aufs_branch from aufs \
 						$aufs_mount_point"
-				fi
-				eoutdent
-				sync
-			done
+					fi
+					eoutdent
+					sync
+				done
+			fi
 		done
 	fi
 

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     6fa0d6318bcd5c98548cff2ff840bca116892ca5
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Wed Oct  7 16:35:31 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Oct  7 16:35:31 2015 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=6fa0d631

mtab: fix update logic

This advises users to remove mtab from their runlevels if /etc/mtab is a
symlink, and it creates the symlink if /etc/mtab does not exist on a
system.

X-Gentoo-Bug: 560060
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=560060

 init.d/mtab.in | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/init.d/mtab.in b/init.d/mtab.in
index 51575b4..1442ffd 100644
--- a/init.d/mtab.in
+++ b/init.d/mtab.in
@@ -12,21 +12,18 @@ depend()
 
 start()
 {
-	[ -L /etc/mtab ] && return 0
 	local rc=0
 	ebegin "Updating /etc/mtab"
-	if ! checkpath -W /etc; then
+	if [ -L /etc/mtab ] ; then
+		ewarn "/etc/mtab is a symlink, not updating."
+		ewarn "FYI - You can safely remove mtab from your runlevels."
+	elif ! checkpath -W /etc; then
 		rc=1
 	elif [ ! -e /etc/mtab ]; then
+		einfo "Creating mtab symlink"
 		ln -snf /proc/self/mounts /etc/mtab
 	else
-		ewarn "The support for updating /etc/mtab as a file is"
-		ewarn "deprecated and will be removed in the future."
-		ewarn "Please run the following command as root on your system."
-		ewarn
-		ewarn "ln -snf /proc/self/mounts /etc/mtab"
-		ewarn
-
+		einfo "Updating 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

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     17ef205bc63a4e231dccee719394a7a8563f8c3f
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Tue Oct  6 18:31:43 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Oct  6 18:31:43 2015 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=17ef205b

sysfs: use printf instead of echo to write to cgroup files

This is needed for compatibility with musl and printf is also posix.

X-Gentoo-Bug: 562334
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=562334

 init.d/sysfs.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/init.d/sysfs.in b/init.d/sysfs.in
index 5641abe..f0bb313 100644
--- a/init.d/sysfs.in
+++ b/init.d/sysfs.in
@@ -116,7 +116,7 @@ mount_cgroups()
 		mount -n -t cgroup \
 			-o none,${sysfs_opts},name=openrc,release_agent="$agent" \
 			openrc /sys/fs/cgroup/openrc
-		echo 1 > /sys/fs/cgroup/openrc/notify_on_release
+		printf 1 > /sys/fs/cgroup/openrc/notify_on_release
 	fi
 
 	yesno ${rc_controller_cgroups:-YES} && [ -e /proc/cgroups ] || return 0

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     bf0c0dd5644436efe4986c2b259b755d111266b9
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Mon Oct  5 16:21:55 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Oct  5 16:22:08 2015 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=bf0c0dd5

bootmisc: convert errors in clean_run function to warnings

X-Gentoo-Bug: 552418
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=552418

 init.d/bootmisc.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/init.d/bootmisc.in b/init.d/bootmisc.in
index 952475d..1a05920 100644
--- a/init.d/bootmisc.in
+++ b/init.d/bootmisc.in
@@ -121,11 +121,11 @@ clean_run()
 	local dir
 	# If / is still read-only due to a problem, this will fail!
 	if ! checkpath -W /; then
-		eerror "/ is not writable; unable to clean up underlying /run"
+		ewarn "/ is not writable; unable to clean up underlying /run"
 		return 1
 	fi
 	if ! checkpath -W /tmp; then
-		eerror "/tmp is not writable; unable to clean up underlying /run"
+		ewarn "/tmp is not writable; unable to clean up underlying /run"
 		return 1
 	fi
 	# Now we know that we can modify /tmp and /
@@ -141,7 +141,7 @@ clean_run()
 		rc=1
 	fi
 	if [ $rc -ne 0 ]; then
-		eerror "Could not clean up underlying /run on /"
+		ewarn "Could not clean up underlying /run on /"
 		return 1
 	fi
 }

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     1558ad2b9ebf319b85876a940d31d513bf21324f
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Mon Oct  5 16:08:11 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Oct  5 16:08:11 2015 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=1558ad2b

bootmisc: only remove temp directory if umount is successful

Change the clean_run function to only remove the temp directory if the
umount was successful.

X-Gentoo-Bug: 561230
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=561230

 init.d/bootmisc.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/init.d/bootmisc.in b/init.d/bootmisc.in
index 13f2389..952475d 100644
--- a/init.d/bootmisc.in
+++ b/init.d/bootmisc.in
@@ -136,8 +136,7 @@ clean_run()
 	dir=$(mktemp -d)
 	if [ -n "$dir" -a -d $dir -a -w $dir ]; then
 		mount --bind / $dir && rm -rf $dir/run/* || rc=1
-		umount $dir
-		rm -rf $dir
+		umount $dir && rmdir $dir
 	else
 		rc=1
 	fi

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     b047ea47e97d7e8b96d6d0e064613f6860c8eb36
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Tue Sep  1 19:41:07 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Sep  1 19:41:07 2015 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=b047ea47

localmount/netmount: on Linux, fail if some file systems do not mount

The following return codes are returned by mount -a:

0:  all file systems mounted.
32: no file systems mounted.
64: some file systems mounted.

The localmount/netmount services should fail if all file systems that
should mount did not mount.

 init.d/localmount.in | 2 --
 init.d/netmount.in   | 2 --
 2 files changed, 4 deletions(-)

diff --git a/init.d/localmount.in b/init.d/localmount.in
index 7b94790..f4bf15f 100644
--- a/init.d/localmount.in
+++ b/init.d/localmount.in
@@ -31,8 +31,6 @@ start()
 	rc=$?
 	if [ "$RC_UNAME" != Linux ]; then
 		rc=0
-	elif [ "$rc" = 64 ]; then
-		rc=0
 	fi
 	return $rc
 }

diff --git a/init.d/netmount.in b/init.d/netmount.in
index 9f8537d..d9cf9c5 100644
--- a/init.d/netmount.in
+++ b/init.d/netmount.in
@@ -25,8 +25,6 @@ start()
 	ewend $rc "Could not mount all network filesystems"
 	if [ "$RC_UNAME" != Linux ]; then
 		rc=0
-	elif [ "$rc" = 64 ]; then
-		rc=0
 	fi
 	return $rc
 }

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     b652752339690e10a55ae50d046f4cf2a98daf1a
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Fri Aug 21 00:01:23 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Aug 21 17:21:31 2015 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=b6527523

Make localmount and netmount always succeed on non-linux

 init.d/localmount.in | 9 ++++++++-
 init.d/netmount.in   | 6 ++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/init.d/localmount.in b/init.d/localmount.in
index 9d05ebc..7b94790 100644
--- a/init.d/localmount.in
+++ b/init.d/localmount.in
@@ -15,7 +15,7 @@ depend()
 start()
 {
 	# Mount local filesystems in /etc/fstab.
-	local types="noproc" x=
+	local types="noproc" x= rc=
 	for x in $net_fs_list $extra_net_fs_list; do
 		types="${types},no${x}"
 	done
@@ -28,6 +28,13 @@ start()
 	ebegin "Mounting local filesystems"
 	mount -at "$types"
 	eend $? "Some local filesystem failed to mount"
+	rc=$?
+	if [ "$RC_UNAME" != Linux ]; then
+		rc=0
+	elif [ "$rc" = 64 ]; then
+		rc=0
+	fi
+	return $rc
 }
 
 stop()

diff --git a/init.d/netmount.in b/init.d/netmount.in
index 99db185..9f8537d 100644
--- a/init.d/netmount.in
+++ b/init.d/netmount.in
@@ -23,6 +23,12 @@ start()
 	mount -at $fs
 	rc=$?
 	ewend $rc "Could not mount all network filesystems"
+	if [ "$RC_UNAME" != Linux ]; then
+		rc=0
+	elif [ "$rc" = 64 ]; then
+		rc=0
+	fi
+	return $rc
 }
 
 stop()

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     c256a7aa80c683eca6194c80b57294e4d51c9a16
Author:     Doug Freed <dwfreed <AT> mtu <DOT> edu>
AuthorDate: Mon Aug 10 14:11:27 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Aug 10 14:51:15 2015 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=c256a7aa

savecache: clean up implementation

X-Gentoo-Bug: 557222
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=557222

 init.d/savecache.in | 48 +++++++++++++++++++++++++++++-------------------
 1 file changed, 29 insertions(+), 19 deletions(-)

diff --git a/init.d/savecache.in b/init.d/savecache.in
index e185e5a..5ec1028 100644
--- a/init.d/savecache.in
+++ b/init.d/savecache.in
@@ -7,43 +7,53 @@ description="Saves the caches OpenRC uses to non volatile storage"
 start()
 {
 	if [ -e "$RC_SVCDIR"/clock-skewed ]; then
-		ewarn "WARNING: clock skew detected!"
+		ewarn "Clock skew detected!"
 		if ! yesno "${RC_GOINGDOWN}"; then
 			eerror "Not saving deptree cache"
 			return 1
 		fi
 	fi
-	if ! checkpath -W "$RC_LIBEXECDIR"; then
-		ewarn "WARNING: ${RC_LIBEXECDIR} is not writable!"
-		if ! yesno "${RC_GOINGDOWN}"; then
-			ewarn "Unable to save deptree cache"
+	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
-		return 0
-	fi
-	ebegin "Saving dependency cache"
-	local rc=
-	if [ ! -d "$RC_LIBEXECDIR"/cache ]; then
 		rm -rf "$RC_LIBEXECDIR"/cache
 		if ! mkdir -p "$RC_LIBEXECDIR"/cache; then
-			rc=$?
+			eerror "Unable to create $RC_LIBEXECDIR/cache"
+			eerror "Unable to save dependency cache"
 			if yesno "${RC_GOINGDOWN}"; then
-				rc=0
+				return 0
 			fi
-			eend $rc "Unable to create $RC_LIBEXECDIR/cache"
-			return $rc
+			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
 		fi
+		return 1
 	fi
-	local save=
+	ebegin "Saving dependency cache"
+	local rc=0 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 2>/dev/null
+		cp -p $save "$RC_LIBEXECDIR"/cache
+		rc=$?
 	fi
-	rc=$?
 	if yesno "${RC_GOINGDOWN}"; then
-		rc=0
+		if [ $rc -ne 0 ]; then
+			eerror "Unable to save dependency cache"
+		fi
+		eend 0
 	fi
-	eend $rc
+	eend $rc "Unable to save dependency cache"
 }

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     279f1e5d1013309d99509ab4b7b57521f8a4aba4
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 10 03:17:19 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Aug 10 23:50:10 2015 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=279f1e5d

binfmt: fix indent on return

 init.d/binfmt.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/init.d/binfmt.in b/init.d/binfmt.in
index 7de9aa5..46e2220 100644
--- a/init.d/binfmt.in
+++ b/init.d/binfmt.in
@@ -16,5 +16,5 @@ start()
 	ebegin "Loading custom binary format handlers"
 	"$RC_LIBEXECDIR"/sh/binfmt.sh
 	eend $?
-return 0
+	return 0
 }

[gentoo-commits] proj/openrc:master commit in: init.d/

[Mike Frysinger]

commit:     b1f5a09e91ca6568a9befcfbe7d1d7e8ed4cc6f4
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 10 03:17:19 2015 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Mon Aug 10 03:17:19 2015 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=b1f5a09e

binfmt: fix indent on return

 init.d/binfmt.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/init.d/binfmt.in b/init.d/binfmt.in
index 7de9aa5..46e2220 100644
--- a/init.d/binfmt.in
+++ b/init.d/binfmt.in
@@ -16,5 +16,5 @@ start()
 	ebegin "Loading custom binary format handlers"
 	"$RC_LIBEXECDIR"/sh/binfmt.sh
 	eend $?
-return 0
+	return 0
 }

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     1736be3bc3ebbc1440f87b49fc353e81fb0a6037
Author:     Doug Freed <dwfreed <AT> mtu <DOT> edu>
AuthorDate: Fri Jul 10 17:24:10 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Jul 10 17:24:10 2015 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=1736be3b

savecache: Fix unable to create cache message

The cache is created in $RC_LIBEXECDIR, not $RC_SVCDIR, so fix the error
message when we fail to create it to match.

 init.d/savecache.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/init.d/savecache.in b/init.d/savecache.in
index ddd58d7..e185e5a 100644
--- a/init.d/savecache.in
+++ b/init.d/savecache.in
@@ -30,7 +30,7 @@ start()
 			if yesno "${RC_GOINGDOWN}"; then
 				rc=0
 			fi
-			eend $rc "Unable to create $RC_SVCDIR/cache"
+			eend $rc "Unable to create $RC_LIBEXECDIR/cache"
 			return $rc
 		fi
 	fi

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     b209fe3859c05c286037843bb34058f849c54b15
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu May 28 04:01:43 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Jun  2 18:11:04 2015 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=b209fe38

bootmisc: Don't call dmesg in systemd-nspawn containers

This fixes #57.

 init.d/bootmisc.in | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/init.d/bootmisc.in b/init.d/bootmisc.in
index dbd258e..13f2389 100644
--- a/init.d/bootmisc.in
+++ b/init.d/bootmisc.in
@@ -214,10 +214,13 @@ start()
 	if yesno $log_dmesg; then
 		if $logw || checkpath -W /var/log; then
 			# Create an 'after-boot' dmesg log
-			if [ "$RC_SYS" != VSERVER -a "$RC_SYS" != OPENVZ -a "$RC_SYS" != LXC ]; then
-				dmesg > /var/log/dmesg
-				chmod 640 /var/log/dmesg
-			fi
+			case "$RC_SYS" in
+				VSERVER|OPENVZ|LXC|SYSTEMD-NSPAWN) ;;
+				*)
+					dmesg > /var/log/dmesg
+					chmod 640 /var/log/dmesg
+					;;
+			esac
 		fi
 	fi
 

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     7bd456ed7bf35da2d7a53650baa33637e178064e
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 29 01:03:49 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri May  1 14:14:09 2015 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=7bd456ed

Disable service scripts for systemd-nspawn

This adds the -systemd-nspawn keyword to service scripts which are not
intended to run in systemd-nspawn containers.

This fixes #52.

    X-Gentoo-Bug: 548058
    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=548058

 init.d/binfmt.in       | 2 +-
 init.d/consolefont.in  | 2 +-
 init.d/devfs.in        | 2 +-
 init.d/dmesg.in        | 2 +-
 init.d/fsck.in         | 2 +-
 init.d/hostname.in     | 2 +-
 init.d/hwclock.in      | 2 +-
 init.d/keymaps.in      | 2 +-
 init.d/localmount.in   | 2 +-
 init.d/loopback.in     | 2 +-
 init.d/modules.in      | 2 +-
 init.d/mount-ro.in     | 2 +-
 init.d/mtab.in         | 2 +-
 init.d/netmount.in     | 2 +-
 init.d/numlock.in      | 2 +-
 init.d/procfs.in       | 2 +-
 init.d/root.in         | 2 +-
 init.d/swap.in         | 2 +-
 init.d/swapfiles.in    | 2 +-
 init.d/swclock.in      | 2 +-
 init.d/sysctl.Linux.in | 2 +-
 init.d/sysfs.in        | 2 +-
 init.d/termencoding.in | 2 +-
 init.d/urandom.in      | 2 +-
 24 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/init.d/binfmt.in b/init.d/binfmt.in
index 651b131..7de9aa5 100644
--- a/init.d/binfmt.in
+++ b/init.d/binfmt.in
@@ -8,7 +8,7 @@ depend()
 {
 	after procfs
 	use modules devfs
-	keyword -openvz -prefix -vserver -lxc
+	keyword -openvz -prefix -systemd-nspawn -vserver -lxc
 }
 
 start()

diff --git a/init.d/consolefont.in b/init.d/consolefont.in
index 7ec93d6..e56cc09 100644
--- a/init.d/consolefont.in
+++ b/init.d/consolefont.in
@@ -8,7 +8,7 @@ depend()
 {
 	need localmount termencoding
 	after hotplug bootmisc
-	keyword -openvz -prefix -uml -vserver -xenu -lxc
+	keyword -openvz -prefix -systemd-nspawn -uml -vserver -xenu -lxc
 }
 
 start()

diff --git a/init.d/devfs.in b/init.d/devfs.in
index 5af68f9..86bda24 100644
--- a/init.d/devfs.in
+++ b/init.d/devfs.in
@@ -8,7 +8,7 @@ depend()
 {
 	provide dev-mount
 	before dev
-	keyword -prefix -vserver -lxc
+	keyword -prefix -systemd-nspawn -vserver -lxc
 }
 
 mount_dev()

diff --git a/init.d/dmesg.in b/init.d/dmesg.in
index 5b001fc..6e1ae53 100644
--- 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 -vserver
+	keyword -lxc -prefix -systemd-nspawn -vserver
 }
 
 start()

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

diff --git a/init.d/hostname.in b/init.d/hostname.in
index eaeb79a..5b8b75d 100644
--- a/init.d/hostname.in
+++ b/init.d/hostname.in
@@ -5,7 +5,7 @@
 description="Sets the hostname of the machine."
 
 depend() {
-	keyword -prefix -lxc
+	keyword -prefix -systemd-nspawn -lxc
 }
 
 start()

diff --git a/init.d/hwclock.in b/init.d/hwclock.in
index 4b0da02..1dde2d6 100644
--- a/init.d/hwclock.in
+++ b/init.d/hwclock.in
@@ -28,7 +28,7 @@ depend()
 	else
 		before *
 	fi
-	keyword -openvz -prefix -uml -vserver -xenu -lxc
+	keyword -openvz -prefix -systemd-nspawn -uml -vserver -xenu -lxc
 }
 
 setupopts()

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

diff --git a/init.d/localmount.in b/init.d/localmount.in
index 1335aa9..b2e8ef1 100644
--- a/init.d/localmount.in
+++ b/init.d/localmount.in
@@ -9,7 +9,7 @@ depend()
 	need fsck
 	use lvm modules mtab
 	after lvm modules
-	keyword -jail -prefix -vserver -lxc
+	keyword -jail -prefix -systemd-nspawn -vserver -lxc
 }
 
 start()

diff --git a/init.d/loopback.in b/init.d/loopback.in
index ec45a98..4602dd0 100644
--- a/init.d/loopback.in
+++ b/init.d/loopback.in
@@ -6,7 +6,7 @@ description="Configures the loopback interface."
 
 depend()
 {
-	keyword -jail -prefix -vserver
+	keyword -jail -prefix -systemd-nspawn -vserver
 }
 
 start()

diff --git a/init.d/modules.in b/init.d/modules.in
index acce97e..e10e7ae 100644
--- 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 -vserver -lxc
+	keyword -openvz -prefix -systemd-nspawn -vserver -lxc
 }
 
 start()

diff --git a/init.d/mount-ro.in b/init.d/mount-ro.in
index a6438b5..d3f7acc 100644
--- 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 -vserver -lxc
+	keyword -openvz -prefix -systemd-nspawn -vserver -lxc
 }
 
 start()

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

diff --git a/init.d/netmount.in b/init.d/netmount.in
index 7c1b122..66ba409 100644
--- 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 -vserver -lxc
+	keyword -jail -prefix -systemd-nspawn -vserver -lxc
 }
 
 start()

diff --git a/init.d/numlock.in b/init.d/numlock.in
index 1b6d0a5..cdc0da0 100644
--- 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 -vserver -lxc
+	keyword -openvz -prefix -systemd-nspawn -vserver -lxc
 }
 
 _setleds()

diff --git a/init.d/procfs.in b/init.d/procfs.in
index 167a1aa..a9fcb9a 100644
--- a/init.d/procfs.in
+++ b/init.d/procfs.in
@@ -8,7 +8,7 @@ depend()
 {
 	use modules devfs
 	need localmount
-	keyword -openvz -prefix -vserver -lxc
+	keyword -openvz -prefix -systemd-nspawn -vserver -lxc
 }
 
 start()

diff --git a/init.d/root.in b/init.d/root.in
index 1668368..0395dd1 100644
--- 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 -vserver -lxc
+	keyword -jail -openvz -prefix -systemd-nspawn -vserver -lxc
 }
 
 start()

diff --git a/init.d/swap.in b/init.d/swap.in
index a64ea60..41d4eac 100644
--- a/init.d/swap.in
+++ b/init.d/swap.in
@@ -5,7 +5,7 @@
 depend()
 {
 	before localmount
-	keyword -jail -openvz -prefix -vserver -lxc
+	keyword -jail -openvz -prefix -systemd-nspawn -vserver -lxc
 }
 
 start()

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

diff --git a/init.d/swclock.in b/init.d/swclock.in
index b74d49a..b3ea17b 100644
--- a/init.d/swclock.in
+++ b/init.d/swclock.in
@@ -8,7 +8,7 @@ depend()
 {
 	before *
 	provide clock
-	keyword -openvz -prefix -uml -vserver -xenu -lxc
+	keyword -openvz -prefix -systemd-nspawn -uml -vserver -xenu -lxc
 }
 
 # swclock is an OpenRC built in

diff --git a/init.d/sysctl.Linux.in b/init.d/sysctl.Linux.in
index 1defcec..186c6ed 100644
--- a/init.d/sysctl.Linux.in
+++ b/init.d/sysctl.Linux.in
@@ -5,7 +5,7 @@
 depend()
 {
 	before bootmisc logger
-	keyword -prefix -vserver
+	keyword -prefix -systemd-nspawn -vserver
 }
 
 start()

diff --git a/init.d/sysfs.in b/init.d/sysfs.in
index 6e52a9d..5641abe 100644
--- a/init.d/sysfs.in
+++ b/init.d/sysfs.in
@@ -8,7 +8,7 @@ sysfs_opts=nodev,noexec,nosuid
 
 depend()
 {
-	keyword -lxc -prefix -vserver
+	keyword -lxc -prefix -systemd-nspawn -vserver
 }
 
 mount_sys()

diff --git a/init.d/termencoding.in b/init.d/termencoding.in
index d3aa027..59ca625 100644
--- 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 -uml -vserver -xenu
+	keyword -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu
 	use root
 	after bootmisc
 }

diff --git a/init.d/urandom.in b/init.d/urandom.in
index ded4113..0dd2ba6 100644
--- 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
+	keyword -jail -lxc -openvz -prefix -systemd-nspawn
 }
 
 save_seed()

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     a6391f44ee6c68d674ae8425983467b971710d5d
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Sat Apr 25 20:37:52 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Apr 25 21:37:09 2015 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=a6391f44

mtab: move toward requiring /etc/mtab to be a symbolic link

This changes the mtab service in the following way:

- If /etc/mtab is a symbolic link, success is returned.
- If /etc is not writable, we warn that we could not update /etc/mtab
  and return success.
- If /etc/mtab does not exist, we create a symbolic link from
  /etc/mtab to /proc/self/mounts.
- Otherwise, we warn that updating /etc/mtab as a file is
  deprecated and continue to update it after outputting instructions to
  the user for how to move it to a symbolic link.

 init.d/mtab.in | 44 +++++++++++++++++++++++---------------------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/init.d/mtab.in b/init.d/mtab.in
index e38d33e..3ac39ed 100644
--- a/init.d/mtab.in
+++ b/init.d/mtab.in
@@ -12,28 +12,30 @@ depend()
 
 start()
 {
-	if [ -L /etc/mtab ]; then
-		return 0
-	fi
-
+	[ -L /etc/mtab ] && return 0
+	local rc=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
+	if ! checkpath -W /etc; then
+		rc=1
+	elif [ ! -e /etc/mtab ]; then
+		ln -snf /proc/self/mounts /etc/mtab
+	else
+		ewarn "The support for updating /etc/mtab as a file is"
+		ewarn "deprecated and will be removed in the future."
+		ewarn "Please run the following command as root on your system."
+		ewarn
+		ewarn "ln -snf /proc/self/mounts /etc/mtab"
+		ewarn
 
-	# 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
+		# 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
+		# Remove stale backups
+		rm -f /etc/mtab~ /etc/mtab~~
+	fi
+	eend $rc "/etc is not writable; unable to create /etc/mtab"
+	return 0
 }

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     23d806ca24845261fd89104c16bc28a60505fe5c
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Tue Apr 21 23:56:39 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Apr 21 23:56:39 2015 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=23d806ca

savecache: clean up creation of cache directory

The cache directory should be created via mkdir -p instead of
mkdir. This makes sure all parent directories are created.

Also, we now display an error message explaining that we were unable to
create the cache directory if creation fails.

 init.d/savecache.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/init.d/savecache.in b/init.d/savecache.in
index 9040732..ddd58d7 100644
--- a/init.d/savecache.in
+++ b/init.d/savecache.in
@@ -25,12 +25,12 @@ start()
 	local rc=
 	if [ ! -d "$RC_LIBEXECDIR"/cache ]; then
 		rm -rf "$RC_LIBEXECDIR"/cache
-		if ! mkdir "$RC_LIBEXECDIR"/cache; then
+		if ! mkdir -p "$RC_LIBEXECDIR"/cache; then
 			rc=$?
 			if yesno "${RC_GOINGDOWN}"; then
 				rc=0
 			fi
-			eend $rc
+			eend $rc "Unable to create $RC_SVCDIR/cache"
 			return $rc
 		fi
 	fi

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     de7d184909d561b68b411325d32471c047549bca
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Tue Apr 21 23:30:26 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Apr 21 23:30:26 2015 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=de7d1849

savecache: fix check for $RC_LIBEXECDIR writability

We were originally checking to see if $RC_LIBEXECDIR/cache was writable. For
a new install, this check will fail since this path does not exist. This
is also incorrect because later we create $RC_LIBEXECDIR/cache.

The correct check is checkpath -W $RC_LIBEXECDIR, and this fixes the
issue.

X-Gentoo-Bug: 544632
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=544632

 init.d/savecache.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/init.d/savecache.in b/init.d/savecache.in
index 4fcf3db..9040732 100644
--- a/init.d/savecache.in
+++ b/init.d/savecache.in
@@ -13,8 +13,8 @@ start()
 			return 1
 		fi
 	fi
-	if [ -e "$RC_LIBEXECDIR"/cache ] && ! checkpath -W "$RC_LIBEXECDIR"/cache; then
-		ewarn "WARNING: ${RC_LIBEXECDIR}/cache is not writable!"
+	if ! checkpath -W "$RC_LIBEXECDIR"; then
+		ewarn "WARNING: ${RC_LIBEXECDIR} is not writable!"
 		if ! yesno "${RC_GOINGDOWN}"; then
 			ewarn "Unable to save deptree cache"
 			return 1

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     4c5132421f37bd6831eab1f9527a197340f2e9ae
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Mon Apr 20 15:59:47 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Apr 20 15:59:47 2015 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=4c513242

procfs: remove usbfs and usbdevfs support

The usbfs and usbdevfs file systems have been deprecated since
Linux-2.6.32, so we remove the code to automount them.

X-Gentoo-Bug: 480312
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=480312

 init.d/procfs.in | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/init.d/procfs.in b/init.d/procfs.in
index ae6c859..24dbfaf 100644
--- a/init.d/procfs.in
+++ b/init.d/procfs.in
@@ -39,22 +39,5 @@ start()
 		fi
 	fi
 
-	# 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
-
 	return 0
 }

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     95ed0665393c353dbc24afb8c63c615402136f5d
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Mon Apr 20 16:02:01 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Apr 20 16:02:01 2015 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=95ed0665

procfs: do not force loading of usbcore module

It appears that the only reason we were force loading the usbcore
module was to facilitate mounting usbfs. Since we no longer mount
usbfs, this is no longer necessary.

X-Gentoo-Bug: 480312
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=480312

 init.d/procfs.in | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/init.d/procfs.in b/init.d/procfs.in
index 24dbfaf..dfe58cb 100644
--- a/init.d/procfs.in
+++ b/init.d/procfs.in
@@ -13,11 +13,6 @@ depend()
 
 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
-
 	# Setup Kernel Support for miscellaneous Binary Formats
 	if [ -d /proc/sys/fs/binfmt_misc -a ! -e /proc/sys/fs/binfmt_misc/register ]; then
 		if grep -qs binfmt_misc /proc/filesystems; then

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     6d81d3be1bcba81a68086f2a17561d13e1f844e6
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Sun Apr 19 18:59:12 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Apr 19 18:59:12 2015 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=6d81d3be

procfs: do not test for the existence of /proc/filesystems

The test for the existence of /proc/filesystems is redundant since we
always return success.

 init.d/procfs.in | 2 --
 1 file changed, 2 deletions(-)

diff --git a/init.d/procfs.in b/init.d/procfs.in
index 888f062..ae6c859 100644
--- a/init.d/procfs.in
+++ b/init.d/procfs.in
@@ -18,8 +18,6 @@ start()
 		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
 		if grep -qs binfmt_misc /proc/filesystems; then

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     8d307a6fadd516f26d9c72016119277a7a5c1946
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Fri Apr 17 19:15:59 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Apr 17 19:15:59 2015 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=8d307a6f

procfs: remove redundant check for OpenVZ

The check for OpenVZ is not necessary since the procfs service already
will not run on OpenVZ due to the keywords setting.

 init.d/procfs.in | 2 --
 1 file changed, 2 deletions(-)

diff --git a/init.d/procfs.in b/init.d/procfs.in
index e7d4fce..888f062 100644
--- a/init.d/procfs.in
+++ b/init.d/procfs.in
@@ -41,8 +41,6 @@ start()
 		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'.

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     62addf118067dd2cd57c3f5fee35c9e80f9fec42
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Sat Apr 11 21:29:58 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Apr 14 16:41:17 2015 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=62addf11

Move SELinux mount to sysfs service

The selinux file system is mounted under /sys, so move the code for it
to the appropriate service.

X-Gentoo-Bug: 546290
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=546290

 init.d/procfs.in | 9 ---------
 init.d/sysfs.in  | 9 +++++++++
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/init.d/procfs.in b/init.d/procfs.in
index 636cd20..e7d4fce 100644
--- a/init.d/procfs.in
+++ b/init.d/procfs.in
@@ -60,14 +60,5 @@ start()
 		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
 }

diff --git a/init.d/sysfs.in b/init.d/sysfs.in
index bc0d9d3..6e52a9d 100644
--- a/init.d/sysfs.in
+++ b/init.d/sysfs.in
@@ -82,6 +82,15 @@ 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

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     731a3affdce31e2971a84cde11df2d122049ec99
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Fri Apr  3 02:21:46 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Apr  8 14:37:04 2015 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=731a3aff

Fix script execution in the local service

The local service should use eval when it executes scripts since it has
the redirection set up in a variable.

This fixes #50.
X-Gentoo-Bug: 545012
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=545012

 init.d/local.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/init.d/local.in b/init.d/local.in
index 63f8598..254135c 100644
--- 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}\""
-			"${file}" $redirect
+			eval "${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}\""
-			"${file}" $redirect
+			eval "${file}" $redirect
 			retval=$?
 			if [ ${retval} -ne 0 ]; then
 				has_errors=1

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     3e9bb3b021620654f99a0ead71ed73d34b5c6826
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Fri Apr  3 16:10:58 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Apr  7 22:57:56 2015 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=3e9bb3b0

Make sysctl on Linux respect rc_verbose setting

We do not need to spam the console with variable settings by default.
This fixes #51.

X-Gentoo-Bug: 541922
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=541922

 init.d/sysctl.Linux.in | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/init.d/sysctl.Linux.in b/init.d/sysctl.Linux.in
index a1a8897..1defcec 100644
--- a/init.d/sysctl.Linux.in
+++ b/init.d/sysctl.Linux.in
@@ -10,7 +10,10 @@ depend()
 
 start()
 {
+	local quiet
+	yesno $rc_verbose || quiet=-q
+
 	ebegin "Configuring kernel parameters"
-	sysctl --system
+	sysctl ${quiet} --system
 	eend $? "Unable to configure some kernel parameters"
 }

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     be497229b64613ebfbc4073985107a275d49f78e
Author:     Anthony Donnelly <Amzo <AT> archbsd <DOT> com>
AuthorDate: Wed Mar  4 09:07:12 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Mar 23 19:06:52 2015 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=be497229

Fix savecore service on FreeBSD

savecore -C only needs the dumpdevice otherwise it causes an error on startup.

This fixes #40.

 init.d/savecore.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/init.d/savecore.in b/init.d/savecore.in
index b1b6ca3..cb00564 100644
--- 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_dir" $dump_device >/dev/null
+		savecore -C $dump_device >/dev/null
 	else
 		ls "$dump_dir"/bsd* > /dev/null 2>&1
 	fi

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     ccd83a5e9cc24833e1ab098cac1688f69ab6e9b6
Author:     Will Miles <wmiles <AT> sgl <DOT> com>
AuthorDate: Wed Jan 14 23:19:13 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Mar 20 22:21:57 2015 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=ccd83a5e

savecache: Make sure cache directory exists before running checkpath

checkpath -W can fail if the specified path doesn't actually exist yet.
In this case savecache script should attempt to create the path if it is
missing, however it is pre-empted by the checkpath call.  This patch adds
an explicit existence test before executing checkpath.

This fixes #36.

 init.d/savecache.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/init.d/savecache.in b/init.d/savecache.in
index dde02dd..4fcf3db 100644
--- a/init.d/savecache.in
+++ b/init.d/savecache.in
@@ -13,7 +13,7 @@ start()
 			return 1
 		fi
 	fi
-	if ! checkpath -W "$RC_LIBEXECDIR"/cache; then
+	if [ -e "$RC_LIBEXECDIR"/cache ] && ! checkpath -W "$RC_LIBEXECDIR"/cache; then
 		ewarn "WARNING: ${RC_LIBEXECDIR}/cache is not writable!"
 		if ! yesno "${RC_GOINGDOWN}"; then
 			ewarn "Unable to save deptree cache"

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     7bbb73574b44972b0c1b364e24f71623068d7a1c
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 27 01:58:22 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Feb 27 16:14:44 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=7bbb7357

bootmisc: clean_run safety improvements.

If /tmp or / are read-only, the clean_run function can fail in some very
bad ways.

1. dir=$(mktemp -d) returns an EMPTY string on error.
2. "mount -o bind / $dir", and don't check the result of that,
3. "rm -rf $dir/run/*", which removes the REAL /run contents
4. box gets very weird from this point forward

Signed-Off-By: Robin H. Johnson <robbat2 <AT> gentoo.org>
Signed-Off-By: Chip Parker <infowolfe <AT> gmail.com>
Reported-by: Chip Parker <infowolfe <AT> gmail.com>
Tested-by: Chip Parker <infowolfe <AT> gmail.com>

---
 init.d/bootmisc.in | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/init.d/bootmisc.in b/init.d/bootmisc.in
index 2ec075f..dbd258e 100644
--- a/init.d/bootmisc.in
+++ b/init.d/bootmisc.in
@@ -119,11 +119,32 @@ 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
+		eerror "/ is not writable; unable to clean up underlying /run"
+		return 1
+	fi
+	if ! checkpath -W /tmp; then
+		eerror "/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)
-	mount --bind / $dir
-	rm -rf $dir/run/*
-	umount $dir
-	rm -rf $dir
+	if [ -n "$dir" -a -d $dir -a -w $dir ]; then
+		mount --bind / $dir && rm -rf $dir/run/* || rc=1
+		umount $dir
+		rm -rf $dir
+	else
+		rc=1
+	fi
+	if [ $rc -ne 0 ]; then
+		eerror "Could not clean up underlying /run on /"
+		return 1
+	fi
 }
 
 start()

[gentoo-commits] proj/openrc:master commit in: init.d/

[Robin H. Johnson]

commit:     ac3d2bb6b761e72a5b5161639beeb28f37b380a0
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 27 01:58:22 2015 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Feb 27 02:28:41 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=ac3d2bb6

bootmisc: clean_run safety improvements.

If /tmp or / are read-only, the clean_run function can fail in some very
bad ways.

1. dir=$(mktemp -d) returns an EMPTY string on error.
2. "mount -o bind / $dir", and don't check the result of that,
3. "rm -rf $dir/run/*", which removes the REAL /run contents
4. box gets very weird from this point forward

Signed-Off-By: Robin H. Johnson <robbat2 <AT> gentoo.org>
Signed-Off-By: Chip Parker <infowolfe <AT> gmail.com>
Reported-by: Chip Parker <infowolfe <AT> gmail.com>
Tested-by: Chip Parker <infowolfe <AT> gmail.com>

---
 init.d/bootmisc.in | 33 +++++++++++++++++++++++++++++----
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git a/init.d/bootmisc.in b/init.d/bootmisc.in
index 2ec075f..2f3feee 100644
--- a/init.d/bootmisc.in
+++ b/init.d/bootmisc.in
@@ -119,11 +119,36 @@ clean_run()
 {
 	[ "$RC_SYS" = VSERVER -o "$RC_SYS" = LXC ] && return 0
 	local dir
+	# If / is stll read-only due to a problem, this will fail!
+	mountinfo -q --options-regex '^rw(,|$)' /
+	if [ $? -ne 0 ]; then
+		eerror "/ is not writable; unable to clean up underlying /run"
+		return 1
+	fi
+	# Get the mountpoint used by /tmp (it might be /tmp or /)
+	tmpmnt=`/usr/bin/stat -c '%m' /tmp`
+	mountinfo -q --options-regex '^rw(,|$)' $tmpmnt
+	if [ -n "$tmpmnt" -a $? -ne 0 ]; then
+		eerror "/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)
-	mount --bind / $dir
-	rm -rf $dir/run/*
-	umount $dir
-	rm -rf $dir
+	if [ -n "$dir" -a -d $dir -a -w $dir ]; then
+		mount --bind / $dir && rm -rf $dir/run/* || rc=1
+		umount $dir
+		rm -rf $dir
+	else
+		rc=1
+	fi
+	if [ $rc -ne 0 ]; then
+		eerror "Could not clean up underlying /run on /"
+		return 1
+	fi
 }
 
 start()

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     9dfb85d5d236dd126d13d039eb02a97aa0e6c8ac
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Sun Jan 25 22:23:47 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Feb 18 15:58:54 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=9dfb85d5

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

---
 init.d/local.in | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/init.d/local.in b/init.d/local.in
index 180735d..63f8598 100644
--- a/init.d/local.in
+++ b/init.d/local.in
@@ -14,12 +14,13 @@ start()
 {
 	ebegin "Starting local"
 
-	local file has_errors=0 retval
+	local file has_errors=0 redirect retval
+	yesno $rc_verbose || redirect='> /dev/null 2>&1'
 	eindent
 	for file in @SYSCONFDIR@/local.d/*.start; do
 		if [ -x "${file}" ]; then
 			vebegin "Executing \"${file}\""
-			"${file}" 2>&1 >/dev/null
+			"${file}" $redirect
 			retval=$?
 			if [ ${retval} -ne 0 ]; then
 				has_errors=1
@@ -52,12 +53,13 @@ stop()
 {
 	ebegin "Stopping local"
 
-	local file has_errors=0 retval
+	local file has_errors=0 redirect retval
+	yesno $rc_verbose || redirect='> /dev/null 2>&1'
 	eindent
 	for file in @SYSCONFDIR@/local.d/*.stop; do
 		if [ -x "${file}" ]; then
 			vebegin "Executing \"${file}\""
-			"${file}" 2>&1 >/dev/null
+			"${file}" $redirect
 			retval=$?
 			if [ ${retval} -ne 0 ]; then
 				has_errors=1

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     3100114bc104741145fb6c1d4b1664759114cc5c
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Tue Feb  3 16:53:48 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Feb  3 16:54:57 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=3100114b

Add nfsclient to netmount use dependencies

X-Gentoo-Bug: 537996
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=537996

---
 init.d/netmount.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/init.d/netmount.in b/init.d/netmount.in
index 4ea0c4c..7c1b122 100644
--- a/init.d/netmount.in
+++ b/init.d/netmount.in
@@ -7,7 +7,7 @@ description="Mounts network shares according to /etc/fstab."
 depend()
 {
 	config /etc/fstab
-	use afc-client amd autofs openvpn
+	use afc-client amd nfsclient autofs openvpn
 	use dns
 	keyword -jail -prefix -vserver -lxc
 }

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     8250ac94dfc6156075081e0e2d0986cb51b3098d
Author:     Consus <consus <AT> gmx <DOT> com>
AuthorDate: Sat Jan 24 13:06:36 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Jan 24 19:36:48 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=8250ac94

tmpfiles.*: Follow OpenRC's message style

Just to be consistent.

---
 init.d/tmpfiles.dev.in   | 4 ++--
 init.d/tmpfiles.setup.in | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/init.d/tmpfiles.dev.in b/init.d/tmpfiles.dev.in
index c809bf9..c70a29e 100644
--- 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

diff --git a/init.d/tmpfiles.setup.in b/init.d/tmpfiles.setup.in
index d5a6ecd..5872fea 100644
--- 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 $?

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     3c5dc0ec7774a72e243da43ac5180ea36a311ad8
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Sun Jan 18 15:12:58 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Jan 18 15:13:43 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=3c5dc0ec

tmpfiles.dev: pass --boot to tmpfiles.sh so kmod works properly

---
 init.d/tmpfiles.dev.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/init.d/tmpfiles.dev.in b/init.d/tmpfiles.dev.in
index 3566928..c809bf9 100644
--- a/init.d/tmpfiles.dev.in
+++ b/init.d/tmpfiles.dev.in
@@ -14,7 +14,7 @@ depend()
 start()
 {
 	ebegin "setting up tmpfiles.d entries for /dev"
-	@LIBEXECDIR@/sh/tmpfiles.sh --prefix=/dev --create ${tmpfiles_opts}
+	@LIBEXECDIR@/sh/tmpfiles.sh --prefix=/dev --create --boot ${tmpfiles_opts}
 	eend $?
 	return 0
 }

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     30cc3cdb76a66c7c0f89a52db4e5cff77b570e31
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Sun Nov 23 16:28:21 2014 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Nov 24 03:39:20 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=30cc3cdb

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

---
 init.d/sysfs.in | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/init.d/sysfs.in b/init.d/sysfs.in
index 67485c2..bc0d9d3 100644
--- a/init.d/sysfs.in
+++ b/init.d/sysfs.in
@@ -113,7 +113,8 @@ mount_cgroups()
 	yesno ${rc_controller_cgroups:-YES} && [ -e /proc/cgroups ] || return 0
 	while read name hier groups enabled rest; do
 		case "${enabled}" in
-			1)	mkdir /sys/fs/cgroup/${name}
+			1)	mountinfo -q /sys/fs/cgroup/${name} && continue
+				mkdir /sys/fs/cgroup/${name}
 				mount -n -t cgroup -o ${sysfs_opts},${name} \
 					${name} /sys/fs/cgroup/${name}
 				;;
@@ -129,25 +130,13 @@ restorecon_sys()
 		restorecon -rF /sys/fs/cgroup >/dev/null 2>&1
 		eend $?
 	fi
-
-	return 0
 }
 
 start()
 {
-	local retval
 	mount_sys
-	retval=$?
-	if [ $retval -eq 0 ]; then
-		mount_misc
-		retval=$?
-	fi
-	if [ $retval -eq 0 ]; then
-		mount_cgroups
-		retval=$?
-	fi
-
+	mount_misc
+	mount_cgroups
 	restorecon_sys
-
-	return $retval
+	return 0
 }

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     3fad31a994f7eb14f3f001f3980eb2b0ae8fe4f1
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Thu Nov 20 17:25:48 2014 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Nov 20 17:25:48 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=3fad31a9

init.d: add osclock to ignore patterns

---
 init.d/.gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/init.d/.gitignore b/init.d/.gitignore
index 3a5d003..04f725d 100644
--- a/init.d/.gitignore
+++ b/init.d/.gitignore
@@ -23,6 +23,7 @@ modules
 mount-ro
 mtab
 numlock
+osclock
 procfs
 staticroute
 sysfs

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     8d0ca13fbd38e782bae655eca6646dabc8d63899
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Thu Nov 20 16:55:53 2014 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Nov 20 16:55:53 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=8d0ca13f

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.

---
 init.d/devfs.in | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/init.d/devfs.in b/init.d/devfs.in
index bcdbdcd..5af68f9 100644
--- a/init.d/devfs.in
+++ b/init.d/devfs.in
@@ -69,7 +69,14 @@ seed_dev()
 	# so udev can add its start-message to dmesg
 	[ -c /dev/kmsg ] || mknod -m 660 /dev/kmsg c 1 11
 
-	# Mount required stuff as user may not have then in /etc/fstab
+	# extra symbolic links not provided by default
+	[ -e /dev/fd ] || ln -snf /proc/self/fd /dev/fd
+	[ -e /dev/stdin ] || ln -snf /proc/self/fd/0 /dev/stdin
+	[ -e /dev/stdout ] || ln -snf /proc/self/fd/1 /dev/stdout
+	[ -e /dev/stderr ] || ln -snf /proc/self/fd/2 /dev/stderr
+	[ -e /proc/kcore ] && ln -snf /proc/kcore /dev/core
+
+	# Mount required directories as user may not have them in /etc/fstab
 	for x in \
 		"mqueue /dev/mqueue 1777 ,nodev mqueue" \
 		"devpts /dev/pts 0755 ,gid=5,mode=0620 devpts" \

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     93ba67eff9333e434c969bb8131467f777546764
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Thu Nov  6 20:38:17 2014 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Nov  6 20:38:17 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=93ba67ef

netmount: unmount nfs file systems

---
 init.d/netmount.in | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/init.d/netmount.in b/init.d/netmount.in
index f6145f0..4ea0c4c 100644
--- a/init.d/netmount.in
+++ b/init.d/netmount.in
@@ -47,14 +47,7 @@ stop()
 	eindent
 	fs=
 	for x in $net_fs_list $extra_net_fs_list; do
-		case "$x" in
-			nfs|nfs4)
-				continue
-				;;
-			*)
-				fs="$fs${fs:+|}$x"
-				;;
-		esac
+		fs="$fs${fs:+|}$x"
 	done
 	[ -n "$fs" ] && fs="^($fs)$"
 	do_unmount umount ${fs:+--fstype-regex} $fs --netdev

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     0bfde472d0154f14ea88c0f5ddd21a510443d713
Author:     Ralph Sennhauser <sera <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 27 22:27:23 2014 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Oct 27 23:13:22 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=0bfde472

Add osclock service

This scripts sole purpose is to "provide clock" on OSs that already
take care of the clock being properly set.

---
 init.d/Makefile   |  2 +-
 init.d/osclock.in | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/init.d/Makefile b/init.d/Makefile
index c2c3ea1..85925b1 100644
--- a/init.d/Makefile
+++ b/init.d/Makefile
@@ -2,7 +2,7 @@ include ../mk/net.mk
 
 DIR=	${INITDIR}
 SRCS=	bootmisc.in fsck.in hostname.in local.in localmount.in loopback.in \
-	netmount.in root.in savecache.in swap.in swapfiles.in \
+	netmount.in osclock.in root.in savecache.in swap.in swapfiles.in \
 	tmpfiles.setup.in swclock.in sysctl.in urandom.in ${SRCS-${OS}}
 BIN=	${OBJS}
 

diff --git a/init.d/osclock.in b/init.d/osclock.in
new file mode 100644
index 0000000..ce892d2
--- /dev/null
+++ b/init.d/osclock.in
@@ -0,0 +1,12 @@
+#!@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
+}

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     85da4a5e2621dc5f5356d440735aa058008a1b7e
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Wed Oct  1 22:14:25 2014 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Oct 16 21:41:02 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=85da4a5e

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

---
 init.d/netmount.in | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/init.d/netmount.in b/init.d/netmount.in
index 39ab0bc..f6145f0 100644
--- a/init.d/netmount.in
+++ b/init.d/netmount.in
@@ -2,10 +2,7 @@
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
-description="Mounts network shares, other than NFS, according to /etc/fstab."
-# We skip all NFS shares in this script because they require extra
-# daemons to be running on the client in order to work correctly.
-# It is best to allow nfs-utils to handle all nfs shares.
+description="Mounts network shares according to /etc/fstab."
 
 depend()
 {
@@ -19,11 +16,6 @@ start()
 {
 	local x= fs= rc=
 	for x in $net_fs_list $extra_net_fs_list; do
-		case "$x" in
-			nfs|nfs4)
-			continue
-			;;
-		esac
 		fs="$fs${fs:+,}$x"
 	done
 
@@ -46,14 +38,7 @@ stop()
 	. "$RC_LIBEXECDIR"/sh/rc-mount.sh
 
 	for x in $net_fs_list $extra_net_fs_list; do
-		case "$x" in
-			nfs|nfs4)
-				continue
-				;;
-			*)
-				fs="$fs${fs:+,}$x"
-				;;
-		esac
+		fs="$fs${fs:+,}$x"
 	done
 	if [ -n "$fs" ]; then
 		umount -at $fs || eerror "Failed to simply unmount filesystems"

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     ad770d739cd7d68dd16b4b2e23d4822ebeb3305b
Author:     Rick Farina (ZeroChaos) <sidhayn <AT> gmail <DOT> com>
AuthorDate: Mon Oct  6 16:15:44 2014 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Oct  6 21:24:44 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=ad770d73

localmount: unmount aufs branches

---
 init.d/localmount.in | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/init.d/localmount.in b/init.d/localmount.in
index bf3dd0f..1335aa9 100644
--- a/init.d/localmount.in
+++ b/init.d/localmount.in
@@ -63,6 +63,31 @@ stop()
 
 	. "$RC_LIBEXECDIR"/sh/rc-mount.sh
 
+	if [ "$RC_UNAME" = Linux ] && [ -d /sys/fs/aufs ] ; then
+		#if / is aufs we remount it noxino during shutdown
+		if mountinfo -q -f '^aufs$' / ; then
+			mount -o remount,noxino,rw /
+			sync
+		fi
+
+		local aufs_branch aufs_mount_dir aufs_mount_point aufs_si_dir aufs_si_id
+		for aufs_si_dir in /sys/fs/aufs/*; do
+			aufs_mount_dir=${aufs_si_dir#/sys/fs/aufs/}
+			aufs_si_id="$(printf "%s" $aufs_mount_dir | sed 's/_/=/g')"
+			aufs_mount_point="$(mountinfo -o ${aufs_si_id})"
+			for x in $aufs_si_dir/br[0-9][0-9][0-9]; do
+				aufs_branch=$(sed 's/=.*//g' $x)
+				eindent
+				if ! mount -o "remount,del:$aufs_branch" "$aufs_mount_point" > /dev/null 2>&1; then
+					ewarn "Failed to remove branch $aufs_branch from aufs \
+						$aufs_mount_point"
+				fi
+				eoutdent
+				sync
+			done
+		done
+	fi
+
 	# Umount loop devices
 	einfo "Unmounting loop devices"
 	eindent

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     aa2b7b6ff12d6f4965e1896681366841deb89b9b
Author:     Rick Farina (zero_chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  6 16:15:44 2014 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Oct  6 20:27:13 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=aa2b7b6f

localmount: unmount aufs branches

---
 init.d/localmount.in | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/init.d/localmount.in b/init.d/localmount.in
index bf3dd0f..1335aa9 100644
--- a/init.d/localmount.in
+++ b/init.d/localmount.in
@@ -63,6 +63,31 @@ stop()
 
 	. "$RC_LIBEXECDIR"/sh/rc-mount.sh
 
+	if [ "$RC_UNAME" = Linux ] && [ -d /sys/fs/aufs ] ; then
+		#if / is aufs we remount it noxino during shutdown
+		if mountinfo -q -f '^aufs$' / ; then
+			mount -o remount,noxino,rw /
+			sync
+		fi
+
+		local aufs_branch aufs_mount_dir aufs_mount_point aufs_si_dir aufs_si_id
+		for aufs_si_dir in /sys/fs/aufs/*; do
+			aufs_mount_dir=${aufs_si_dir#/sys/fs/aufs/}
+			aufs_si_id="$(printf "%s" $aufs_mount_dir | sed 's/_/=/g')"
+			aufs_mount_point="$(mountinfo -o ${aufs_si_id})"
+			for x in $aufs_si_dir/br[0-9][0-9][0-9]; do
+				aufs_branch=$(sed 's/=.*//g' $x)
+				eindent
+				if ! mount -o "remount,del:$aufs_branch" "$aufs_mount_point" > /dev/null 2>&1; then
+					ewarn "Failed to remove branch $aufs_branch from aufs \
+						$aufs_mount_point"
+				fi
+				eoutdent
+				sync
+			done
+		done
+	fi
+
 	# Umount loop devices
 	einfo "Unmounting loop devices"
 	eindent

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     e860b7cb4f3749528ae3db0f3cb500ef889d2781
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Tue Sep 16 22:44:30 2014 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Sep 16 22:44:30 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=e860b7cb

Revert "sysfs: fix permissions on cgroup mounts"

This reverts commit 7a25491ced95e14b04b8fe6225171564c87fcde0.
This was broken; I need to look further into it.

---
 init.d/sysfs.in | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/init.d/sysfs.in b/init.d/sysfs.in
index 1e861ef..67485c2 100644
--- a/init.d/sysfs.in
+++ b/init.d/sysfs.in
@@ -101,12 +101,11 @@ mount_cgroups()
 {
 	mountinfo -q /sys/fs/cgroup || return 0
 
-	local opts="${sysfs_opts},mode=755"
 	if ! mountinfo -q /sys/fs/cgroup/openrc; then
 		local agent="@LIBEXECDIR@/sh/cgroup-release-agent.sh"
 		mkdir /sys/fs/cgroup/openrc
 		mount -n -t cgroup \
-			-o none,${opts},name=openrc,release_agent="$agent" \
+			-o none,${sysfs_opts},name=openrc,release_agent="$agent" \
 			openrc /sys/fs/cgroup/openrc
 		echo 1 > /sys/fs/cgroup/openrc/notify_on_release
 	fi
@@ -115,7 +114,7 @@ mount_cgroups()
 	while read name hier groups enabled rest; do
 		case "${enabled}" in
 			1)	mkdir /sys/fs/cgroup/${name}
-				mount -n -t cgroup -o ${opts},${name} \
+				mount -n -t cgroup -o ${sysfs_opts},${name} \
 					${name} /sys/fs/cgroup/${name}
 				;;
 		esac

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     7a25491ced95e14b04b8fe6225171564c87fcde0
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Tue Sep 16 20:14:12 2014 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Sep 16 20:14:12 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=7a25491c

sysfs: fix permissions on cgroup mounts

---
 init.d/sysfs.in | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/init.d/sysfs.in b/init.d/sysfs.in
index 67485c2..1e861ef 100644
--- a/init.d/sysfs.in
+++ b/init.d/sysfs.in
@@ -101,11 +101,12 @@ mount_cgroups()
 {
 	mountinfo -q /sys/fs/cgroup || return 0
 
+	local opts="${sysfs_opts},mode=755"
 	if ! mountinfo -q /sys/fs/cgroup/openrc; then
 		local agent="@LIBEXECDIR@/sh/cgroup-release-agent.sh"
 		mkdir /sys/fs/cgroup/openrc
 		mount -n -t cgroup \
-			-o none,${sysfs_opts},name=openrc,release_agent="$agent" \
+			-o none,${opts},name=openrc,release_agent="$agent" \
 			openrc /sys/fs/cgroup/openrc
 		echo 1 > /sys/fs/cgroup/openrc/notify_on_release
 	fi
@@ -114,7 +115,7 @@ mount_cgroups()
 	while read name hier groups enabled rest; do
 		case "${enabled}" in
 			1)	mkdir /sys/fs/cgroup/${name}
-				mount -n -t cgroup -o ${sysfs_opts},${name} \
+				mount -n -t cgroup -o ${opts},${name} \
 					${name} /sys/fs/cgroup/${name}
 				;;
 		esac

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     d032b17897278659ae103d1bcf2aea7739cdbfbb
Author:     Joe M <joe9mail <AT> gmail <DOT> com>
AuthorDate: Fri Aug 29 14:10:58 2014 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Aug 29 14:10:58 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=d032b178

savecache: check permissions on the correct directory

---
 init.d/savecache.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/init.d/savecache.in b/init.d/savecache.in
index 9040732..dde02dd 100644
--- a/init.d/savecache.in
+++ b/init.d/savecache.in
@@ -13,8 +13,8 @@ start()
 			return 1
 		fi
 	fi
-	if ! checkpath -W "$RC_LIBEXECDIR"; then
-		ewarn "WARNING: ${RC_LIBEXECDIR} is not writable!"
+	if ! checkpath -W "$RC_LIBEXECDIR"/cache; then
+		ewarn "WARNING: ${RC_LIBEXECDIR}/cache is not writable!"
 		if ! yesno "${RC_GOINGDOWN}"; then
 			ewarn "Unable to save deptree cache"
 			return 1

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     4f4f00d612ce6b43a2dcba9e0c39816e5d6d92a7
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Fri Aug 22 17:41:55 2014 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Aug 22 19:01:20 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=4f4f00d6

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

---
 init.d/sysfs.in | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/init.d/sysfs.in b/init.d/sysfs.in
index 2156670..67485c2 100644
--- a/init.d/sysfs.in
+++ b/init.d/sysfs.in
@@ -100,14 +100,15 @@ mount_misc()
 mount_cgroups()
 {
 	mountinfo -q /sys/fs/cgroup || return 0
-	mountinfo -q /sys/fs/cgroup/openrc || return 0
-
-	local agent="@LIBEXECDIR@/sh/cgroup-release-agent.sh"
-	mkdir /sys/fs/cgroup/openrc
-	mount -n -t cgroup \
-		-o none,${sysfs_opts},name=openrc,release_agent="$agent" \
-		openrc /sys/fs/cgroup/openrc
-	echo 1 > /sys/fs/cgroup/openrc/notify_on_release
+
+	if ! mountinfo -q /sys/fs/cgroup/openrc; then
+		local agent="@LIBEXECDIR@/sh/cgroup-release-agent.sh"
+		mkdir /sys/fs/cgroup/openrc
+		mount -n -t cgroup \
+			-o none,${sysfs_opts},name=openrc,release_agent="$agent" \
+			openrc /sys/fs/cgroup/openrc
+		echo 1 > /sys/fs/cgroup/openrc/notify_on_release
+	fi
 
 	yesno ${rc_controller_cgroups:-YES} && [ -e /proc/cgroups ] || return 0
 	while read name hier groups enabled rest; do

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     7b744befac2049eb6372a7f0c5420c740aa0a4ea
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Sun Aug 10 22:15:05 2014 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Aug 10 22:15:05 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=7b744bef

bootmisc: do not run the clean_run function in an LXC container

---
 init.d/bootmisc.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/init.d/bootmisc.in b/init.d/bootmisc.in
index 3e56ebc..2ec075f 100644
--- a/init.d/bootmisc.in
+++ b/init.d/bootmisc.in
@@ -117,7 +117,7 @@ migrate_to_run()
 
 clean_run()
 {
-	[ "$RC_SYS" = VSERVER ] && return 0
+	[ "$RC_SYS" = VSERVER -o "$RC_SYS" = LXC ] && return 0
 	local dir
 	dir=$(mktemp -d)
 	mount --bind / $dir

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     7b744befac2049eb6372a7f0c5420c740aa0a4ea
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Sun Aug 10 22:15:05 2014 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Aug 10 22:15:05 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=7b744bef

bootmisc: do not run the clean_run function in an LXC container

---
 init.d/bootmisc.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/init.d/bootmisc.in b/init.d/bootmisc.in
index 3e56ebc..2ec075f 100644
--- a/init.d/bootmisc.in
+++ b/init.d/bootmisc.in
@@ -117,7 +117,7 @@ migrate_to_run()
 
 clean_run()
 {
-	[ "$RC_SYS" = VSERVER ] && return 0
+	[ "$RC_SYS" = VSERVER -o "$RC_SYS" = LXC ] && return 0
 	local dir
 	dir=$(mktemp -d)
 	mount --bind / $dir

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     d29db70efb2adfbd200ba4a03fa78653e97893a6
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Thu Aug  7 03:01:30 2014 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Aug  9 17:35:04 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=d29db70e

sysctl.linux.in: use the --system option

According to the sysctl man page, the --system option causes sysctl to
process all system configuration files, which include the following:

/run/sysctl.d/*.conf
/etc/sysctl.d/*.conf
/usr/local/lib/sysctl.d/*.conf
/usr/lib/sysctl.d/*.conf
/lib/sysctl.d/*.conf
/etc/sysctl.conf

X-Gentoo-Bug: 484796
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=484796

---
 init.d/sysctl.Linux.in | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)

diff --git a/init.d/sysctl.Linux.in b/init.d/sysctl.Linux.in
index cda86b5..a1a8897 100644
--- a/init.d/sysctl.Linux.in
+++ b/init.d/sysctl.Linux.in
@@ -10,25 +10,7 @@ depend()
 
 start()
 {
-	local conf= retval=0 err errs
-
 	ebegin "Configuring kernel parameters"
-	eindent
-
-	for conf in @SYSCONFDIR@/sysctl.conf @SYSCONFDIR@/sysctl.d/*.conf; do
-		if [ -r "$conf" ]; then
-			vebegin "applying $conf"
-			if ! err=$(sysctl -p "$conf" 2>&1 >/dev/null) ; then
-				errs="${errs} ${err}"
-				sysctl -e -p "${conf}" >/dev/null
-			fi
-			veend $? || retval=1
-		fi
-	done
-
-	eoutdent
-	if [ ${retval} -eq 0 ] && [ -n "${errs}" ] ; then
-		ewarn "Unknown keys:${errs}"
-	fi
-	eend $retval "Some errors were encountered: ${errs}"
+	sysctl --system
+	eend $? "Unable to configure some kernel parameters"
 }

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     d29db70efb2adfbd200ba4a03fa78653e97893a6
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Thu Aug  7 03:01:30 2014 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Aug  9 17:35:04 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=d29db70e

sysctl.linux.in: use the --system option

According to the sysctl man page, the --system option causes sysctl to
process all system configuration files, which include the following:

/run/sysctl.d/*.conf
/etc/sysctl.d/*.conf
/usr/local/lib/sysctl.d/*.conf
/usr/lib/sysctl.d/*.conf
/lib/sysctl.d/*.conf
/etc/sysctl.conf

X-Gentoo-Bug: 484796
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=484796

---
 init.d/sysctl.Linux.in | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)

diff --git a/init.d/sysctl.Linux.in b/init.d/sysctl.Linux.in
index cda86b5..a1a8897 100644
--- a/init.d/sysctl.Linux.in
+++ b/init.d/sysctl.Linux.in
@@ -10,25 +10,7 @@ depend()
 
 start()
 {
-	local conf= retval=0 err errs
-
 	ebegin "Configuring kernel parameters"
-	eindent
-
-	for conf in @SYSCONFDIR@/sysctl.conf @SYSCONFDIR@/sysctl.d/*.conf; do
-		if [ -r "$conf" ]; then
-			vebegin "applying $conf"
-			if ! err=$(sysctl -p "$conf" 2>&1 >/dev/null) ; then
-				errs="${errs} ${err}"
-				sysctl -e -p "${conf}" >/dev/null
-			fi
-			veend $? || retval=1
-		fi
-	done
-
-	eoutdent
-	if [ ${retval} -eq 0 ] && [ -n "${errs}" ] ; then
-		ewarn "Unknown keys:${errs}"
-	fi
-	eend $retval "Some errors were encountered: ${errs}"
+	sysctl --system
+	eend $? "Unable to configure some kernel parameters"
 }

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     e3bfb68aece9378a0669c2893285808100fd5ea6
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Wed Jul 23 21:19:25 2014 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Jul 24 22:40:14 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=e3bfb68a

hwclock: always set the kernel's timezone

The hwclock service should set the time zone regardless of the setting
of the clock_hctosys variable. This needs to be done to prevent issues
when the system time is being synchronized using ntp.

X-Gentoo-Bug: 434410
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=434410

---
 init.d/hwclock.in | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/init.d/hwclock.in b/init.d/hwclock.in
index 823a5ab..4b0da02 100644
--- a/init.d/hwclock.in
+++ b/init.d/hwclock.in
@@ -83,22 +83,17 @@ start()
 		fi
 	fi
 
+	# Always set the kernel's time zone.
+	_hwclock --systz $utc_cmd $clock_args
+	: $(( retval += $? ))
+
 	if [ -e /etc/adjtime ] && yesno $clock_adjfile; then
 		_hwclock --adjust $utc_cmd
 		: $(( retval += $? ))
 	fi
 
-	# If setting UTC, don't bother to run hwclock when first booting
-	# as that's the default
-	if [ "$PREVLEVEL" != N -o \
-		"$utc_cmd" != --utc -o \
-		-n "$clock_args" ];
-	then
-		if yesno ${clock_hctosys:-YES}; then
-			_hwclock --hctosys $utc_cmd $clock_args
-		else
-			_hwclock --systz $utc_cmd $clock_args
-		fi
+	if yesno ${clock_hctosys:-YES}; then
+		_hwclock --hctosys $utc_cmd $clock_args
 		: $(( retval += $? ))
 	fi
 

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     e3bfb68aece9378a0669c2893285808100fd5ea6
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Wed Jul 23 21:19:25 2014 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Jul 24 22:40:14 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=e3bfb68a

hwclock: always set the kernel's timezone

The hwclock service should set the time zone regardless of the setting
of the clock_hctosys variable. This needs to be done to prevent issues
when the system time is being synchronized using ntp.

X-Gentoo-Bug: 434410
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=434410

---
 init.d/hwclock.in | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/init.d/hwclock.in b/init.d/hwclock.in
index 823a5ab..4b0da02 100644
--- a/init.d/hwclock.in
+++ b/init.d/hwclock.in
@@ -83,22 +83,17 @@ start()
 		fi
 	fi
 
+	# Always set the kernel's time zone.
+	_hwclock --systz $utc_cmd $clock_args
+	: $(( retval += $? ))
+
 	if [ -e /etc/adjtime ] && yesno $clock_adjfile; then
 		_hwclock --adjust $utc_cmd
 		: $(( retval += $? ))
 	fi
 
-	# If setting UTC, don't bother to run hwclock when first booting
-	# as that's the default
-	if [ "$PREVLEVEL" != N -o \
-		"$utc_cmd" != --utc -o \
-		-n "$clock_args" ];
-	then
-		if yesno ${clock_hctosys:-YES}; then
-			_hwclock --hctosys $utc_cmd $clock_args
-		else
-			_hwclock --systz $utc_cmd $clock_args
-		fi
+	if yesno ${clock_hctosys:-YES}; then
+		_hwclock --hctosys $utc_cmd $clock_args
 		: $(( retval += $? ))
 	fi
 

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     99939b9839fb45093fe193e06139eab4a95637da
Author:     Jason Zaman <jason <AT> perfinion <DOT> com>
AuthorDate: Wed Jul 16 23:07:18 2014 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Jul 16 23:21:59 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=99939b98

sysfs: restorecon after mounting /sys

X-Gentoo-Bug: 516956
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=516956

---
 init.d/sysfs.in | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/init.d/sysfs.in b/init.d/sysfs.in
index e01dcc8..2156670 100644
--- a/init.d/sysfs.in
+++ b/init.d/sysfs.in
@@ -120,6 +120,18 @@ mount_cgroups()
 	done < /proc/cgroups
 }
 
+restorecon_sys()
+{
+	if [ -x /sbin/restorecon ]; then
+		ebegin "Restoring SELinux contexts in /sys"
+		restorecon -F /sys/devices/system/cpu/online >/dev/null 2>&1
+		restorecon -rF /sys/fs/cgroup >/dev/null 2>&1
+		eend $?
+	fi
+
+	return 0
+}
+
 start()
 {
 	local retval
@@ -133,5 +145,8 @@ start()
 		mount_cgroups
 		retval=$?
 	fi
+
+	restorecon_sys
+
 	return $retval
 }

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     1a1d53335b2e6e3240b738ba1f81de64e552c337
Author:     Jason Zaman <jason <AT> perfinion <DOT> com>
AuthorDate: Wed Jul 16 23:07:19 2014 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Jul 16 23:22:33 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=1a1d5333

devfs: fix restorecon ebegin message to match sys

X-Gentoo-Bug: 516956
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=516956

---
 init.d/devfs.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/init.d/devfs.in b/init.d/devfs.in
index 196bc57..ca24231 100644
--- a/init.d/devfs.in
+++ b/init.d/devfs.in
@@ -95,7 +95,7 @@ seed_dev()
 restorecon_dev()
 {
 	if [ -x /sbin/restorecon ]; then
-		ebegin "Set SELinux labels in /dev"
+		ebegin "Restoring SELinux contexts in /dev"
 		restorecon -rF /dev >/dev/null 2>&1
 		eend $?
 	fi

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     525d7140b12a8e259f9d919f24148e369e9ff7d1
Author:     Jason Zaman <jason <AT> perfinion <DOT> com>
AuthorDate: Tue Jul 15 18:27:33 2014 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Jul 16 16:58:11 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=525d7140

devfs: fix SELinux contexts

SELinux contexts in /dev need to be fixed after it is mounted

X-Gentoo-Bug: 516956
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=516956

---
 init.d/devfs.in | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/init.d/devfs.in b/init.d/devfs.in
index ae5f03b..196bc57 100644
--- a/init.d/devfs.in
+++ b/init.d/devfs.in
@@ -92,9 +92,21 @@ seed_dev()
 	done
 }
 
+restorecon_dev()
+{
+	if [ -x /sbin/restorecon ]; then
+		ebegin "Set SELinux labels in /dev"
+		restorecon -rF /dev >/dev/null 2>&1
+		eend $?
+	fi
+
+	return 0
+}
+
 start()
 {
 	mount_dev
 	seed_dev
+	restorecon_dev
 	return 0
 }

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     57b9e601a97fac3a044ec5d7e5f11b6219c892b7
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Sat Jul  5 19:30:33 2014 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Jul  9 20:33:48 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=57b9e601

init.d/local: bring functioning more in line with how sysctl works

- remove the has_executables variable since it isn't used.
- Convert the conditional calls to ewend/vewend to a single call to veend.
- Always call eend after all scripts are executed passing the appropriate
error code.

Because of this change, you will see only an overall status when
starting or stopping local unless you are using verbose mode.

---
 init.d/local.in | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/init.d/local.in b/init.d/local.in
index 06be25f..180735d 100644
--- a/init.d/local.in
+++ b/init.d/local.in
@@ -14,20 +14,17 @@ start()
 {
 	ebegin "Starting local"
 
-	local file has_errors retval
+	local file has_errors=0 retval
 	eindent
 	for file in @SYSCONFDIR@/local.d/*.start; do
 		if [ -x "${file}" ]; then
-			has_executables=1
 			vebegin "Executing \"${file}\""
 			"${file}" 2>&1 >/dev/null
 			retval=$?
 			if [ ${retval} -ne 0 ]; then
 				has_errors=1
-				ewend ${retval} "Execution of \"${file}\" failed."
-			else
-				vewend 0
 			fi
+			veend ${retval} "Execution of \"${file}\" failed."
 		fi
 	done
 	eoutdent
@@ -40,9 +37,7 @@ start()
 		local_start
 	fi
 
-	if [ -z "${has_errors}" ]; then
-		eend 0
-	fi
+	eend ${has_errors}
 
 	# We have to end with a zero exit code, because a failed execution
 	# of an executable @SYSCONFDIR@/local.d/*.start file shouldn't result in
@@ -57,20 +52,17 @@ stop()
 {
 	ebegin "Stopping local"
 
-	local file has_errors retval
+	local file has_errors=0 retval
 	eindent
 	for file in @SYSCONFDIR@/local.d/*.stop; do
 		if [ -x "${file}" ]; then
-			has_executables=1
 			vebegin "Executing \"${file}\""
 			"${file}" 2>&1 >/dev/null
 			retval=$?
 			if [ ${retval} -ne 0 ]; then
 				has_errors=1
-				ewend ${retval} "Execution of \"${file}\" failed."
-			else
-				vewend 0
 			fi
+			veend ${retval} "Execution of \"${file}\" failed."
 		fi
 	done
 	eoutdent
@@ -83,9 +75,7 @@ stop()
 		local_stop
 	fi
 
-	if [ -z "${has_errors}" ]; then
-		eend 0
-	fi
+	eend ${has_errors}
 
 	# An executable @SYSCONFDIR@/local.d/*.stop file which failed with a
 	# non-zero exit status is not a reason to mark this service

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     c1de8c09bf4895c6108d297fcebd63046e49e614
Author:     Thomas D <whissi <AT> whissi <DOT> de>
AuthorDate: Tue Jun 10 13:23:17 2014 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Jul  5 18:12:30 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=c1de8c09

Add support for verbose "local" service runscript

With this patch, the "local" service runscript will be verbose like the
"sysctl" service when 'rc_verbose="yes"' is set.

Example output successful start:

 * Stopping local ...
 *   Executing "/etc/local.d/00will-stop.stop" ...                  [ ok ]
 * Starting local ...
 *   Executing "/etc/local.d/00will-start.start" ...                [ ok ]
 *   Executing "/etc/local.d/01 test.start" ...                     [ ok ]

Example output with failing executables:

 * Stopping local ...
 *   Executing "/etc/local.d/00will-stop.stop" ...                  [ ok ]
 *   Executing "/etc/local.d/will-fail.stop" ...
mount: can't find foo in /etc/fstab
 *   Execution of "/etc/local.d/will-fail.stop" failed.             [ !! ]
 * Starting local ...
 *   Executing "/etc/local.d/00will-start.start" ...                [ ok ]
 *   Executing "/etc/local.d/01 test.start" ...                     [ ok ]
 *   Executing "/etc/local.d/will-fail2.start" ...
mount: can't find bar in /etc/fstab
 *   Execution of "/etc/local.d/will-fail2.start" failed.           [ !! ]
 *   Executing "/etc/local.d/will-fail.start" ...
mount: can't find foo in /etc/fstab
 *   Execution of "/etc/local.d/will-fail.start" failed.            [ !! ]

X-Gentoo-Bug: 489274
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=489274

---
 init.d/local.in | 73 +++++++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 58 insertions(+), 15 deletions(-)

diff --git a/init.d/local.in b/init.d/local.in
index 2f20568..06be25f 100644
--- a/init.d/local.in
+++ b/init.d/local.in
@@ -12,40 +12,83 @@ depend()
 
 start()
 {
-	einfo "Starting local"
+	ebegin "Starting local"
 
-	local file
-	for file in @SYSCONFDIR@/local.d/*.start ; do
-		[ -x "$file" ] && "$file"
+	local file has_errors retval
+	eindent
+	for file in @SYSCONFDIR@/local.d/*.start; do
+		if [ -x "${file}" ]; then
+			has_executables=1
+			vebegin "Executing \"${file}\""
+			"${file}" 2>&1 >/dev/null
+			retval=$?
+			if [ ${retval} -ne 0 ]; then
+				has_errors=1
+				ewend ${retval} "Execution of \"${file}\" failed."
+			else
+				vewend 0
+			fi
+		fi
 	done
+	eoutdent
 
 	if command -v local_start >/dev/null 2>&1; then
-		ewarn "@SYSCONFDIR@/conf.d/local should be removed."
+		ewarn "\"@SYSCONFDIR@/conf.d/local\" should be removed."
 		ewarn "Please move the code from the local_start function"
-		ewarn "to scripts with an .start extension"
-		ewarn "in @SYSCONFDIR@/local.d"
+		ewarn "to executable scripts with an .start extension"
+		ewarn "in \"@SYSCONFDIR@/local.d\""
 		local_start
 	fi
 
-	eend 0
+	if [ -z "${has_errors}" ]; then
+		eend 0
+	fi
+
+	# We have to end with a zero exit code, because a failed execution
+	# of an executable @SYSCONFDIR@/local.d/*.start file shouldn't result in
+	# marking the local service as failed. Otherwise we are unable to
+	# execute any executable @SYSCONFDIR@/local.d/*.stop file, because a failed
+	# marked service cannot be stopped (and the stop function would
+	# actually call the executable @SYSCONFDIR@/local.d/*.stop file(s)).
+	return 0
 }
 
 stop()
 {
-	einfo "Stopping local"
+	ebegin "Stopping local"
 
-	local file
+	local file has_errors retval
+	eindent
 	for file in @SYSCONFDIR@/local.d/*.stop; do
-		[ -x "$file" ] && "$file"
+		if [ -x "${file}" ]; then
+			has_executables=1
+			vebegin "Executing \"${file}\""
+			"${file}" 2>&1 >/dev/null
+			retval=$?
+			if [ ${retval} -ne 0 ]; then
+				has_errors=1
+				ewend ${retval} "Execution of \"${file}\" failed."
+			else
+				vewend 0
+			fi
+		fi
 	done
+	eoutdent
 
 	if command -v local_stop >/dev/null 2>&1; then
-		ewarn "@SYSCONFDIR@/conf.d/local should be removed."
+		ewarn "\"@SYSCONFDIR@/conf.d/local\" should be removed."
 		ewarn "Please move the code from the local_stop function"
-		ewarn "to scripts with an .stop extension"
-		ewarn "in @SYSCONFDIR@/local.d"
+		ewarn "to executable scripts with an .stop extension"
+		ewarn "in \"@SYSCONFDIR@/local.d\""
 		local_stop
 	fi
 
-	eend 0
+	if [ -z "${has_errors}" ]; then
+		eend 0
+	fi
+
+	# An executable @SYSCONFDIR@/local.d/*.stop file which failed with a
+	# non-zero exit status is not a reason to mark this service
+	# as failed, therefore we have to end with a zero exit code.
+	return 0
 }

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     143f1c64c13e4930e3880a393b7253d6fbc0ed58
Author:     Kaarle Ritvanen <kaarle.ritvanen <AT> datakunkku <DOT> fi>
AuthorDate: Wed Jul  2 08:45:14 2014 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Jul  4 13:33:55 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=143f1c64

sysctl.Linux.in: remove -lxc from keywords

certain tunables can be set independently for each container

X-Gentoo-Bug: 516050
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=516050

---
 init.d/sysctl.Linux.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/init.d/sysctl.Linux.in b/init.d/sysctl.Linux.in
index 1ebce66..cda86b5 100644
--- a/init.d/sysctl.Linux.in
+++ b/init.d/sysctl.Linux.in
@@ -5,7 +5,7 @@
 depend()
 {
 	before bootmisc logger
-	keyword -lxc -prefix -vserver
+	keyword -prefix -vserver
 }
 
 start()

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     56112a6f1f176696e5f39a86fe4b52017ccdd04c
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Tue Jul  1 01:30:39 2014 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Jul  1 01:30:39 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=56112a6f

sysfs: Do not mount openrc cgroup if it is already mounted

We were not checking to see if /sys/fs/cgroup/openrc was already mounted
before we mounted it. This fixes that issue.
Thanks to Robin Johnson <robbat2 <AT> gentoo.org> for pointing this out.

---
 init.d/sysfs.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/init.d/sysfs.in b/init.d/sysfs.in
index 1dba73f..9edd915 100644
--- a/init.d/sysfs.in
+++ b/init.d/sysfs.in
@@ -100,6 +100,7 @@ mount_misc()
 mount_cgroups()
 {
 		mountinfo -q /sys/fs/cgroup || return 0
+		mountinfo -q /sys/fs/cgroup/openrc || return 0
 
 	local agent="@LIBEXECDIR@/sh/cgroup-release-agent.sh"
 	mkdir /sys/fs/cgroup/openrc

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     6126700a0723efa4ef1e299da0f58498f742c3a1
Author:     Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be>
AuthorDate: Sat Apr 19 19:18:18 2014 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Jun 20 23:37:33 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=6126700a

SELinux filesystem is at /sys/fs/selinux

The SELinux filesystem has been moved to /sys/fs/selinux for quite some
time. We kept supporting /selinux for backwards compatibility, but it's
time to move forward on this.

X-Gentoo-Bug: 511718
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=511718
Signed-off-by: Sven Vermeulen <sven.vermeulen <AT> siphos.be>

---
 init.d/procfs.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/init.d/procfs.in b/init.d/procfs.in
index 0db5305..636cd20 100644
--- a/init.d/procfs.in
+++ b/init.d/procfs.in
@@ -61,10 +61,10 @@ start()
 	fi
 
 	# Setup Kernel Support for SELinux
-	if [ -d /selinux ] && ! mountinfo -q /selinux; then
+	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 /selinux
+			mount -t selinuxfs selinuxfs /sys/fs/selinux
 			eend $?
 		fi
 	fi

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     20d7b83150b18b0eca550d9bb2e1d5fb0acbbd89
Author:     Andrew Gregory <andrew.gregory.8 <AT> gmail <DOT> com>
AuthorDate: Wed Mar 26 16:14:08 2014 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Apr  3 17:39:27 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=20d7b831

tmpfiles.dev: remove --remove option

For compatibility with systemd.

Signed-off-by: Andrew Gregory <andrew.gregory.8 <AT> gmail.com>

---
 init.d/tmpfiles.dev.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/init.d/tmpfiles.dev.in b/init.d/tmpfiles.dev.in
index c2de59f..3566928 100644
--- a/init.d/tmpfiles.dev.in
+++ b/init.d/tmpfiles.dev.in
@@ -14,8 +14,7 @@ depend()
 start()
 {
 	ebegin "setting up tmpfiles.d entries for /dev"
-	@LIBEXECDIR@/sh/tmpfiles.sh --prefix=/dev --create --remove \
-		${tmpfiles_opts}
+	@LIBEXECDIR@/sh/tmpfiles.sh --prefix=/dev --create ${tmpfiles_opts}
 	eend $?
 	return 0
 }

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     4ee8e90ffed3ab9f9627f7bbaa48f514fd520f2a
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 23 06:19:35 2014 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Jan 23 18:01:53 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=4ee8e90f

devfs: explicitly mount /dev/shm with mode=1777

The current code relies on the tmpfs mount defaulting to 1777
permissions.  If it doesn't, things break badly.

This can come up when tmpfs is disabled in the kernel and ramfs
is being used instead (the kernel will alias tmpfs to ramfs).
The default permissions for ramfs is 0755.

---
 init.d/devfs.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/init.d/devfs.in b/init.d/devfs.in
index 7fba882..ae5f03b 100644
--- a/init.d/devfs.in
+++ b/init.d/devfs.in
@@ -71,7 +71,7 @@ seed_dev()
 	for x in \
 		"mqueue /dev/mqueue 1777 ,nodev mqueue" \
 		"devpts /dev/pts 0755 ,gid=5,mode=0620 devpts" \
-		"tmpfs /dev/shm 1777 ,nodev shm" \
+		"tmpfs /dev/shm 1777 ,nodev,mode=1777 shm" \
 	; do
 		set -- $x
 		grep -Eq "[[:space:]]+$1$" /proc/filesystems || continue

[gentoo-commits] proj/openrc:master commit in: init.d/

[Mike Frysinger]

commit:     2d7d5fd37304b1b4ffe23cb294cf6dc5d612b199
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 23 06:19:35 2014 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu Jan 23 06:20:52 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=2d7d5fd3

devfs: explicitly mount /dev/shm with mode=1777

The current code relies on the tmpfs mount defaulting to 1777
permissions.  If it doesn't, things break badly.

This can come up when tmpfs is disabled in the kernel and ramfs
is being used instead (the kernel will alias tmpfs to ramfs).
The default permissions for ramfs is 0755.

---
 init.d/devfs.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/init.d/devfs.in b/init.d/devfs.in
index 7fba882..ae5f03b 100644
--- a/init.d/devfs.in
+++ b/init.d/devfs.in
@@ -71,7 +71,7 @@ seed_dev()
 	for x in \
 		"mqueue /dev/mqueue 1777 ,nodev mqueue" \
 		"devpts /dev/pts 0755 ,gid=5,mode=0620 devpts" \
-		"tmpfs /dev/shm 1777 ,nodev shm" \
+		"tmpfs /dev/shm 1777 ,nodev,mode=1777 shm" \
 	; do
 		set -- $x
 		grep -Eq "[[:space:]]+$1$" /proc/filesystems || continue

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     561b53ef09eed4dfba0b7f3026ddcdc2b7b5c54a
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Wed Jan 15 16:43:52 2014 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Jan 15 16:43:52 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=561b53ef

bootmisc: Remove console directories only if $RC_LIBEXECDIR is writable

X-Gentoo-Bug: 489368
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=489368

---
 init.d/bootmisc.in | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/init.d/bootmisc.in b/init.d/bootmisc.in
index ca333be..3e56ebc 100644
--- a/init.d/bootmisc.in
+++ b/init.d/bootmisc.in
@@ -129,7 +129,9 @@ clean_run()
 start()
 {
 	# Remove any added console dirs
-	rm -rf "$RC_LIBEXECDIR"/console/*
+	if checkpath -W "$RC_LIBEXECDIR"; then
+		rm -rf "$RC_LIBEXECDIR"/console/*
+	fi
 
 	local logw=false runw=false extra=
 	# Ensure that our basic dirs exist

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     235f94c4c5bdde011eda43620b39ed2c55af4f1d
Author:     Petre Rodan <petre.rodan <AT> simplex <DOT> ro>
AuthorDate: Sun Dec  8 18:23:56 2013 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Dec  8 18:42:31 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=235f94c4

bootmisc.in: fix boot order

Bootmisc was running before the root file system was remounted rw in
some situations. This fixes that issue.

X-Gentoo-Bug: 493442
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=493442

---
 init.d/bootmisc.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/init.d/bootmisc.in b/init.d/bootmisc.in
index 1b35a0a..72202f0 100644
--- a/init.d/bootmisc.in
+++ b/init.d/bootmisc.in
@@ -6,7 +6,7 @@ depend()
 {
 	need localmount
 	before logger
-	after clock sysctl
+	after clock root sysctl
 	keyword -prefix -timeout
 }
 

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     d7116631894badd88f334b4ef5cd6e3ee585b801
Author:     Andrew Gregory <andrew.gregory.8 <AT> gmail <DOT> com>
AuthorDate: Mon Aug 19 03:47:04 2013 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Dec  6 19:24:58 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=d7116631

network.in: skip loopback device

The loopback interface is supposed to be handled by the loopback
service, but sys_interfaces includes it.  This causes network to try to
start it and means that network provides net even if lo is the only
interface configured.

Signed-off-by: Andrew Gregory <andrew.gregory.8 <AT> gmail.com>

---
 init.d/network.in | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/init.d/network.in b/init.d/network.in
index 5a87a84..17237d3 100644
--- a/init.d/network.in
+++ b/init.d/network.in
@@ -46,7 +46,11 @@ sys_interfaces()
 		local w= rest= i= cmd=$1
 		while read w rest; do
 			i=${w%%:*}
-			[ "$i" != "$w" ] || continue
+			case "$i" in
+				"$w") continue ;;
+				lo|lo0) continue ;;
+				*) ;;
+			esac
 			if [ "$cmd" = u ]; then
 				ifconfig "$i" | grep -q "[ ]*UP" || continue
 			fi

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     579838d2e7b1f9d43d2d284bcc8a90f6e27118ba
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Mon Oct 28 20:21:50 2013 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Oct 28 20:21:50 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=579838d2

bootmisc: do not run clean_run on VSERVER systems

X-Gentoo-Bug: 489370
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=489370

---
 init.d/bootmisc.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/init.d/bootmisc.in b/init.d/bootmisc.in
index a7e54a7..526ebff 100644
--- a/init.d/bootmisc.in
+++ b/init.d/bootmisc.in
@@ -117,6 +117,7 @@ migrate_to_run()
 
 clean_run()
 {
+	[ "$RC_SYS" = VSERVER ] && return 0
 	local dir
 	dir=$(mktemp -d)
 	mount --bind / $dir

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     9238d94d6480569af68f7fe147038435c0410fca
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Mon Oct 28 17:37:22 2013 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Oct 28 17:37:22 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=9238d94d

loopback: do not run in a prefix or vserver

X-Gentoo-Bug: 489370
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=489370

---
 init.d/loopback.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/init.d/loopback.in b/init.d/loopback.in
index e5cc118..0139b56 100644
--- a/init.d/loopback.in
+++ b/init.d/loopback.in
@@ -6,7 +6,7 @@ description="Configures the loopback interface."
 
 depend()
 {
-	return 0
+	keyword -jail -prefix -vserver
 }
 
 start()

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     d2988dc7ddd832ffc94f6b76c54898217812b7cc
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Fri Oct 18 21:26:46 2013 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Oct 18 21:32:51 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=d2988dc7

remove redundant sync calls

The localmount and mount-ro scripts were flushing pending disk writes by
calling sync twice in succession. This is no longer necessary; see the
bug report and blog post for reasons we were still doing this.

Reported-by: Patrick Lauer <patrick <AT> gentoo.org>
X-Gentoo-Bug: 487382
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=487382

---
 init.d/localmount.in | 2 +-
 init.d/mount-ro.in   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/init.d/localmount.in b/init.d/localmount.in
index 5444889..42b7988 100644
--- a/init.d/localmount.in
+++ b/init.d/localmount.in
@@ -59,7 +59,7 @@ stop()
 	no_umounts_r="^($no_umounts_r)$"
 
 	# Flush all pending disk writes now
-	sync; sync
+	sync
 
 	. "$RC_LIBEXECDIR"/sh/rc-mount.sh
 

diff --git a/init.d/mount-ro.in b/init.d/mount-ro.in
index f8d7258..3e09352 100644
--- a/init.d/mount-ro.in
+++ b/init.d/mount-ro.in
@@ -15,7 +15,7 @@ start()
 	local ret=0
 
 	# Flush all pending disk writes now
-	sync; sync
+	sync
 
 	ebegin "Remounting remaining filesystems read-only"
 	# We need the do_unmount function

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     66970394ab3fa395685234a725eda0a4e48f43da
Author:     Alexander V Vershilov <qnikst <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 16 05:47:09 2013 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Oct 14 22:05:19 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=66970394

Add uml keyword to fsck service.

Fix relevant an issue mentioned by Toralf Förster.

X-Gentoo-Bug: 481096.
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=481096

---
 init.d/fsck.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/init.d/fsck.in b/init.d/fsck.in
index 7a91fcd..9db5119 100644
--- a/init.d/fsck.in
+++ b/init.d/fsck.in
@@ -9,7 +9,7 @@ _IFS="
 depend()
 {
 	use dev clock modules
-	keyword -jail -openvz -prefix -timeout -vserver -lxc
+	keyword -jail -openvz -prefix -timeout -vserver -lxc -uml
 }
 
 _abort() {

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     4b37d3b16f5544faef028d78b007a82cf98d8308
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Tue Oct  8 15:34:45 2013 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Oct  8 15:34:45 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=4b37d3b1

netmount: add -lxc keyword

Netmount should not run on lxc, thanks to Mark van Dijk <funtoo <AT> internecto.net>.

---
 init.d/netmount.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/init.d/netmount.in b/init.d/netmount.in
index dbf921b..86cdcba 100644
--- a/init.d/netmount.in
+++ b/init.d/netmount.in
@@ -12,7 +12,7 @@ depend()
 	config /etc/fstab
 	use afc-client amd autofs openvpn
 	use dns
-	keyword -jail -prefix -vserver
+	keyword -jail -prefix -vserver -lxc
 }
 
 start()

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     e6df76a3775f90f1178db507b6da08a02a9455f4
Author:     Daniel Robbins <drobbins <AT> funtoo <DOT> org>
AuthorDate: Thu Sep 26 18:05:40 2013 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Oct  4 20:16:05 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=e6df76a3

FL-786: localmount: support filesystem mounting on openvz

---
 init.d/localmount.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/init.d/localmount.in b/init.d/localmount.in
index 407c686..5444889 100644
--- a/init.d/localmount.in
+++ b/init.d/localmount.in
@@ -9,7 +9,7 @@ depend()
 	need fsck
 	use lvm modules mtab
 	after lvm modules
-	keyword -jail -openvz -prefix -vserver -lxc
+	keyword -jail -prefix -vserver -lxc
 }
 
 start()

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     4ce3cb90a035b74f4f6bcce1a0f1bca841e6424f
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Sun Sep  1 21:30:18 2013 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Sep  1 21:30:18 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=4ce3cb90

init.d: update ignore patterns

Remove net.lo* from the ignore pattern since these scripts are no longer
part of OpenRC and add loopback and tmpfiles.dev.

---
 init.d/.gitignore | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/init.d/.gitignore b/init.d/.gitignore
index c42cd77..3a5d003 100644
--- a/init.d/.gitignore
+++ b/init.d/.gitignore
@@ -3,9 +3,8 @@ fsck
 hostname
 local
 localmount
+loopback
 moused
-net.lo
-net.lo0
 netmount
 network
 root
@@ -41,4 +40,5 @@ syslogd
 termencoding
 ttys
 wscons
+tmpfiles.dev
 tmpfiles.setup

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     6b0ffd31035ddf6907dcf513afda9975ef425d02
Author:     Fedja Beader <specing <AT> contact <DOT> me <DOT> on <DOT> irc <DOT> freenode <DOT> net>
AuthorDate: Mon Aug  5 22:27:30 2013 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Aug  5 22:27:30 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=6b0ffd31

Fix Permission Denied on reading dmesg in an LXC container

---
 init.d/bootmisc.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/init.d/bootmisc.in b/init.d/bootmisc.in
index 565f6f2..a7e54a7 100644
--- a/init.d/bootmisc.in
+++ b/init.d/bootmisc.in
@@ -190,7 +190,7 @@ start()
 	if yesno $log_dmesg; then
 		if $logw || checkpath -W /var/log; then
 			# Create an 'after-boot' dmesg log
-			if [ "$RC_SYS" != VSERVER -a "$RC_SYS" != OPENVZ ]; then
+			if [ "$RC_SYS" != VSERVER -a "$RC_SYS" != OPENVZ -a "$RC_SYS" != LXC ]; then
 				dmesg > /var/log/dmesg
 				chmod 640 /var/log/dmesg
 			fi

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     1c94d793c025b763429e4bd006a78cfb2945ebb3
Author:     Alexander V Vershilov <qnikst <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 31 13:10:14 2013 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Jul 31 17:40:56 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=1c94d793

devfs: Add -lxc keyword

Devfs is not needed for LXC, as LXC mounts all required fs on
it's own. Reported by specing.

---
 init.d/devfs.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/init.d/devfs.in b/init.d/devfs.in
index 36955f3..afc2cb7 100644
--- a/init.d/devfs.in
+++ b/init.d/devfs.in
@@ -7,7 +7,7 @@ description="Mount system critical filesystems in /dev."
 depend() {
 	use dev-mount
 	before dev
-	keyword -prefix -vserver
+	keyword -prefix -vserver -lxc
 }
 
 start() {

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     e942e88b8cf37cd7dc292b7dbcfa567114bdb28e
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Fri Jul 26 17:15:29 2013 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Jul 26 17:15:29 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=e942e88b

swapfiles: do not try to unmount all tmpfs mounts

This is handled in the swap script, so it should not be done here as
well.

X-Gentoo-Bug: 477534
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=477534

---
 init.d/swapfiles.in | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/init.d/swapfiles.in b/init.d/swapfiles.in
index ec73baa..144096a 100644
--- a/init.d/swapfiles.in
+++ b/init.d/swapfiles.in
@@ -21,14 +21,6 @@ start()
 stop()
 {
 	ebegin "Deactivating additional swap space"
-
-	# Try to unmount all tmpfs filesystems not in use, else a deadlock may
-	# occur. As $RC_SVCDIR may also be tmpfs we cd to it to lock it
-	# fixme: Do we need this here since we are only unmounting swap files
-	# and loopback swap?
-	cd "$RC_SVCDIR"
-	umount -a -t tmpfs 2>/dev/null
-
 	case "$RC_UNAME" in
 		Linux)
 			if [ -e /proc/swaps ]; then

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     02a7d3573d551c5d169eaa465ef90349d1ee367e
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 24 19:31:58 2013 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Jun 24 20:42:56 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=02a7d357

efivarfs: Support EFI variable access in 3.10 kernels.

In the 3.10 kernel, EFI variables are now provided by a dedicated
filesystem that needs to be mounted.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

---
 init.d/sysfs.in | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/init.d/sysfs.in b/init.d/sysfs.in
index 114a653..7658cb5 100644
--- a/init.d/sysfs.in
+++ b/init.d/sysfs.in
@@ -81,6 +81,20 @@ mount_misc()
 			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
+	if [ -d /sys/firmware/efi/efivars ] \
+		&& ! mountinfo -q /sys/firmware/efi/efivars; then
+		modprobe -q efivarfs
+		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
 }
 
 mount_cgroups()

[gentoo-commits] proj/openrc:master commit in: init.d/

[Robin H. Johnson]

commit:     29f0f55c0e7debef879674ed288c1d3af0f84772
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 24 19:31:58 2013 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Jun 24 19:31:58 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=29f0f55c

efivarfs: Support EFI variable access in 3.10 kernels.

In the 3.10 kernel, EFI variables are now provided by a dedicated
filesystem that needs to be mounted.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

---
 init.d/sysfs.in | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/init.d/sysfs.in b/init.d/sysfs.in
index 114a653..7658cb5 100644
--- a/init.d/sysfs.in
+++ b/init.d/sysfs.in
@@ -81,6 +81,20 @@ mount_misc()
 			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
+	if [ -d /sys/firmware/efi/efivars ] \
+		&& ! mountinfo -q /sys/firmware/efi/efivars; then
+		modprobe -q efivarfs
+		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
 }
 
 mount_cgroups()

[gentoo-commits] proj/openrc:master commit in: init.d/

[Robin H. Johnson]

commit:     29f0f55c0e7debef879674ed288c1d3af0f84772
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 24 19:31:58 2013 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Jun 24 19:31:58 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=29f0f55c

efivarfs: Support EFI variable access in 3.10 kernels.

In the 3.10 kernel, EFI variables are now provided by a dedicated
filesystem that needs to be mounted.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

---
 init.d/sysfs.in | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/init.d/sysfs.in b/init.d/sysfs.in
index 114a653..7658cb5 100644
--- a/init.d/sysfs.in
+++ b/init.d/sysfs.in
@@ -81,6 +81,20 @@ mount_misc()
 			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
+	if [ -d /sys/firmware/efi/efivars ] \
+		&& ! mountinfo -q /sys/firmware/efi/efivars; then
+		modprobe -q efivarfs
+		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
 }
 
 mount_cgroups()

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     10eabd4d921cea895b8f9bde47f29d107f39fa0b
Author:     Eugeny Shkrigunov <eshkrig <AT> gmail <DOT> com>
AuthorDate: Sat Apr 27 15:26:37 2013 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Apr 27 15:26:37 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=10eabd4d

fsck: fix typo

X-Gentoo-Bug: 467158
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=467158

---
 init.d/fsck.in |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/init.d/fsck.in b/init.d/fsck.in
index 8c460f7..7a91fcd 100644
--- a/init.d/fsck.in
+++ b/init.d/fsck.in
@@ -76,7 +76,7 @@ start()
 		[ "${skiptypes}" = "no," ] && skiptypes=""
 		fsck_opts="$fsck_opts -C0 -T -t ${skiptypes}noopts=_netdev"
 		if [ -z "$fsck_passno" -a -z "$fsck_mnt" ]; then
-			fsck_args=${fsck_args--A -p}
+			fsck_args=${fsck_args:--A -p}
 			if echo 2>/dev/null >/.test.$$; then
 				rm -f /.test.$$
 				fsck_opts="$fsck_opts -R"
@@ -85,7 +85,7 @@ start()
 	fi
 
 	trap : INT QUIT
-	fsck ${fsck_args--p} $fsck_opts "$@"
+	fsck ${fsck_args:--p} $fsck_opts "$@"
 	case $? in
 	0)	eend 0; return 0;;
 	1)	ewend 1 "Filesystems repaired"; return 0;;

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     19fa20832c3783e134eb15866bcc1481c99a3f80
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Fri Mar 22 19:50:27 2013 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Mar 22 19:50:27 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=19fa2083

localmount: add "no" in front of network file system types

On Linux, this was not an issue, but we may have been attempting to
mount network file systems twice on *bsd.

Reported-by: powerman-asdf <AT> yandex.ru
x-Gentoo-Bug: 462210
x-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=462210

---
 init.d/localmount.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/init.d/localmount.in b/init.d/localmount.in
index 9cbbd41..407c686 100644
--- a/init.d/localmount.in
+++ b/init.d/localmount.in
@@ -17,7 +17,7 @@ start()
 	# Mount local filesystems in /etc/fstab.
 	local types="noproc" x= no_netdev=
 	for x in $net_fs_list $extra_net_fs_list; do
-		types="${types},${x}"
+		types="${types},no${x}"
 	done
 
 	if [ "$RC_UNAME" = Linux ]; then

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     f1ae8963c9251c23752e932eede36bf6f8901dbf
Author:     Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
AuthorDate: Fri Mar  8 21:16:21 2013 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Mar  8 21:30:36 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=f1ae8963

oldnet: convert netmask to decimal numbers in _netmask2cidr

Free BSD's ifconfig outputs a netmask in the form 0xffffff00, which
was translating to 0xff.0xff.0xff.0x00,. Now we convert this to decimal
numbers before we convert it to cidr notation.

Reported-by: 4glitch <AT> gmail.com
X-Gentoo-Bug: 460268
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=460268

---
 init.d/net.lo.in |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/init.d/net.lo.in b/init.d/net.lo.in
index 95744f8..cc3bfd0 100644
--- a/init.d/net.lo.in
+++ b/init.d/net.lo.in
@@ -151,6 +151,9 @@ _netmask2cidr()
 	local i= len=
 	local IFS=.
 	for i in $1; do
+		case $i in
+			0x*)	i=$((i)) ;;
+		esac
 		while [ ${i} -ne 0 ]; do
 			: $(( len += i % 2 ))
 			: $(( i >>= 1 ))

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     3b05586a735f46bb668a88e7ea59b1ff9d84b461
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Wed Mar  6 18:48:20 2013 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Mar  6 18:48:20 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=3b05586a

ipfw: change opts variable to extra_commands

Reported-by: 4glitch <AT> gmail.com
X-Gentoo-Bug: 459694
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=459694

---
 init.d/ipfw.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/init.d/ipfw.in b/init.d/ipfw.in
index a455e29..cb9b6df 100644
--- a/init.d/ipfw.in
+++ b/init.d/ipfw.in
@@ -8,7 +8,7 @@ ipfw_ip_in=${ipfw_ip_in-any}
 ipfw_ports_in=${ipfw_ports_in-auth ssh}
 ipfw_ports_nolog=${ipfw_ports_nolog-135-139,445 1026,1027 1433,1434}
 
-opts="panic showstatus"
+extra_commands="panic showstatus"
 
 depend() {
 	before net

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     89bb04a01a2d0b71c56c918961f32fe8e80d8234
Author:     Andrew Gregory <andrew.gregory.8 <AT> gmail <DOT> com>
AuthorDate: Tue Feb 12 03:13:30 2013 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Feb 17 02:46:34 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=89bb04a0

do not use SYSCONFDIR for binfmt.d

This makes binfmt.d consistent with tmpfiles.d and systemd which uses
hard coded paths for both.

Signed-off-by: Andrew Gregory <andrew.gregory.8 <AT> gmail.com>

---
 init.d/procfs.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/init.d/procfs.in b/init.d/procfs.in
index 992567e..7b7c6e6 100644
--- a/init.d/procfs.in
+++ b/init.d/procfs.in
@@ -31,7 +31,7 @@ start()
 				ebegin "Loading custom binary format handlers"
 				fmts=$(grep -hsv -e '^[#;]' -e '^[[:space:]]*$' \
 					/run/binfmt.d/*.conf \
-					@SYSCONFDIR@/binfmt.d/*.conf \
+					/etc/binfmt.d/*.conf \
 					""/usr/lib/binfmt.d/*.conf)
 				if [ -n "${fmts}" ]; then
 					echo "${fmts}" > /proc/sys/fs/binfmt_misc/register

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     1831e433a03fa0e6c5be6b6a87af4550688f1c49
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Sat Feb 16 06:48:36 2013 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Feb 16 08:06:26 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=1831e433

bootmisc: Skip cleaning /var/run or tmp directories if they are tmpfs

Reported-by: walter <AT> pratyeka.org
X-Gentoo-Bug: 454338
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=454338

---
 init.d/bootmisc.in |   55 ++++++++++++++++++++++++++++-----------------------
 1 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/init.d/bootmisc.in b/init.d/bootmisc.in
index 6dabdfd..4fdb433 100644
--- a/init.d/bootmisc.in
+++ b/init.d/bootmisc.in
@@ -59,6 +59,34 @@ cleanup_tmp_dir()
 	fi
 }
 
+cleanup_var_run_dir()
+{
+	ebegin "Cleaning /var/run"
+	for x in $(find /var/run ! -type d ! -name utmp \
+		! -name random-seed ! -name dev.db \
+		! -name ld-elf.so.hints ! -name ld.so.hints);
+	do
+		# Clean stale sockets
+		if [ -S "$x" ]; then
+			if type fuser >/dev/null 2>&1; then
+				fuser "$x" >/dev/null 2>&1 || rm -- "$x"
+			else
+				rm -- "$x"
+			fi
+		fi
+		[ ! -f "$x" ] && continue
+		# Do not remove pidfiles of already running daemons
+		case "$x" in
+			*.pid)
+				start-stop-daemon --test --quiet \
+				--stop --pidfile "$x" && continue
+			;;
+		esac
+		rm -f -- "$x"
+	done
+	eend 0
+}
+
 mkutmp()
 {
 	: >"$1"
@@ -138,36 +166,13 @@ start()
 		[ -e /var/log/wtmp ] || mkutmp /var/log/wtmp
 		eend 0
 
-		ebegin "Cleaning /var/run"
-		for x in $(find /var/run ! -type d ! -name utmp \
-			! -name random-seed ! -name dev.db \
-			! -name ld-elf.so.hints ! -name ld.so.hints);
-		do
-			# Clean stale sockets
-			if [ -S "$x" ]; then
-				if type fuser >/dev/null 2>&1; then
-					fuser "$x" >/dev/null 2>&1 || rm -- "$x"
-				else
-					rm -- "$x"
-				fi
-			fi
-			[ ! -f "$x" ] && continue
-			# Do not remove pidfiles of already running daemons
-			case "$x" in
-				*.pid)
-					start-stop-daemon --test --quiet \
-					--stop --pidfile "$x" && continue
-				;;
-			esac
-			rm -f -- "$x"
-		done
-		eend 0
+		mountinfo -q -f tmpfs /var/run || cleanup_var_run_dir
 	fi
 
 	# Clean up /tmp directories
 	local tmp=
 	for tmp in ${clean_tmp_dirs:-${wipe_tmp_dirs-/tmp}}; do
-		cleanup_tmp_dir "$tmp"
+		mountinfo -q -f tmpfs "$tmp" || cleanup_tmp_dir "$tmp"
 	done
 
 	if checkpath -W /tmp; then

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     86dbd757e94fe5402efea03f9f8725a71533297a
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Fri Feb 15 22:09:49 2013 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Feb 15 22:09:49 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=86dbd757

keymaps: fix the  use of loadkeys in the euro fix

The loadkeys man page states that if you don't pass a filename loadkeys
will read from stdin. However, this is not correct, so we now pass "-"
as the filename to explicitly request stdin.

Reported-by: andi <AT> grois.info
X-Gentoo-Bug: 457524
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=457524

---
 init.d/keymaps.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/init.d/keymaps.in b/init.d/keymaps.in
index a55a0e0..5889268 100644
--- a/init.d/keymaps.in
+++ b/init.d/keymaps.in
@@ -58,7 +58,7 @@ start()
 	if yesno $fix_euro; then
 		ebegin "Fixing font for euro symbol"
 		# Fix some fonts displaying the Euro, #173528.
-		echo "altgr keycode 18 = U+20AC" | loadkeys -q
+		echo "altgr keycode 18 = U+20AC" | loadkeys -q -
 		eend $?
 	fi
 

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     f30eec03ce228cc807c84e32823c24e159c7db20
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Thu Feb 14 23:49:46 2013 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Feb 14 23:53:53 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=f30eec03

devfs: Mount the posix message queue file system

Reported-by: reuben.m <AT> gmail.com
X-Gentoo-Bug: 456998
X-Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=456998

---
 init.d/devfs.in |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/init.d/devfs.in b/init.d/devfs.in
index 9e31377..2834654 100644
--- a/init.d/devfs.in
+++ b/init.d/devfs.in
@@ -13,6 +13,7 @@ depend() {
 start() {
 	# Mount required stuff as user may not have then in /etc/fstab
 	for x in \
+		"mqueue /dev/mqueue 1777 ,nodev mqueue" \
 		"devpts /dev/pts 0755 ,gid=5,mode=0620 devpts" \
 		"tmpfs /dev/shm 1777 ,nodev shm" \
 	; do

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     bbc6b96a4012b0ec176bd1e082642c12612e88cb
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Sat Feb  9 23:39:32 2013 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Feb  9 23:39:32 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=bbc6b96a

oldnet: accomodate rkhunter false positive

rkhunter thinks OpenRC is a rootkit because of the hidefirstrout
variable. This has been renamed to hideFirstroute in order to get past
rkhunter.

I realize this is not an openrc bug. In this case though I do not have a
problem renaming the variable.

Reported-by: ago <AT> gentoo.org
X-Gentoo-Bug: 339714
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=339714

---
 init.d/net.lo.in |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/init.d/net.lo.in b/init.d/net.lo.in
index 32ca810..fbc0124 100644
--- a/init.d/net.lo.in
+++ b/init.d/net.lo.in
@@ -633,7 +633,7 @@ start()
 		return 1
 	fi
 
-	local hidefirstroute=false first=true routes=
+	local hideFirstroute=false first=true routes=
 	if ${fallback}; then
 		routes="$(_get_array "fallback_routes_${IFVAR}")"
 	fi
@@ -644,7 +644,7 @@ start()
 		if [ "${config_0}" != "null" ]; then
 			routes="127.0.0.0/8 via 127.0.0.1
 ${routes}"
-			hidefirstroute=true
+			hideFirstroute=true
 		fi
 	fi
 
@@ -676,9 +676,9 @@ ${routes}"
 			*:*/*)                             cmd="-net ${cmd}";;
 			*)                                 cmd="-host ${cmd}";;
 		esac
-		if ${hidefirstroute}; then
+		if ${hideFirstroute}; then
 			_add_route ${fam} ${cmd} >/dev/null 2>&1
-			hidefirstroute=false
+			hideFirstroute=false
 		else
 			_add_route ${fam} ${cmd} >/dev/null
 		fi

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     8a6c3391bdc707e89733c259d116d004cbebce88
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Fri Feb  1 19:49:02 2013 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Feb  1 19:49:02 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=8a6c3391

sysfs: mount the fusectl file system

Reported-by: vapier <AT> gentoo.org
X-Gentoo-Bug: 453740
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=453740

---
 init.d/sysfs.in |   29 ++++++++++++++++++++---------
 1 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/init.d/sysfs.in b/init.d/sysfs.in
index 7d354e0..85bc083 100644
--- a/init.d/sysfs.in
+++ b/init.d/sysfs.in
@@ -4,6 +4,8 @@
 
 description="Mount the sys filesystem."
 
+sysfs_opts=nodev,noexec,nosuid
+
 depend()
 {
 	keyword -lxc -prefix -vserver
@@ -23,7 +25,7 @@ mount_sys()
 
 	ebegin "Mounting /sys"
 	if ! fstabinfo --mount /sys; then
-		mount -n -t sysfs -o noexec,nosuid,nodev sysfs /sys
+		mount -n -t sysfs -o ${sysfs_opts} sysfs /sys
 	fi
 	eend $?
 }
@@ -35,7 +37,7 @@ mount_misc()
 		! mountinfo -q /sys/kernel/security; then
 		if grep -qs securityfs /proc/filesystems; then
 			ebegin "Mounting security filesystem"
-			mount -n -t securityfs -o nodev,noexec,nosuid \
+			mount -n -t securityfs -o ${sysfs_opts} \
 				securityfs /sys/kernel/security
 			eend $?
 		fi
@@ -45,8 +47,7 @@ mount_misc()
 	if [ -d /sys/kernel/debug ] && ! mountinfo -q /sys/kernel/debug; then
 		if grep -qs debugfs /proc/filesystems; then
 			ebegin "Mounting debug filesystem"
-			mount -n -t debugfs -o nodev,noexec,nosuid \
-				debugfs /sys/kernel/debug
+			mount -n -t debugfs -o ${sysfs_opts} debugfs /sys/kernel/debug
 			eend $?
 		fi
 	fi
@@ -55,8 +56,7 @@ mount_misc()
 	if [ -d /sys/kernel/config ] && ! mountinfo -q /sys/kernel/config; then
 		if grep -qs configfs /proc/filesystems; then
 			ebegin "Mounting config filesystem"
-			mount -n -t configfs -o  nodev,noexec,nosuid \
-				configfs /sys/kernel/config
+			mount -n -t configfs -o  ${sysfs_opts} configfs /sys/kernel/config
 			eend $?
 		fi
 	fi
@@ -65,11 +65,22 @@ mount_misc()
 	if [ -d /sys/fs/cgroup ] && ! mountinfo -q /sys/fs/cgroup; then
 		if grep -qs cgroup /proc/filesystems; then
 			ebegin "Mounting cgroup filesystem"
-			local opts="nodev,noexec,nosuid,mode=755,size=${rc_cgroupsize:-10m}"
+			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
+		if grep -qs fusectl /proc/filesystems; then
+			ebegin "Mounting fuse control filesystem"
+			mount -n -t fusectl -o ${sysfs_opts} \
+				fusectl /sys/fs/fuse/connections
+			eend $?
+		fi
+	fi
 }
 
 mount_cgroups()
@@ -79,7 +90,7 @@ mount_cgroups()
 	local agent="@LIBEXECDIR@/sh/cgroup-release-agent.sh"
 	mkdir /sys/fs/cgroup/openrc
 	mount -n -t cgroup \
-		-o none,nodev,noexec,nosuid,name=openrc,release_agent="$agent" \
+		-o none,${sysfs_opts},name=openrc,release_agent="$agent" \
 		openrc /sys/fs/cgroup/openrc
 	echo 1 > /sys/fs/cgroup/openrc/notify_on_release
 
@@ -87,7 +98,7 @@ mount_cgroups()
 	while read name hier groups enabled rest; do
 		case "${enabled}" in
 			1)	mkdir /sys/fs/cgroup/${name}
-				mount -n -t cgroup -o nodev,noexec,nosuid,${name} \
+				mount -n -t cgroup -o ${sysfs_opts},${name} \
 					${name} /sys/fs/cgroup/${name}
 				;;
 		esac

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     8be072628c6ef9dce9ddafb911096e7035ed5401
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Thu Jan 31 18:05:37 2013 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Jan 31 18:11:53 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=8be07262

remove cruft from /run directory

The /run directory is a mount point for a tmpfs and should not contain
any files or directories.  This cleans out the /run/openrc
symlink and any other files which were incorrectly placed in /run.
Thanks to Ian Stakenvicius for pointing out this solution.

---
 init.d/bootmisc.in |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/init.d/bootmisc.in b/init.d/bootmisc.in
index a96236a..6dabdfd 100644
--- a/init.d/bootmisc.in
+++ b/init.d/bootmisc.in
@@ -87,6 +87,16 @@ migrate_to_run()
  	fi
 }
 
+clean_run()
+{
+	local dir
+	dir=$(mktemp -d)
+	mount --bind / $dir
+	rm -rf $dir/run/*
+	umount $dir
+	rm -rf $dir
+}
+
 start()
 {
 	# Remove any added console dirs
@@ -115,6 +125,7 @@ start()
 	if [ "$RC_UNAME" = Linux -a -d /run ]; then
 		migrate_to_run	/var/lock /run/lock
 		migrate_to_run	/var/run /run
+		clean_run
 	fi
 
 	if checkpath -W /var/run; then

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     2b0ff6f669d2a05f4b092d8135ee17626c64c494
Author:     Alexander Tsoy <alexander <AT> tsoy <DOT> me>
AuthorDate: Fri Dec 21 20:24:27 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Dec 21 20:24:27 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=2b0ff6f6

net.lo: add ipv6 net and host patterns

X-Gentoo-Bug: 442594
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=442594

---
 init.d/net.lo.in |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/init.d/net.lo.in b/init.d/net.lo.in
index db6550d..32ca810 100644
--- a/init.d/net.lo.in
+++ b/init.d/net.lo.in
@@ -672,6 +672,8 @@ ${routes}"
 			*.*.*.*/32*)                       cmd="-host ${cmd}";;
 			*.*.*.*/*|0.0.0.0|0.0.0.0" "*)     cmd="-net ${cmd}";;
 			default|default" "*)               cmd="-net ${cmd}";;
+			*:*/128*)                          cmd="-host ${cmd}";;
+			*:*/*)                             cmd="-net ${cmd}";;
 			*)                                 cmd="-host ${cmd}";;
 		esac
 		if ${hidefirstroute}; then

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     a61fdd019ee8715689ce07abeda25e6961a4754f
Author:     Mihai Moldovan <ionic <AT> ionic <DOT> de>
AuthorDate: Thu Dec 20 22:02:11 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Dec 20 22:02:11 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=a61fdd01

net.lo: allow address families to be set on routes

X-Gentoo-Bug: 447310
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?d=447310

---
 init.d/net.lo.in |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/init.d/net.lo.in b/init.d/net.lo.in
index 51833f2..db6550d 100644
--- a/init.d/net.lo.in
+++ b/init.d/net.lo.in
@@ -650,12 +650,19 @@ ${routes}"
 
 	local OIFS="${IFS}" SIFS="${IFS-y}"
 	local IFS="$__IFS"
+	local fam
 	for cmd in ${routes}; do
 		unset IFS
 		if ${first}; then
 			first=false
 			einfo "Adding routes"
 		fi
+
+		case ${cmd} in
+			-6" "*) fam="-6"; cmd=${cmd#-6 };;
+			-4" "*) fam="-4"; cmd=${cmd#-4 };;
+		esac
+
 		eindent
 		ebegin ${cmd}
 		# Work out if we're a host or a net if not told
@@ -668,10 +675,10 @@ ${routes}"
 			*)                                 cmd="-host ${cmd}";;
 		esac
 		if ${hidefirstroute}; then
-			_add_route ${cmd} >/dev/null 2>&1
+			_add_route ${fam} ${cmd} >/dev/null 2>&1
 			hidefirstroute=false
 		else
-			_add_route ${cmd} >/dev/null
+			_add_route ${fam} ${cmd} >/dev/null
 		fi
 		eend $?
 		eoutdent

[gentoo-commits] proj/openrc:master commit in: init.d/

[Mike Frysinger]

commit:     7557d62870a3ee92ff43e97bab734e2deaf3cb8a
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 18 05:20:23 2012 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Tue Dec 18 05:24:02 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=7557d628

net.lo: sleep *after* carrier check

For devices that are always connected (e.g. ethernet cards), the current
carrier always wastes time by sleeping for 1 second.  This is because the
code sleeps first, then checks for carrier.  Invert the order so that we
return quickly for devices already active.  For devices which are not yet
up, there shouldn't be any real difference.

Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

---
 init.d/net.lo.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/init.d/net.lo.in b/init.d/net.lo.in
index d42b5ae..51833f2 100644
--- a/init.d/net.lo.in
+++ b/init.d/net.lo.in
@@ -116,12 +116,12 @@ _wait_for_carrier()
 	yesno ${RC_PARALLEL} && efunc=einfo
 	${efunc} "Waiting for carrier (${timeout} seconds) "
 	while [ ${timeout} -gt 0 ]; do
-		sleep 1
 		if _has_carrier; then
 			[ "${efunc}" = "einfon" ] && echo
 			eend 0
 			return 0
 		fi
+		sleep 1
 		: $(( timeout -= 1 ))
 		[ "${efunc}" = "einfon" ] && printf "."
 	done

[gentoo-commits] proj/openrc:master commit in: init.d/

[Mike Frysinger]

commit:     2c60282ba9d12040e82e6571c9df8aa1e3da36a2
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Thu May 17 03:46:21 2012 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Tue Dec 18 05:24:02 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=2c60282b

fsck: simplify skiplist setup

Use printf rather than a manual for loop.

Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

---
 init.d/fsck.in |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/init.d/fsck.in b/init.d/fsck.in
index fcc334c..8322452 100644
--- a/init.d/fsck.in
+++ b/init.d/fsck.in
@@ -71,12 +71,10 @@ start()
 	done
 
 	if [ "$RC_UNAME" = Linux ]; then
-		local skiptypes x
-		for x in $net_fs_list $extra_net_fs_list; do
-			skiptypes="${skiptypes}no${x},"
-		done
-		skiptypes="${skiptypes}noopts=_netdev"
-		fsck_opts="$fsck_opts -C0 -T -t $skiptypes"
+		local skiptypes
+		skiptypes=$(printf 'no%s,' ${net_fs_list} ${extra_net_fs_list})
+		[ "${skiptypes}" = "no," ] && skiptypes=""
+		fsck_opts="$fsck_opts -C0 -T -t ${skiptypes}noopts=_netdev"
 		if [ -z "$fsck_passno" -a -z "$fsck_mnt" ]; then
 			fsck_args=${fsck_args--A -p}
 			if echo 2>/dev/null >/.test.$$; then

[gentoo-commits] proj/openrc:master commit in: init.d/

[Mike Frysinger]

commit:     f2de06ca02fbe167cc21b1f4beb95fb326765503
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 18 05:20:23 2012 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Tue Dec 18 05:22:32 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=f2de06ca

net.lo: sleep *after* carrier check

For devices that are always connected (e.g. ethernet cards), the current
carrier always wastes time by sleeping for 1 second.  This is because the
code sleeps first, then checks for carrier.  Invert the order so that we
return quickly for devices already active.  For devices which are not yet
up, there shouldn't be any real difference.

Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

---
 init.d/net.lo.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/init.d/net.lo.in b/init.d/net.lo.in
index d42b5ae..51833f2 100644
--- a/init.d/net.lo.in
+++ b/init.d/net.lo.in
@@ -116,12 +116,12 @@ _wait_for_carrier()
 	yesno ${RC_PARALLEL} && efunc=einfo
 	${efunc} "Waiting for carrier (${timeout} seconds) "
 	while [ ${timeout} -gt 0 ]; do
-		sleep 1
 		if _has_carrier; then
 			[ "${efunc}" = "einfon" ] && echo
 			eend 0
 			return 0
 		fi
+		sleep 1
 		: $(( timeout -= 1 ))
 		[ "${efunc}" = "einfon" ] && printf "."
 	done

[gentoo-commits] proj/openrc:master commit in: init.d/

[Mike Frysinger]

commit:     3801ba3a4d0b665dbf1217eb21474f4e6ff4e70a
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Thu May 17 03:46:21 2012 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Tue Dec 18 05:22:32 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=3801ba3a

fsck: simplify skiplist setup

Use printf rather than a manual for loop.

Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

---
 init.d/fsck.in |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/init.d/fsck.in b/init.d/fsck.in
index fcc334c..4870d98 100644
--- a/init.d/fsck.in
+++ b/init.d/fsck.in
@@ -71,12 +71,10 @@ start()
 	done
 
 	if [ "$RC_UNAME" = Linux ]; then
-		local skiptypes x
-		for x in $net_fs_list $extra_net_fs_list; do
-			skiptypes="${skiptypes}no${x},"
-		done
-		skiptypes="${skiptypes}noopts=_netdev"
-		fsck_opts="$fsck_opts -C0 -T -t $skiptypes"
+		local skyptypes
+		skiptypes=$(printf 'no%s,' ${net_fs_list} ${extra_net_fs_list})
+		[ "${skiptypes}" = "no," ] && skiptypes=""
+		fsck_opts="$fsck_opts -C0 -T -t ${skiptypes}noopts=_netdev"
 		if [ -z "$fsck_passno" -a -z "$fsck_mnt" ]; then
 			fsck_args=${fsck_args--A -p}
 			if echo 2>/dev/null >/.test.$$; then

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     8d61d03e277c97cea5e449212baf5a6609ddef2c
Author:     Steve L <slong <AT> rathaus <DOT> eclipse <DOT> co <DOT> uk>
AuthorDate: Mon Dec 17 02:00:01 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Dec 17 02:00:01 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=8d61d03e

localmount: quoting fixes

X-Gentoo-Bug: 446556
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=446556

---
 init.d/localmount.in |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/init.d/localmount.in b/init.d/localmount.in
index 232adf4..7d6c305 100644
--- a/init.d/localmount.in
+++ b/init.d/localmount.in
@@ -23,7 +23,7 @@ start()
 	if [ "$RC_UNAME" = Linux ]; then
 		no_netdev="-O no_netdev"
 		if mountinfo -q /usr; then
-			touch $RC_SVCDIR/usr_premounted
+			touch "$RC_SVCDIR"/usr_premounted
 		fi
 	fi
 	ebegin "Mounting local filesystems"
@@ -40,7 +40,7 @@ stop()
 	# We never unmount / or /dev or $RC_SVCDIR
 
 	# Bug 381783
-	local rc_svcdir=$(echo $RC_SVCDIR | sed 's:/lib\(32\|64\)\?/:/lib(32|64)?/:g')
+	local rc_svcdir=$(printf '%s\n' "$RC_SVCDIR" | sed 's:/lib\(32\|64\)\?/:/lib(32|64)?/:g')
 
 	local x= no_umounts_r="/|/dev|/dev/.*|${rc_svcdir}"
 	no_umounts_r="${no_umounts_r}|/bin|/sbin|/lib(32|64)?|/libexec"
@@ -52,7 +52,7 @@ stop()
 
 	if [ "$RC_UNAME" = Linux ]; then
 		no_umounts_r="$no_umounts_r|/proc|/proc/.*|/run|/sys|/sys/.*"
-		if [ -e $rc_svcdir/usr_premounted ]; then
+		if [ -e "$rc_svcdir"/usr_premounted ]; then
 			no_umounts_r="$no_umounts_r|/usr"
 		fi
 	fi

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     c5e163cffc61769f819d4599c2b6a525f7d6212b
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Fri Nov 30 18:05:26 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Nov 30 18:05:26 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=c5e163cf

typo fixes

---
 init.d/localmount.in |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/init.d/localmount.in b/init.d/localmount.in
index ab0b1b5..232adf4 100644
--- a/init.d/localmount.in
+++ b/init.d/localmount.in
@@ -22,8 +22,8 @@ start()
 
 	if [ "$RC_UNAME" = Linux ]; then
 		no_netdev="-O no_netdev"
-		if [ mountinfo -q /usr ]; then
-			touch $rc_svcdir/usr_premounted
+		if mountinfo -q /usr; then
+			touch $RC_SVCDIR/usr_premounted
 		fi
 	fi
 	ebegin "Mounting local filesystems"

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     5cce37837b89145832c75b310791ae3a69d883ec
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Thu Nov 29 16:19:20 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Nov 29 16:19:20 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=5cce3783

localmount: only skip unmounting /usr if it was premounted

Add a test when localmount is started to determine if /usr is mounted
from inside an initramfs for Linux systems. If it is not, we can unmount it when
localmount stops.

On *bsd systems, we always unmount /usr if it is separate.

Reported-by: ryao <AT> gentoo.org

---
 init.d/localmount.in |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/init.d/localmount.in b/init.d/localmount.in
index 8e67c38..ab0b1b5 100644
--- a/init.d/localmount.in
+++ b/init.d/localmount.in
@@ -22,6 +22,9 @@ start()
 
 	if [ "$RC_UNAME" = Linux ]; then
 		no_netdev="-O no_netdev"
+		if [ mountinfo -q /usr ]; then
+			touch $rc_svcdir/usr_premounted
+		fi
 	fi
 	ebegin "Mounting local filesystems"
 	mount -at "$types" $no_netdev
@@ -48,7 +51,10 @@ stop()
 	done
 
 	if [ "$RC_UNAME" = Linux ]; then
-		no_umounts_r="$no_umounts_r|/proc|/proc/.*|/run|/sys|/sys/.*|/usr"
+		no_umounts_r="$no_umounts_r|/proc|/proc/.*|/run|/sys|/sys/.*"
+		if [ -e $rc_svcdir/usr_premounted ]; then
+			no_umounts_r="$no_umounts_r|/usr"
+		fi
 	fi
 	no_umounts_r="^($no_umounts_r)$"
 

[gentoo-commits] proj/openrc:master commit in: init.d/

[Robin H. Johnson]

commit:     4ec1edc1f8bb87b5989368a60162646760dc22fc
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Wed Nov  7 00:32:09 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Nov  7 00:32:09 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=4ec1edc1

Whitespace.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

---
 init.d/hostname.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/init.d/hostname.in b/init.d/hostname.in
index 5d8ce28..5eea7f0 100644
--- a/init.d/hostname.in
+++ b/init.d/hostname.in
@@ -10,7 +10,7 @@ depend() {
 
 start()
 {
-	# HOSTNAME variable used to be defined in caps in conf.d/hostname. 
+	# HOSTNAME variable used to be defined in caps in conf.d/hostname.
 	# It is also a magic variable in bash.
 	hostname=${hostname-${HOSTNAME-localhost}} # checkbashisms: false positive
 	ebegin "Setting hostname to $hostname"

[gentoo-commits] proj/openrc:master commit in: init.d/

[Robin H. Johnson]

commit:     91e28ab775e2bcfb343ba2e2c8b7db0289e11f70
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue Nov  6 23:11:58 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Nov  6 23:12:24 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=91e28ab7

init.d/hostname: Document checkbashism false positive.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

---
 init.d/hostname.in |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/init.d/hostname.in b/init.d/hostname.in
index 2b0ec81..5d8ce28 100644
--- a/init.d/hostname.in
+++ b/init.d/hostname.in
@@ -10,7 +10,9 @@ depend() {
 
 start()
 {
-	hostname=${hostname-${HOSTNAME-localhost}}
+	# HOSTNAME variable used to be defined in caps in conf.d/hostname. 
+	# It is also a magic variable in bash.
+	hostname=${hostname-${HOSTNAME-localhost}} # checkbashisms: false positive
 	ebegin "Setting hostname to $hostname"
 	hostname "$hostname"
 	eend $? "Failed to set the hostname"

[gentoo-commits] proj/openrc:master commit in: init.d/

[Robin H. Johnson]

commit:     87daa26ca77a4d564959f7ab263cbc53d8925fb5
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue Nov  6 23:02:56 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Nov  6 23:02:56 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=87daa26c

init.d/mtab: Another instance of the same pattern matching case.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

---
 init.d/mtab.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/init.d/mtab.in b/init.d/mtab.in
index 0be5adb..a32b8d6 100644
--- a/init.d/mtab.in
+++ b/init.d/mtab.in
@@ -28,7 +28,7 @@ start()
 	# 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
+	grep -v "^[! ]* / tmpfs " /proc/mounts > /etc/mtab
 
 	# Remove stale backups
 	rm -f /etc/mtab~ /etc/mtab~~

[gentoo-commits] proj/openrc:master commit in: init.d/

[Robin H. Johnson]

commit:     670589571e3bb2706c6eaae0a3b966f6e4124355
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue Nov  6 23:01:42 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Nov  6 23:01:42 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=67058957

init.d/bootmisc: Another instance of the same pattern matching case.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

---
 init.d/bootmisc.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/init.d/bootmisc.in b/init.d/bootmisc.in
index 695e450..a96236a 100644
--- a/init.d/bootmisc.in
+++ b/init.d/bootmisc.in
@@ -29,7 +29,7 @@ cleanup_tmp_dir()
 		# Faster than raw find
 		if ! rm -rf -- [!ajlq\.]* 2>/dev/null ; then
 			# Blah, too many files
-			find . -maxdepth 1 -name '[^ajlq\.]*' -exec rm -rf -- {} +
+			find . -maxdepth 1 -name '[!ajlq\.]*' -exec rm -rf -- {} +
 		fi
 
 		# pam_mktemp creates a .private directory within which

[gentoo-commits] proj/openrc:master commit in: init.d/

[Robin H. Johnson]

commit:     f6c3896087a364e7cabe791640a50c675fc9ca4a
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue Nov  6 22:49:49 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Nov  6 22:49:49 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=f6c38960

init.d/bootmisc: POSIX XSI shellism.

In a pathname expansion, specifically single-character match, the pure
POSIX specification uses '!' as the Negation character where a regular
expression would normally be '^'.

Regular expression: "a[^a]a"
Pathname expansion pattern: "a[!a]a"

Reference:
IEEE Std 1003.1, 2004 Edition
2. Shell Command Language
2.13 Pattern Matching Notation
2.13.1 Patterns Matching a Single Character

> The description of basic regular expression bracket expressions in the
> Base Definitions volume of IEEE Std 1003.1-2001, Section 9.3.5, RE
> Bracket Expression shall also apply to the pattern bracket expression,
> except that the exclamation mark character ( '!' ) shall replace the
> circumflex character ( '^' ) in its role in a "non-matching list" in
> the regular expression notation. A bracket expression starting with an
> unquoted circumflex character produces unspecified results.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

---
 init.d/bootmisc.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/init.d/bootmisc.in b/init.d/bootmisc.in
index d869270..695e450 100644
--- a/init.d/bootmisc.in
+++ b/init.d/bootmisc.in
@@ -27,7 +27,7 @@ cleanup_tmp_dir()
 		ebegin "Wiping $dir directory"
 
 		# Faster than raw find
-		if ! rm -rf -- [^ajlq\.]* 2>/dev/null ; then
+		if ! rm -rf -- [!ajlq\.]* 2>/dev/null ; then
 			# Blah, too many files
 			find . -maxdepth 1 -name '[^ajlq\.]*' -exec rm -rf -- {} +
 		fi

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     8d17c634db816db53ffc1fd67f7a971c5e74564d
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Mon Oct 22 14:23:04 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Oct 22 14:23:04 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=8d17c634

oldnet: make the default carrier timeout 0

Some types of interfaces do not have a carrier, so it doesn't make sense
to automatically wait for one.

Reported-by: <rose <AT> rz.uni-potsdam.de>
X-Gentoo-Bug: 438970
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=438970

---
 init.d/net.lo.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/init.d/net.lo.in b/init.d/net.lo.in
index 47bdc2f..d42b5ae 100644
--- a/init.d/net.lo.in
+++ b/init.d/net.lo.in
@@ -108,7 +108,7 @@ _wait_for_carrier()
 	_has_carrier  && return 0
 
 	eval timeout=\$carrier_timeout_${IFVAR}
-	timeout=${timeout:-${carrier_timeout:-5}}
+	timeout=${timeout:-${carrier_timeout:-0}}
 
 	# Incase users don't want this nice feature ...
 	[ ${timeout} -le 0 ] && return 0

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     e8acdc6f856075d31dc16563ba03ab21eed3edf8
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Sat Oct 20 02:45:14 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Oct 20 02:45:14 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=e8acdc6f

tmfiles: change need dev to use dev.

This is being changed to use for the reason I stated in the previous
commit. There is no guarantee that someone is using a device manager.

---
 init.d/tmpfilesd.sysinit.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/init.d/tmpfilesd.sysinit.in b/init.d/tmpfilesd.sysinit.in
index c4c2a2f..303a1cf 100644
--- a/init.d/tmpfilesd.sysinit.in
+++ b/init.d/tmpfilesd.sysinit.in
@@ -8,7 +8,7 @@ depend()
 {
 	# Convert to 'need dev' when the new udev is ready, for OpenRC 0.11
 	#need dev-mount
-	need dev
+	use dev
 }
 
 start()

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     2a9de2df5825708f67cb2decbe0368bad2ae3dd2
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Sat Oct 20 01:53:46 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Oct 20 01:53:46 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=2a9de2df

devfs: Remove references to specific device managers

There were references in the devfs script to mdev, udev and
udev-mount. These all provide the virtuals dev and dev-mount; that is
how we should refer to them.

I believe in the discussion I had with Tony and Robin about this, we
were going to change the "use" line to "need". However, after thinking
that over, I'm not comfortable doing so because someone could be running
a static /dev with no device manager.

Reported-by: <tokiclover <AT> gmail.com>
X-Gentoo-Bug: 438932
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=438932

---
 init.d/devfs.in |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/init.d/devfs.in b/init.d/devfs.in
index 8d5bb48..9e31377 100644
--- a/init.d/devfs.in
+++ b/init.d/devfs.in
@@ -5,8 +5,8 @@
 description="Mount system critical filesystems in /dev."
 
 depend() {
-	use dev-mount udev-mount
-	before udev mdev
+	use dev-mount
+	before dev
 	keyword -prefix -vserver
 }
 

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     2ee3e9d95293ffb91ae9b5a9b4914b370e3e742f
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Fri Oct 19 18:02:30 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Oct 19 18:02:30 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=2ee3e9d9

Fix bashism in tmpfilesd scripts

Reported-by: <pesa <AT> gentoo.org>

---
 init.d/tmpfilesd.boot.in    |    2 +-
 init.d/tmpfilesd.sysinit.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/init.d/tmpfilesd.boot.in b/init.d/tmpfilesd.boot.in
index 838bdd8..471c128 100644
--- a/init.d/tmpfilesd.boot.in
+++ b/init.d/tmpfilesd.boot.in
@@ -11,7 +11,7 @@ depend()
 
 start()
 {
-	ebegin "${description/Create/Creating}"
+	ebegin "Creating ${description#Create }"
 	@LIBEXECDIR@/sh/tmpfiles.sh --create ${tmpfiles_opts}
 	eend $?
 	return 0

diff --git a/init.d/tmpfilesd.sysinit.in b/init.d/tmpfilesd.sysinit.in
index 9a0dbe4..c4c2a2f 100644
--- a/init.d/tmpfilesd.sysinit.in
+++ b/init.d/tmpfilesd.sysinit.in
@@ -13,7 +13,7 @@ depend()
 
 start()
 {
-	ebegin "${description/Create/Creating}"
+	ebegin "Creating ${description#Create }"
 	@LIBEXECDIR@/sh/tmpfiles.sh --create ${tmpfiles_opts}
 	eend $?
 	return 0

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     6d84a4aed8dd519641c8fd6994fb93135efb122d
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Wed Oct 17 01:56:34 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Oct 17 01:56:34 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=6d84a4ae

Oldnet: the loopback interface does not need sysfs

---
 init.d/net.lo.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/init.d/net.lo.in b/init.d/net.lo.in
index de441e2..47bdc2f 100644
--- a/init.d/net.lo.in
+++ b/init.d/net.lo.in
@@ -19,7 +19,7 @@ depend()
 	local IFVAR=$(shell_var "${IFACE}")
 
 	need localmount
-	if [ "$RC_UNAME" = Linux ]; then
+	if [ "$RC_UNAME" = Linux -a "$IFACE" != lo ]; then
 		need sysfs
 	fi
 	after bootmisc

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     76f76eb19a1e0595ba6b512e1a7e3791006aee3a
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Tue Oct 16 19:27:19 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Oct 16 19:33:27 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=76f76eb1

Migrate /var/run and /var/lock to symlinks

Now that we have full support for tmpfiles.d in OpenRC, we can migrate
/var/run and /var/lock to symbolic links to /run and /run/lock
respectively.

---
 init.d/bootmisc.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/init.d/bootmisc.in b/init.d/bootmisc.in
index f4c32a2..d869270 100644
--- a/init.d/bootmisc.in
+++ b/init.d/bootmisc.in
@@ -112,7 +112,7 @@ start()
 		fi
 	done
 
-	if [ "$RC_UNAME" = Linux -a -d /run ] && false; then
+	if [ "$RC_UNAME" = Linux -a -d /run ]; then
 		migrate_to_run	/var/lock /run/lock
 		migrate_to_run	/var/run /run
 	fi

[gentoo-commits] proj/openrc:master commit in: init.d/

[Christian Ruppert]

commit:     8d9db8d02cbedda7d5532d660fe678d8ee8bcd79
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 16 19:00:45 2012 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue Oct 16 19:00:45 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=8d9db8d0

Add Vim modeline

---
 init.d/bootmisc.in |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/init.d/bootmisc.in b/init.d/bootmisc.in
index a2afbf9..f4c32a2 100644
--- a/init.d/bootmisc.in
+++ b/init.d/bootmisc.in
@@ -196,3 +196,5 @@ stop()
 
 	return 0
 }
+
+# vim: ft=sh

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     ae9acfaed8401dbff3393f82468adfc33a85acf1
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Tue Aug 21 16:40:59 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Oct  2 20:02:11 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=ae9acfae

sysfs: add -lxc keyword

The sysfs filesystem should not be mounted inside a linux container.

Reported-by: permeakra <AT> gmail.com
X-Gentoo-Bug: 425790
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=425790

---
 init.d/sysfs.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/init.d/sysfs.in b/init.d/sysfs.in
index a90dab2..7d354e0 100644
--- a/init.d/sysfs.in
+++ b/init.d/sysfs.in
@@ -6,7 +6,7 @@ description="Mount the sys filesystem."
 
 depend()
 {
-	keyword -prefix -vserver
+	keyword -lxc -prefix -vserver
 }
 
 mount_sys()

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     6770a6b1ce1537f7a5efe5e6f97895bf6c277bfb
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Tue Oct  2 16:06:31 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Oct  2 16:06:31 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=6770a6b1

dmesg should not run in a linux container

reported-by: <Walter <AT> pratyeka.org>
X-Gentoo-Bug: 436266
X-Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=436266

---
 init.d/dmesg.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/init.d/dmesg.in b/init.d/dmesg.in
index 7371000..1188483 100644
--- 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 -prefix -vserver
+	keyword -lxc -prefix -vserver
 }
 
 start()

[gentoo-commits] proj/openrc:master commit in: init.d/

[Robin H. Johnson]

commit:     33c63ede78660598dcb8ba59034d0b5fe2d81884
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 26 21:32:19 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Sep 26 21:34:41 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=33c63ede

init.d/devfs: Run after (u)dev-mount, before udev/mdev

Using the new dev-mount virtual, with udev-mount included until new udev
version is rolled out, we run devfs earlier now, before udev/mdev.
It only needs (u)dev-mount before it, so that /dev is mounted.

This opens the way for tmpfiles.d, which needs to be sandwiched in the
middle.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

---
 init.d/devfs.in |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/init.d/devfs.in b/init.d/devfs.in
index 6a41354..8d5bb48 100644
--- a/init.d/devfs.in
+++ b/init.d/devfs.in
@@ -5,7 +5,8 @@
 description="Mount system critical filesystems in /dev."
 
 depend() {
-	use dev
+	use dev-mount udev-mount
+	before udev mdev
 	keyword -prefix -vserver
 }
 

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     7d8dca7b7816ccb95f86bf3f3206634597cbdc81
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Wed Sep 26 16:51:34 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Sep 26 16:51:34 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=7d8dca7b

Add -lxc keyword to urandom script

Urandom should not run in lxc containers since it is provided by the
host.

Reported-by: <walter <AT> pratyeka.org>
X-Gentoo-Bug: 436270
X-Gentoo-Bug-URL: http://bugs.gentoo.org/436270

---
 init.d/urandom.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/init.d/urandom.in b/init.d/urandom.in
index bc48066..2dfe1cc 100644
--- 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 -openvz -prefix
+	keyword -jail -lxc -openvz -prefix
 }
 
 save_seed()

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     a0fe1c5a6082c751b570dc1db7dd32b914ebe5cd
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Fri Sep 14 19:29:00 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Sep 15 17:08:09 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=a0fe1c5a

netmount: do not handle NFS mounts

Since nfs and nfs4 file systems require extra daemons to be running on
the client to function properly, netmount should not try to handle these
file systems.

Reported-by: <devurandom <AT> gmx.net>
X-Gentoo-Bug: 427996
X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=427996

---
 init.d/netmount.in |   88 +++++++++++++--------------------------------------
 1 files changed, 23 insertions(+), 65 deletions(-)

diff --git a/init.d/netmount.in b/init.d/netmount.in
index 2259783..57ef6d7 100644
--- a/init.d/netmount.in
+++ b/init.d/netmount.in
@@ -2,83 +2,27 @@
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
-description="Mounts network shares according to /etc/fstab."
-
-need_portmap()
-{
-	local opts=
-	local IFS="
-"
-	set -- $(fstabinfo --options --fstype nfs,nfs4)
-	for opts; do
-		case ,$opts, in
-			*,noauto,*|*,nolock,*);;
-			*) return 0;;
-		esac
-	done
-	return 1
-}
-
-need_idmap()
-{
-	local opts=
-	local IFS="
-"
-	set -- $(fstabinfo --options --fstype nfs4)
-	for opts; do
-		case ,$opts, in
-			*,noauto,*|*,nolock,*);;
-			*) return 0;;
-		esac
-	done
-	return 1
-}
+description="Mounts network shares, other than NFS, according to /etc/fstab."
+# We skip all NFS shares in this script because they require extra
+# daemons to be running on the client in order to work correctly.
+# It is best to allow nfs-utils to handle all nfs shares.
 
 depend()
 {
-	# Only have portmap as a dependency if there is a nfs mount in fstab
-	# that is set to mount at boot
-	local pmap=
-	if need_portmap; then
-		pmap="rpc.statd"
-		[ -x @SYSCONFDIR@/init.d/rpcbind ] \
-			&& pmap="$pmap rpcbind" \
-			|| pmap="$pmap portmap"
-	fi
-
-	# Only have rpc.idmapd as a dependency if there is a nfs4 mount in fstab
-	# that is set to mount at boot
-	if need_idmap; then
-		pmap="$pmap rpc.idmapd"
-	fi
-
 	config /etc/fstab
-	need net $pmap
+	need net
 	use afc-client amd autofs openvpn
-	use dns nfs nfsmount portmap rpcbind rpc.statd rpc.lockd
+	use dns
 	keyword -jail -prefix -vserver
 }
 
 start()
 {
-	local myneed= myuse= pmap="portmap" nfsmounts=
-	[ -x @SYSCONFDIR@/init.d/rpcbind ] && pmap="rpcbind"
-
 	local x= fs= rc=
 	for x in $net_fs_list $extra_net_fs_list; do
 		case "$x" in
 			nfs|nfs4)
-			# If the nfsmount script took care of the nfs
-			# filesystems, then there's no point in trying
-			# them twice
-			service_started nfsmount && continue
-
-			# Only try to mount NFS filesystems if portmap was
-			# started. This is to fix "hang" problems for new
-			# users who do not add portmap to the default runlevel.
-			if need_portmap && ! service_started "$pmap"; then
-				continue
-			fi
+			continue
 			;;
 		esac
 		fs="$fs${fs:+,}$x"
@@ -103,7 +47,14 @@ stop()
 	. "$RC_LIBEXECDIR"/sh/rc-mount.sh
 
 	for x in $net_fs_list $extra_net_fs_list; do
-		fs="$fs${fs:+,}$x"
+		case "$x" in
+			nfs|nfs4)
+				continue
+				;;
+			*)
+				fs="$fs${fs:+,}$x"
+				;;
+		esac
 	done
 	if [ -n "$fs" ]; then
 		umount -at $fs || eerror "Failed to simply unmount filesystems"
@@ -112,7 +63,14 @@ stop()
 	eindent
 	fs=
 	for x in $net_fs_list $extra_net_fs_list; do
-		fs="$fs${fs:+|}$x"
+		case "$x" in
+			nfs|nfs4)
+				continue
+				;;
+			*)
+				fs="$fs${fs:+|}$x"
+				;;
+		esac
 	done
 	[ -n "$fs" ] && fs="^($fs)$"
 	do_unmount umount ${fs:+--fstype-regex} $fs --netdev

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     3863c11be5d48ad4d1a10156f474339bea04f5ae
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Mon Sep 10 20:43:42 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Sep 10 20:43:42 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=3863c11b

netmount: add checks for rpc.idmapd for nfs4 filesystems

Reported-by: <devurandom <AT> gmx.net>
X-Gentoo-Bug: 427996
X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=427996

---
 init.d/netmount.in |   21 +++++++++++++++++++++
 1 files changed, 21 insertions(+), 0 deletions(-)

diff --git a/init.d/netmount.in b/init.d/netmount.in
index 963ad26..2259783 100644
--- a/init.d/netmount.in
+++ b/init.d/netmount.in
@@ -19,6 +19,21 @@ need_portmap()
 	return 1
 }
 
+need_idmap()
+{
+	local opts=
+	local IFS="
+"
+	set -- $(fstabinfo --options --fstype nfs4)
+	for opts; do
+		case ,$opts, in
+			*,noauto,*|*,nolock,*);;
+			*) return 0;;
+		esac
+	done
+	return 1
+}
+
 depend()
 {
 	# Only have portmap as a dependency if there is a nfs mount in fstab
@@ -31,6 +46,12 @@ depend()
 			|| pmap="$pmap portmap"
 	fi
 
+	# Only have rpc.idmapd as a dependency if there is a nfs4 mount in fstab
+	# that is set to mount at boot
+	if need_idmap; then
+		pmap="$pmap rpc.idmapd"
+	fi
+
 	config /etc/fstab
 	need net $pmap
 	use afc-client amd autofs openvpn

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     918d261658a75e42589d9e5556613a84eacbd14f
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Mon Sep 10 01:40:38 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Sep 10 01:40:38 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=918d2616

dmesg: add -prefix keyword

Dmesg should not run on prefix systems.

Reported-by: <heroxbd <AT> gentoo.org>

---
 init.d/dmesg.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/init.d/dmesg.in b/init.d/dmesg.in
index dcf418a..7371000 100644
--- 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 -vserver
+	keyword -prefix -vserver
 }
 
 start()

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     a0877449f3b6193fda1b1d2d6f5fdf34f4096c9d
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Sat Sep  8 00:18:51 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Sep  8 00:18:51 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=a0877449

savecache: make sure $RC_LIBEXECDIR is writable

This is needed in case of a read-only root filesystem such as a diskless
client.

Reported-by: <walter <AT> pratyeka.org>
X-Gentoo-Bug: 430382
X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=430382

---
 init.d/savecache.in |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/init.d/savecache.in b/init.d/savecache.in
index 373da1f..581be59 100644
--- a/init.d/savecache.in
+++ b/init.d/savecache.in
@@ -13,6 +13,14 @@ start()
 			return 1
 		fi
 	fi
+	if ! checkpath -W "$RC_LIBEXECDIR"; then
+		ewarn "WARNING: ${RC_LIBEXECDIR} is not writable!"
+		if ! yesno "${RC_GOINGDOWN}"; then
+			ewarn "Unable to save deptree cache"
+			return 1
+		fi
+		return 0
+	fi
 	ebegin "Saving dependency cache"
 	local rc=
 	if [ ! -d "$RC_LIBEXECDIR"/cache ]; then

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     1f011573544487bab0bee9d2a3d6ffa81c08ff48
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Fri Aug 24 21:09:57 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Aug 25 22:09:04 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=1f011573

do not provide a virtual for the loopback

The loopback interface is active on all systems, so there is no need to
provide a virtual for it.

---
 init.d/net.lo.in  |    2 +-
 init.d/network.in |    1 -
 2 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/init.d/net.lo.in b/init.d/net.lo.in
index 088398b..de441e2 100644
--- a/init.d/net.lo.in
+++ b/init.d/net.lo.in
@@ -26,7 +26,7 @@ depend()
 	keyword -jail -prefix -vserver
 
 	case "${IFACE}" in
-		lo|lo0) provide lo;;
+		lo|lo0) ;;
 		*)
 			after net.lo net.lo0 dbus
 			provide net

diff --git a/init.d/network.in b/init.d/network.in
index 65c199c..6e9b8c1 100644
--- a/init.d/network.in
+++ b/init.d/network.in
@@ -12,7 +12,6 @@ depend()
 {
 	need localmount
 	after bootmisc
-	provide lo
 	if [ -n "$(interfaces)" ]; then
 		provide net
 	fi

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     8f675d14e86e9e86a2d17b825aae9af519214305
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Fri Aug 24 15:30:04 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Aug 24 15:30:04 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=8f675d14

newnet: provide net if configuring more than the loopback interface

---
 init.d/network.in |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/init.d/network.in b/init.d/network.in
index f0403b4..65c199c 100644
--- a/init.d/network.in
+++ b/init.d/network.in
@@ -12,7 +12,10 @@ depend()
 {
 	need localmount
 	after bootmisc
-	provide net
+	provide lo
+	if [ -n "$(interfaces)" ]; then
+		provide net
+	fi
 	keyword -jail -prefix -vserver
 }
 

[gentoo-commits] proj/openrc:master commit in: init.d/

[Christian Ruppert]

commit:     aa7e2cd1fe88b5d24f272764b2005681ea1ebebd
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 18 20:37:15 2012 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Sat Aug 18 20:37:38 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=aa7e2cd1

Use do_umount's return value instead of eoutdent's.

---
 init.d/mount-ro.in |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/init.d/mount-ro.in b/init.d/mount-ro.in
index 881bf84..41b0b9e 100644
--- a/init.d/mount-ro.in
+++ b/init.d/mount-ro.in
@@ -12,6 +12,8 @@ depend()
 
 start()
 {
+	local ret=0
+
 	# Flush all pending disk writes now
 	sync; sync
 
@@ -39,6 +41,9 @@ start()
 	do_unmount "umount -r" \
 		--skip-point-regex "$m" \
 		"${fs:+--skip-fstype-regex}" $fs --nonetdev
+	ret=$?
+
 	eoutdent
-	eend $?
+
+	eend $ret
 }

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     07e848638cbf0e06c0de1b01644d5d2279d696a7
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Fri Aug 17 18:26:21 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Aug 17 18:26:21 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=07e84863

swapfiles: make sure /proc/swaps exists

If CONFIG_SWAP is turned off in the kernel, this file may not exist. In
that case, we should not try to read from it.

reported-by: <walter <AT> pratyeka.org>
X-Gentoo-Bug: 430378
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=430378

---
 init.d/swapfiles.in |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/init.d/swapfiles.in b/init.d/swapfiles.in
index f46f3c8..baf7591 100644
--- a/init.d/swapfiles.in
+++ b/init.d/swapfiles.in
@@ -31,14 +31,16 @@ stop()
 
 	case "$RC_UNAME" in
 		Linux)
-			while read filename type rest; do
-				case "$type" in
-					file) swapoff $filename >/dev/null;;
-				esac
-				case "$filename" in
-					/dev/loop*) swapoff $filename >/dev/null;;
-				esac
-			done < /proc/swaps
+			if [ -e /proc/swaps ]; then
+				while read filename type rest; do
+					case "$type" in
+						file) swapoff $filename >/dev/null;;
+					esac
+					case "$filename" in
+						/dev/loop*) swapoff $filename >/dev/null;;
+					esac
+				done < /proc/swaps
+			fi
 			;;
 	esac
 	eend 0

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     2e3715bb6922b9bb8c7a4c85e5a8dd1fb034b6d3
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Sun Jul 15 19:12:55 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Jul 15 19:12:55 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=2e3715bb

remove unnecessary header line

---
 init.d/encswap.in |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/init.d/encswap.in b/init.d/encswap.in
index 7df669d..bb52735 100644
--- a/init.d/encswap.in
+++ b/init.d/encswap.in
@@ -1,7 +1,6 @@
 #!@PREFIX@/sbin/runscript
 # Copyright 1992-2012 FreeBSD Project
 # Released under the 2-clause BSD license
-# $Header: $
 
 depend() {
 	before swap

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     39abbed7cbdd57e28ac3bd8ccb3b47b709467092
Author:     Richard Yao <ryao <AT> cs <DOT> stonybrook <DOT> edu>
AuthorDate: Sun Jul 15 12:47:02 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Jul 15 19:01:03 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=39abbed7

Fix savecore init script to execute after dumpon, but before encswap

This ensures that any kernel crash dumps are available when savecore
runs. It also prevents encswap from corrupting them.

---
 init.d/savecore.in |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/init.d/savecore.in b/init.d/savecore.in
index 1423046..b04d1be 100644
--- a/init.d/savecore.in
+++ b/init.d/savecore.in
@@ -6,7 +6,8 @@ description="Saves a kernel dump."
 
 depend()
 {
-	need localmount
+	need dumpon localmount
+	before encswap
 	keyword -jail
 }
 

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     0730ac61e8e674c5751ff8fa3857184326a40460
Author:     Richard Yao <ryao <AT> cs <DOT> stonybrook <DOT> edu>
AuthorDate: Sun Jul 15 12:47:00 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Jul 15 18:57:57 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=0730ac61

Import encswap init script from FreeBSD

The FreeBSD encswap init script has been adapted to function in OpenRC. It
should function identically to its FreeBSD counterpart.

---
 init.d/Makefile   |    4 ++--
 init.d/encswap.in |   46 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/init.d/Makefile b/init.d/Makefile
index a34ee90..d192749 100644
--- a/init.d/Makefile
+++ b/init.d/Makefile
@@ -22,8 +22,8 @@ NET_LO-FreeBSD=	net.lo0
 SRCS-FreeBSD=	hostid.in moused.in newsyslog.in pf.in rarpd.in rc-enabled.in \
 		rpcbind.in savecore.in syslogd.in
 # These are FreeBSD specific
-SRCS-FreeBSD+=	adjkerntz.in devd.in dumpon.in ipfw.in mixer.in nscd.in \
-		powerd.in syscons.in
+SRCS-FreeBSD+=	adjkerntz.in devd.in dumpon.in encswap.in ipfw.in \
+		mixer.in nscd.in powerd.in syscons.in
 
 NET_LO-Linux=	net.lo
 SRCS-Linux=	devfs.in dmesg.in hwclock.in consolefont.in keymaps.in \

diff --git a/init.d/encswap.in b/init.d/encswap.in
new file mode 100644
index 0000000..a03fe58
--- /dev/null
+++ b/init.d/encswap.in
@@ -0,0 +1,46 @@
+#!@PREFIX@/sbin/runscript
+# Copyright 1992-2012 FreeBSD Project
+# Released under the 2-clause BSD license
+# $Header: $
+
+depend() {
+	before swap
+}
+
+start() {
+	while read device mountpoint type options rest ; do
+		case ":${device}:${type}:${options}" in
+		:#*)
+			continue
+			;;
+		*.bde:swap:sw)
+			passphrase=`dd if=/dev/random count=1 2>/dev/null | md5 -q`
+			device="${device%.bde}"
+			gbde init "${device}" -P "${passphrase}" || return 1
+			gbde attach "${device}" -p "${passphrase}" || return 1
+			;;
+		*.eli:swap:sw)
+			device="${device%.eli}"
+			geli onetime ${geli_swap_flags} "${device}" || return 1
+			;;
+		esac
+	done < /etc/fstab
+}
+
+stop() {
+	while read device mountpoint type options rest ; do
+		case ":${device}:${type}:${options}" in
+		:#*)
+			continue
+			;;
+		*.bde:swap:sw)
+			device="${device%.bde}"
+			gbde detach "${device}"
+			;;
+		*.eli:swap:sw)
+			# Nothing here, because geli swap devices should be
+			# created with the auto-detach-on-last-close option.
+			;;
+		esac
+	done < /etc/fstab
+}

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     883ea31f80c42696dfa9f9b5e97a16860be38243
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Sun Jul 15 18:54:39 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Jul 15 19:01:03 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=883ea31f

small style changes to encswap

This drops some unnecessary continue statements and changes command
command substitution to use $() instead of ``.

---
 init.d/encswap.in |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/init.d/encswap.in b/init.d/encswap.in
index a03fe58..7df669d 100644
--- a/init.d/encswap.in
+++ b/init.d/encswap.in
@@ -11,10 +11,9 @@ start() {
 	while read device mountpoint type options rest ; do
 		case ":${device}:${type}:${options}" in
 		:#*)
-			continue
 			;;
 		*.bde:swap:sw)
-			passphrase=`dd if=/dev/random count=1 2>/dev/null | md5 -q`
+			passphrase=$(dd if=/dev/random count=1 2>/dev/null | md5 -q)
 			device="${device%.bde}"
 			gbde init "${device}" -P "${passphrase}" || return 1
 			gbde attach "${device}" -p "${passphrase}" || return 1
@@ -31,7 +30,6 @@ stop() {
 	while read device mountpoint type options rest ; do
 		case ":${device}:${type}:${options}" in
 		:#*)
-			continue
 			;;
 		*.bde:swap:sw)
 			device="${device%.bde}"

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     b3d47d58613f0637772e71fdd30bb36cf48d69b8
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sun May 27 15:03:24 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun May 27 15:03:24 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=b3d47d58

termencoding should not run on lxc

reported-by: Alexey Shvetsov <alexxy <AT> gentoo.org>

---
 init.d/termencoding.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/init.d/termencoding.in b/init.d/termencoding.in
index 5f09c98..0f243e2 100644
--- a/init.d/termencoding.in
+++ b/init.d/termencoding.in
@@ -9,7 +9,7 @@ ttyn=${rc_tty_number:-${RC_TTY_NUMBER:-12}}
 
 depend()
 {
-	keyword -openvz -uml -vserver -xenu
+	keyword -lxc -openvz -uml -vserver -xenu
 	use root
 	after bootmisc
 }

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     ee1a698451a01772d50a75e95c887520260f8619
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Mon May 14 00:00:39 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon May 14 00:00:39 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=ee1a6984

do not umount /usr on linux systems

We can't really umount /usr on linux systems because /usr is a special
case if it is a separate filesystem which is handled by an initramfs.

reported-by: tamiko+GENTOO <AT> kyomu.43-1.org
X-Gentoo-Bug: 415523
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=415523

---
 init.d/localmount.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/init.d/localmount.in b/init.d/localmount.in
index de0b08b..c432a12 100644
--- a/init.d/localmount.in
+++ b/init.d/localmount.in
@@ -48,7 +48,7 @@ stop()
 	done
 
 	if [ "$RC_UNAME" = Linux ]; then
-		no_umounts_r="$no_umounts_r|/proc|/proc/.*|/run|/sys|/sys/.*"
+		no_umounts_r="$no_umounts_r|/proc|/proc/.*|/run|/sys|/sys/.*|/usr"
 	fi
 	no_umounts_r="^($no_umounts_r)$"
 

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     ca7d67021e5b93e4d9af45ce13a05f76b4979f75
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Wed May  2 19:40:16 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed May  2 19:42:58 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=ca7d6702

Do not try to remount /run read only

On a diskless system, doing this causes the system to lock up during
shutdown.

---
 init.d/mount-ro.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/init.d/mount-ro.in b/init.d/mount-ro.in
index 4b07457..369d544 100644
--- a/init.d/mount-ro.in
+++ b/init.d/mount-ro.in
@@ -23,7 +23,7 @@ start()
 	# Bug 381783
 	local rc_svcdir=$(echo $RC_SVCDIR | sed 's:/lib\(32\|64\)\?/:/lib(32|64)?/:g')
 
-	local m="/dev|/dev/.*|/proc|/proc.*|/sys|/sys/.*|${rc_svcdir}" x= fs=
+	local m="/dev|/dev/.*|/proc|/proc.*|/sys|/sys/.*|/run|${rc_svcdir}" x= fs=
 	m="$m|/bin|/sbin|/lib(32|64)?|/libexec"
 	# RC_NO_UMOUNTS is an env var that can be set by plugins
 	local IFS="$IFS:"

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     4943ddcb1c96aed14617c97ba42a658a2c6cecf5
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 13 20:01:42 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Apr 16 18:45:59 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=4943ddcb

init.d/procfs: posix compatibility fix

I've noticed in at boot:
    # /etc/init.d/procfs restart
    procfs         | * WARNING: you are stopping a boot service
    procfs         |[: 308: unexpected operator

Which calls
    $ /bin/dash -c '[ "$RC_SYS" == "OPENVZ" ] && echo "ovz" || echo "nope"'
    [: 1: unexpected operator
    nope

Fixed by using '='.

X-Gentoo-Bug: 412237
x-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=412237

---
 init.d/procfs.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/init.d/procfs.in b/init.d/procfs.in
index a6136a3..a167ed7 100644
--- a/init.d/procfs.in
+++ b/init.d/procfs.in
@@ -41,7 +41,7 @@ start()
 		fi
 	fi
 
-	[ "$RC_SYS" == "OPENVZ" ] && return 0
+	[ "$RC_SYS" = "OPENVZ" ] && return 0
 
 	# Check what USB fs the kernel support.  Currently
 	# 2.5+ kernels, and later 2.4 kernels have 'usbfs',

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     0571a7e05b658fc95da56d9df61e725eeda75a3c
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 29 16:44:12 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Mar 29 16:44:12 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=0571a7e0

init.d/fsck: only check local file systems

On linux systems, fsck was not taking into account which filesystems
were local or remote. This commit adds the -t option, with an
appropriate value, to the fsck call so that remote file systems are not
checked.

reported-by: Vladimir Berezhnoy <non7top <AT> gmail.com>
X-Gentoo-Bug: 408363
X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=408363

---
 init.d/fsck.in |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/init.d/fsck.in b/init.d/fsck.in
index d53a7ed..0e93d21 100644
--- a/init.d/fsck.in
+++ b/init.d/fsck.in
@@ -71,7 +71,12 @@ start()
 	done
 
 	if [ "$RC_UNAME" = Linux ]; then
-		fsck_opts="$fsck_opts -C0 -T"
+		local skiptypes x
+		for x in $net_fs_list $extra_net_fs_list; do
+			skiptypes="${skiptypes}no${x},"
+		done
+		skiptypes="${skiptypes}noopts=_netdev"
+		fsck_opts="$fsck_opts -C0 -T -t $skiptypes"
 		if [ -z "$fsck_passno" -a -z "$fsck_mnt" ]; then
 			fsck_args=${fsck_args--A -p}
 			if echo 2>/dev/null >/.test.$$; then

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     f9162438bca8c8449f1f663a60c47229f0c08316
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 26 19:51:03 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Mar 26 19:51:03 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=f9162438

Add -lxc keyword to sysctl script for linux systems

Kernel parameters should not be set from inside a lxc guest.

Reported-by: Piotr Karbowski <piotr.karbowski <AT> gmail.com>

---
 init.d/sysctl.Linux.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/init.d/sysctl.Linux.in b/init.d/sysctl.Linux.in
index f4a06ff..a64060f 100644
--- a/init.d/sysctl.Linux.in
+++ b/init.d/sysctl.Linux.in
@@ -5,7 +5,7 @@
 depend()
 {
 	before bootmisc logger
-	keyword -vserver
+	keyword -lxc -vserver
 }
 
 start()

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     533813dda03d4b3cd1685f4063e314ae0539267e
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 25 23:29:37 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Mar 25 23:38:13 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=533813dd

localmount: Only unmount local filesystems if we are shutting down

Make the stop function in localmount only unmount file systems when the
system is going down.

reported-by: Alexey Prokopchuk <alexpro <AT> homelan.lg.ua>
X-Gentoo-Bug: 407167
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=407167

---
 init.d/localmount.in |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/init.d/localmount.in b/init.d/localmount.in
index 158bafc..de0b08b 100644
--- a/init.d/localmount.in
+++ b/init.d/localmount.in
@@ -33,6 +33,7 @@ start()
 
 stop()
 {
+	yesno $RC_GOINGDOWN || return 0
 	# We never unmount / or /dev or $RC_SVCDIR
 
 	# Bug 381783

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     6ac182c9cab4bde83767ea82ba2013cf126d55de
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 24 20:00:24 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Mar 24 20:00:24 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=6ac182c9

sysctl: use @SYSCONFDIR@ in the scripts instead of hard coding /etc

---
 init.d/sysctl.BSD.in   |    2 +-
 init.d/sysctl.Linux.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/init.d/sysctl.BSD.in b/init.d/sysctl.BSD.in
index 2bfd052..fe69ab2 100644
--- a/init.d/sysctl.BSD.in
+++ b/init.d/sysctl.BSD.in
@@ -13,7 +13,7 @@ start()
 	local retval=0 var= comments= conf=
 	ebegin "Configuring kernel parameters"
 	eindent
-	for conf in /etc/sysctl.conf /etc/sysctl.d/*.conf; do
+	for conf in @SYSCONFDIR@/sysctl.conf @SYSCONFDIR@/sysctl.d/*.conf; do
 		if [ -r "$conf" ]; then
 			vebegin "applying $conf"
 			while read var comments; do

diff --git a/init.d/sysctl.Linux.in b/init.d/sysctl.Linux.in
index d202cb3..f4a06ff 100644
--- a/init.d/sysctl.Linux.in
+++ b/init.d/sysctl.Linux.in
@@ -15,7 +15,7 @@ start()
 	ebegin "Configuring kernel parameters"
 	eindent
 
-	for conf in /etc/sysctl.conf /etc/sysctl.d/*.conf; do
+	for conf in @SYSCONFDIR@/sysctl.conf @SYSCONFDIR@/sysctl.d/*.conf; do
 		if [ -r "$conf" ]; then
 			vebegin "applying $conf"
 			if ! err=$(sysctl -p "$conf" 2>&1 >/dev/null) ; then

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     09327f429fa8865c5a029dd4e9b029f5db1534e7
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 24 19:37:08 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Mar 24 19:37:08 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=09327f42

Allow files in sysctl.d to override sysctl.conf

reported-by: Peter Gantner (a.k.a. nephros) <gentoo <AT> nephros.org>
X-Gentoo-Bug: 406631
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=406631

---
 init.d/sysctl.BSD.in   |    2 +-
 init.d/sysctl.Linux.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/init.d/sysctl.BSD.in b/init.d/sysctl.BSD.in
index 4a86f87..2bfd052 100644
--- a/init.d/sysctl.BSD.in
+++ b/init.d/sysctl.BSD.in
@@ -13,7 +13,7 @@ start()
 	local retval=0 var= comments= conf=
 	ebegin "Configuring kernel parameters"
 	eindent
-	for conf in /etc/sysctl.d/*.conf /etc/sysctl.conf; do
+	for conf in /etc/sysctl.conf /etc/sysctl.d/*.conf; do
 		if [ -r "$conf" ]; then
 			vebegin "applying $conf"
 			while read var comments; do

diff --git a/init.d/sysctl.Linux.in b/init.d/sysctl.Linux.in
index 00b4c33..d202cb3 100644
--- a/init.d/sysctl.Linux.in
+++ b/init.d/sysctl.Linux.in
@@ -15,7 +15,7 @@ start()
 	ebegin "Configuring kernel parameters"
 	eindent
 
-	for conf in /etc/sysctl.d/*.conf /etc/sysctl.conf; do
+	for conf in /etc/sysctl.conf /etc/sysctl.d/*.conf; do
 		if [ -r "$conf" ]; then
 			vebegin "applying $conf"
 			if ! err=$(sysctl -p "$conf" 2>&1 >/dev/null) ; then

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     8104618d10bb4c06e87c723b3359cb9d5871fd51
Author:     Diego Elio Pettenò <flameeyes <AT> flameeyes <DOT> eu>
AuthorDate: Fri Mar 23 23:01:29 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Mar 24 18:19:41 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=8104618d

init.d/sysctl.Linux: do not use sysctl -q

The -q option is not implemented by BusyBox, so instead of using that, make
it so that the standard error is caught, but standard output is thrown
away.

Note: the ordered behaviour of redirection is part of POSIX so we should be
on the safe side with this change, as first we duplicate the output
descriptor to be used as stderr, then we change the output descriptor to
point to NULL.

Signed-off-by: Diego Elio Pettenò <flameeyes <AT> flameeyes.eu>

---
 init.d/sysctl.Linux.in |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/init.d/sysctl.Linux.in b/init.d/sysctl.Linux.in
index 0584c62..00b4c33 100644
--- a/init.d/sysctl.Linux.in
+++ b/init.d/sysctl.Linux.in
@@ -18,9 +18,9 @@ start()
 	for conf in /etc/sysctl.d/*.conf /etc/sysctl.conf; do
 		if [ -r "$conf" ]; then
 			vebegin "applying $conf"
-			if ! err=$(sysctl -q -p "$conf" 2>&1) ; then
+			if ! err=$(sysctl -p "$conf" 2>&1 >/dev/null) ; then
 				errs="${errs} ${err}"
-				sysctl -q -e -p "${conf}"
+				sysctl -e -p "${conf}" >/dev/null
 			fi
 			veend $? || retval=1
 		fi

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     e4146c094546e5d8e8a48b48636586c5e21ad509
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 21 00:59:17 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Feb 21 00:59:17 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=e4146c09

Revert "Revert "swap: go back to using swapon for Linux systems""

This reverts commit 06d67017850e106f14d8948003027612253b143a.
After researching this further, we do need this commit. The other issue
is a bug in fstabinfo which will also need to be fixed.

---
 init.d/swap.in |   10 +---------
 1 files changed, 1 insertions(+), 9 deletions(-)

diff --git a/init.d/swap.in b/init.d/swap.in
index 0b229a1..fa08b4d 100644
--- a/init.d/swap.in
+++ b/init.d/swap.in
@@ -12,15 +12,7 @@ start()
 {
 	ebegin "Activating swap devices"
 	case "$RC_UNAME" in
-		Linux)
-			local dev
-			for dev in $(fstabinfo -b -t swap); do
-				case "$dev" in
-					/dev/loop*) ;;
-					*) swapon $dev >/dev/null;;
-				esac
-			done
-			;;
+		Linux)		swapon -a -e >/dev/null;;
 		NetBSD|OpenBSD) swapctl -A -t noblk >/dev/null;;
 		*)		swapon -a >/dev/null;;
 	esac

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     06d67017850e106f14d8948003027612253b143a
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 20 17:51:08 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Feb 20 17:51:08 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=06d67017

Revert "swap: go back to using swapon for Linux systems"

This reverts commit 297720787f914ca34f2d04c66980c18c57700865.

robbat2 tells me there is a better way to fix this.

---
 init.d/swap.in |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/init.d/swap.in b/init.d/swap.in
index fa08b4d..0b229a1 100644
--- a/init.d/swap.in
+++ b/init.d/swap.in
@@ -12,7 +12,15 @@ start()
 {
 	ebegin "Activating swap devices"
 	case "$RC_UNAME" in
-		Linux)		swapon -a -e >/dev/null;;
+		Linux)
+			local dev
+			for dev in $(fstabinfo -b -t swap); do
+				case "$dev" in
+					/dev/loop*) ;;
+					*) swapon $dev >/dev/null;;
+				esac
+			done
+			;;
 		NetBSD|OpenBSD) swapctl -A -t noblk >/dev/null;;
 		*)		swapon -a >/dev/null;;
 	esac

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     297720787f914ca34f2d04c66980c18c57700865
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 20 17:30:03 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Feb 20 17:30:03 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=29772078

swap: go back to using swapon for Linux systems

There are several reasons for going back to this:

- fstabinfo doesn't work with labels in fstab
- when a device is passed to swapon individually, the swap priority from
  fstab is not honored.
- We also add the -e option to only activate available swap devices.

reported-by: Duncan <1i5t5.duncan <AT> cox.net>
X-Gentoo-Bug: 405021
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=405021

---
 init.d/swap.in |   10 +---------
 1 files changed, 1 insertions(+), 9 deletions(-)

diff --git a/init.d/swap.in b/init.d/swap.in
index 0b229a1..fa08b4d 100644
--- a/init.d/swap.in
+++ b/init.d/swap.in
@@ -12,15 +12,7 @@ start()
 {
 	ebegin "Activating swap devices"
 	case "$RC_UNAME" in
-		Linux)
-			local dev
-			for dev in $(fstabinfo -b -t swap); do
-				case "$dev" in
-					/dev/loop*) ;;
-					*) swapon $dev >/dev/null;;
-				esac
-			done
-			;;
+		Linux)		swapon -a -e >/dev/null;;
 		NetBSD|OpenBSD) swapctl -A -t noblk >/dev/null;;
 		*)		swapon -a >/dev/null;;
 	esac

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     dd2b4a067a04ba8441093a22411eea32bae86971
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 18 23:23:28 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Feb 18 23:23:28 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=dd2b4a06

net: add deprecation warning for old style net dependency variables

---
 init.d/net.lo.in |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/init.d/net.lo.in b/init.d/net.lo.in
index 4e11dec..3439bec 100644
--- a/init.d/net.lo.in
+++ b/init.d/net.lo.in
@@ -39,6 +39,8 @@ depend()
 		eval prov=\$rc_${dep}_${IFVAR}
 		if [ -n "${prov}" ]; then
 			${dep} ${prov}
+			ewarn "rc_${dep}_${IFVAR} is deprecated."
+			ewarn "Please use rc_net_${IFVAR}_${dep} instead."
 		fi
 	done
 }

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     bc581530e5caa4e2c82d1c3deb9f0382a440e8ec
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  7 23:10:10 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Feb 18 19:48:11 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=bc581530

Fix meaning of "provide net"

I was informed that "provide net" should mean that there is network
communication outside the local computer. In this case, the loopback
interface can't "provide net", but there needs to be a way for other
processes to know that the loopback interface is active.

To this end, this commit makes the loopback "provide lo" and all other
interfaces "provide net".

---
 init.d/net.lo.in |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/init.d/net.lo.in b/init.d/net.lo.in
index bf2d848..4e11dec 100644
--- a/init.d/net.lo.in
+++ b/init.d/net.lo.in
@@ -20,12 +20,14 @@ depend()
 
 	need localmount
 	after bootmisc
-	provide net
 	keyword -jail -prefix -vserver
 
 	case "${IFACE}" in
-		lo|lo0);;
-		*) after net.lo net.lo0 dbus;;
+		lo|lo0) provide lo;;
+		*)
+			after net.lo net.lo0 dbus
+			provide net
+			;;
 	esac
 
 	if [ "$(command -v "depend_${IFVAR}")" = "depend_${IFVAR}" ]; then

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     a5509d681997321e966e776b6a0e4630aa827595
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 15 15:00:23 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Feb 16 20:05:04 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=a5509d68

Enable binfmt_misc for openvz containers

Reported-by: Daniel Robbins <drobbins <AT> funtoo.org>
X-Gentoo-Bug: 401875
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=401875

---
 init.d/procfs.in |   38 ++++++++++++++++++++------------------
 1 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/init.d/procfs.in b/init.d/procfs.in
index 6afc81f..baa33ad 100644
--- a/init.d/procfs.in
+++ b/init.d/procfs.in
@@ -8,7 +8,7 @@ depend()
 {
 	use modules devfs
 	need localmount
-	keyword -openvz -prefix -vserver -lxc
+	keyword -prefix -vserver -lxc
 }
 
 start()
@@ -20,23 +20,6 @@ start()
 
 	[ -e /proc/filesystems ] || 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 miscellaneous Binary Formats
 	if [ -d /proc/sys/fs/binfmt_misc -a ! -e /proc/sys/fs/binfmt_misc/register ]; then
 		if grep -qs binfmt_misc /proc/filesystems; then
@@ -58,6 +41,25 @@ start()
 		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 /selinux ] && ! mountinfo -q /selinux; then
 		if grep -qs selinuxfs /proc/filesystems; then

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     0c866e1a313f20679f6b7d3288636170f3057b59
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 16 19:02:41 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Feb 16 19:59:47 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=0c866e1a

Replace hard coded reference to /etc with @SYSCONFDIR@

I found a reference to "/etc" in the procfs script. This changes that
reference to @SYSCONFDIR@.

---
 init.d/procfs.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/init.d/procfs.in b/init.d/procfs.in
index 8167ff9..6afc81f 100644
--- a/init.d/procfs.in
+++ b/init.d/procfs.in
@@ -48,7 +48,7 @@ start()
 				ebegin "Loading custom binary format handlers"
 				fmts=$(grep -hsv -e '^[#;]' -e '^[[:space:]]*$' \
 					/run/binfmt.d/*.conf \
-					"/etc"/binfmt.d/*.conf \
+					@SYSCONFDIR@/binfmt.d/*.conf \
 					""/usr/lib/binfmt.d/*.conf)
 				if [ -n "${fmts}" ]; then
 					echo "${fmts}" > /proc/sys/fs/binfmt_misc/register

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     1c7d3165e4aa87d3939d892be9e71582c2aa8d52
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 13 18:15:55 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Feb 13 18:15:55 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=1c7d3165

Allow localmount to run in openvz containers

Reported-By: Daniel Robbins <drobbins <AT> funtoo.org>
X-Gentoo-Bug: 401063
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=401063

---
 init.d/localmount.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/init.d/localmount.in b/init.d/localmount.in
index 3fbc071..68b33db 100644
--- a/init.d/localmount.in
+++ b/init.d/localmount.in
@@ -9,7 +9,7 @@ depend()
 	need fsck
 	use lvm modules mtab
 	after lvm modules
-	keyword -jail -openvz -prefix -vserver -lxc
+	keyword -jail -prefix -vserver -lxc
 }
 
 start()

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     a5ad5ba9714ce5a2acca7db8fc022410038a5144
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 13 16:12:12 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Feb 13 16:12:12 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=a5ad5ba9

Swap: fix redirect

Swap should redirect stdout and stderr from swapon to null and not just
stderr.

---
 init.d/swap.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/init.d/swap.in b/init.d/swap.in
index bdc5dc7..0b229a1 100644
--- a/init.d/swap.in
+++ b/init.d/swap.in
@@ -17,7 +17,7 @@ start()
 			for dev in $(fstabinfo -b -t swap); do
 				case "$dev" in
 					/dev/loop*) ;;
-					*) swapon $dev 2>/dev/null;;
+					*) swapon $dev >/dev/null;;
 				esac
 			done
 			;;

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     09c8c8ed9fabffe34570099009d81978aa85d899
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 12 18:38:37 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Feb 12 18:38:37 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=09c8c8ed

Fix typo in swap script

---
 init.d/swap.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/init.d/swap.in b/init.d/swap.in
index fef8ab3..bd20ffe 100644
--- a/init.d/swap.in
+++ b/init.d/swap.in
@@ -23,7 +23,7 @@ stop()
 	ebegin "Deactivating swap devices"
 
 	# Try to unmount all tmpfs filesystems not in use, else a deadlock may
-	# occure. As $RC_SVCDIR may also be tmpfs we cd to it to lock it
+	# occur. As $RC_SVCDIR may also be tmpfs we cd to it to lock it
 	cd "$RC_SVCDIR"
 	umount -a -t tmpfs 2>/dev/null
 

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     94661b1d22803a9a5c485ff5f89d5b867afa1fb7
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 10 15:47:12 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Feb 10 15:47:12 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=94661b1d

termencoding: change "need root" to "use root"

This allows root to be removed from the boot runlevel which is needed
sometimes when the root fs is mounted read-only.

Reported-By: Maxim Kammerer <mk <AT> dee.su>
X-Gentoo-Bug: 400921
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=400921

---
 init.d/termencoding.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/init.d/termencoding.in b/init.d/termencoding.in
index af4ed15..c8ea167 100644
--- a/init.d/termencoding.in
+++ b/init.d/termencoding.in
@@ -10,7 +10,7 @@ ttyn=${rc_tty_number:-${RC_TTY_NUMBER:-12}}
 depend()
 {
 	keyword -openvz -prefix -uml -vserver -xenu
-	need root
+	use root
 	after bootmisc
 }
 

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     b9cc5898828b710d9d4a2bf8988fd6ba78ba72e4
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 10 15:23:13 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Feb 10 15:23:13 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=b9cc5898

root.in: split a long line for readability

---
 init.d/root.in |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/init.d/root.in b/init.d/root.in
index 4d63919..c8ae4f1 100644
--- a/init.d/root.in
+++ b/init.d/root.in
@@ -44,7 +44,8 @@ start()
 			/)
 			;;
 			/*)
-				mountinfo -q "${mountpoint}" && fstabinfo --remount "${mountpoint}"
+				mountinfo -q "${mountpoint}" && \
+					fstabinfo --remount "${mountpoint}"
 			;;
 		esac
 	done

[gentoo-commits] proj/openrc:master commit in: init.d/

[Robin H. Johnson]

commit:     497ff7ee41168d863971efb52e2ca6b42f765832
Author:     Piotr Karbowski <piotr.karbowski <AT> gmail <DOT> com>
AuthorDate: Fri Feb  3 20:17:18 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu Feb  9 07:27:56 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=497ff7ee

Remount already mounted filesystems.

This was modified by William Hubbs to use the checkpath helper and to
improve readability.

Signed-off-by: William Hubbs <williamh <AT> gentoo.org>
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
(tested with genkernel /usr mount changes);

---
 init.d/root.in |   48 ++++++++++++++++++++++++++++++++++--------------
 1 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/init.d/root.in b/init.d/root.in
index 1c93771..4d63919 100644
--- a/init.d/root.in
+++ b/init.d/root.in
@@ -13,20 +13,40 @@ depend()
 start()
 {
 	case ",$(fstabinfo -o /)," in
-	*,ro,*) return 0;;
+		*,ro,*)
+		;;
+		*)
+			# Check if the rootfs isn't already writable.
+			if checkpath -W /; then
+				rm -f /fastboot /forcefsck
+			else
+				ebegin "Remounting root filesystem read/write"
+				case "$RC_UNAME" in
+					Linux)
+						mount -n -o remount,rw /
+					;;
+					*)
+						mount -u -o rw /
+					;;
+				esac
+				eend $? "Root filesystem could not be mounted read/write"
+				if [ $?  -eq 0 ]; then
+					rm -f /fastboot /forcefsck
+				fi
+			fi
+		;;
 	esac
 
-	if echo 2>/dev/null >/.test.$$; then
-		rm -f /.test.$$ /fastboot /forcefsck
-		return 0
-	fi
-
-	ebegin "Remounting root filesystem read/write"
-	case "$RC_UNAME" in
-		Linux)	mount -n -o remount,rw /;;
-		*)	mount -u -o rw /;;
-	esac
-	if eend $? "Root filesystem could not be mounted read/write"; then
-		rm -f /fastboot /forcefsck
-	fi
+	ebegin "Remounting filesystems"
+	local mountpoint
+	for mountpoint in $(fstabinfo); do
+		case "${mountpoint}" in
+			/)
+			;;
+			/*)
+				mountinfo -q "${mountpoint}" && fstabinfo --remount "${mountpoint}"
+			;;
+		esac
+	done
+	eend 0
 }

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     0ff23f20e88279fea27a110fc5d56ed760689806
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 30 18:06:46 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Jan 30 18:06:46 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=0ff23f20

Revert "Net: do not bring down interfaces during shutdown"

This reverts commit 6d5a2d5f9e5c1e3cb4c24dfc0c2ed2c118d8e64c.
There are interfaces, such as adsl and ppp interfaces which need to be
brought down. Also, the WOL setting is a good case for bringingdown
interfaces.

---
 init.d/net.lo.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/init.d/net.lo.in b/init.d/net.lo.in
index 9fdeaba..bf2d848 100644
--- a/init.d/net.lo.in
+++ b/init.d/net.lo.in
@@ -21,7 +21,7 @@ depend()
 	need localmount
 	after bootmisc
 	provide net
-	keyword -shutdown -jail -prefix -vserver
+	keyword -jail -prefix -vserver
 
 	case "${IFACE}" in
 		lo|lo0);;

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     58e04035ed1e2c8ab319b1f4d47ea834b62eced9
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 27 17:14:50 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Jan 27 17:19:41 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=58e04035

Cgroups: do not update mtab when mounting control groups

This is based on a patch submitted by the reporter; however, there was
another mount command which needed -n as well so it was added to the
patch.

Reported-by: Ben Kohler <bkohler <AT> gmail.com>
X-Gentoo-Bug: 400967
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=400967

---
 init.d/sysfs.in |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/init.d/sysfs.in b/init.d/sysfs.in
index 8ba988a..e692198 100644
--- a/init.d/sysfs.in
+++ b/init.d/sysfs.in
@@ -79,14 +79,14 @@ mount_cgroups()
 
 	local agent="@LIBEXECDIR@/sh/cgroup-release-agent.sh"
 	mkdir /sys/fs/cgroup/openrc
-	mount -t cgroup \
+	mount -n -t cgroup \
 		-o none,nodev,noexec,nosuid,name=openrc,release_agent="$agent" \
 		openrc /sys/fs/cgroup/openrc
 	echo 1 > /sys/fs/cgroup/openrc/notify_on_release
 	while read name hier groups enabled rest; do
 		case "${enabled}" in
 			1)	mkdir /sys/fs/cgroup/${name}
-				mount -t cgroup -o nodev,noexec,nosuid,${name} \
+				mount -n -t cgroup -o nodev,noexec,nosuid,${name} \
 					${name} /sys/fs/cgroup/${name}
 				;;
 		esac

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     de5cee2c217e5ed606db19ca1433686048303297
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 26 17:02:00 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Jan 26 17:02:00 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=de5cee2c

cgroups: make sure /sys/fs/cgroup is a mount point

We need to make sure this directory is a mount point before we add the
control groups.

Reported-by: Andrej Filipcic <andrej.filipcic <AT> ijs.si>
X-Gentoo-Bug: 400903
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=400903

---
 init.d/sysfs.in |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/init.d/sysfs.in b/init.d/sysfs.in
index 962fcfd..8ba988a 100644
--- a/init.d/sysfs.in
+++ b/init.d/sysfs.in
@@ -74,10 +74,8 @@ mount_misc()
 
 mount_cgroups()
 {
-	yesno ${rc_cgroups:-YES} || return 0
-	if [ ! -e /proc/cgroups ]; then
-		return 0
-	fi
+	yesno ${rc_cgroups:-YES} && [ -e /proc/cgroups ] && \
+		mountinfo -q /sys/fs/cgroup || return 0
 
 	local agent="@LIBEXECDIR@/sh/cgroup-release-agent.sh"
 	mkdir /sys/fs/cgroup/openrc

[gentoo-commits] proj/openrc:master commit in: init.d/

[Mike Frysinger]

commit:     3ad501218d268f9884d84079f3e2de4ac0793147
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 26 06:10:21 2012 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu Jan 26 06:12:23 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=3ad50121

bootmisc: stop deleting /etc/nologin

Baselayout-1.x used to have a DELAYLOGIN option where it would setup
/etc/nologin automatically and then delete it later on.  OpenRC did
not keep that feature, and during the rewrites, ended up just punting
it all the time.  This isn't what we intended, so drop the rm.

X-Gentoo-Bug: 400837
X-Gentoo-Bug-URL: https://bugs.gentoo.org/400837
Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

---
 init.d/bootmisc.in |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/init.d/bootmisc.in b/init.d/bootmisc.in
index c3824e0..d75cb6e 100644
--- a/init.d/bootmisc.in
+++ b/init.d/bootmisc.in
@@ -181,7 +181,6 @@ start()
 		fi
 	fi
 
-	[ -w /etc/nologin ] && rm -f /etc/nologin
 	return 0
 }
 

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     cacea4e7f3de67181d54317759e9d3361504cfe4
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 24 04:00:08 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Jan 24 04:00:08 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=cacea4e7

Cgroups: activate the openrc control group release agent

---
 init.d/sysfs.in |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/init.d/sysfs.in b/init.d/sysfs.in
index 37350ed..962fcfd 100644
--- a/init.d/sysfs.in
+++ b/init.d/sysfs.in
@@ -84,6 +84,7 @@ mount_cgroups()
 	mount -t cgroup \
 		-o none,nodev,noexec,nosuid,name=openrc,release_agent="$agent" \
 		openrc /sys/fs/cgroup/openrc
+	echo 1 > /sys/fs/cgroup/openrc/notify_on_release
 	while read name hier groups enabled rest; do
 		case "${enabled}" in
 			1)	mkdir /sys/fs/cgroup/${name}

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     ce4c9b5397662869a707cd68a373aa751e125a50
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 24 03:46:33 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Jan 24 03:46:33 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=ce4c9b53

Cgroups: create openrc control group

This creates the "openrc" control group with no subsystems attached. The
next step will be to add everything openrc starts to this group.

---
 init.d/sysfs.in |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/init.d/sysfs.in b/init.d/sysfs.in
index 7021feb..37350ed 100644
--- a/init.d/sysfs.in
+++ b/init.d/sysfs.in
@@ -79,6 +79,11 @@ mount_cgroups()
 		return 0
 	fi
 
+	local agent="@LIBEXECDIR@/sh/cgroup-release-agent.sh"
+	mkdir /sys/fs/cgroup/openrc
+	mount -t cgroup \
+		-o none,nodev,noexec,nosuid,name=openrc,release_agent="$agent" \
+		openrc /sys/fs/cgroup/openrc
 	while read name hier groups enabled rest; do
 		case "${enabled}" in
 			1)	mkdir /sys/fs/cgroup/${name}

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     f2e404ab66b2c7eb22de4f9d01a444225b1ff616
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  7 19:09:17 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Jan  7 19:09:17 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=f2e404ab

net.lo: Add the ability to find the full path of a binary

Some of the networking tools, such as iproute2, can be stored in one of
several locations. This function gives us a standard way to find these
tools.

I would like to thankRobin Johnson <robbat2 <AT> gentoo.org> for his input on
this function.

---
 init.d/net.lo.in |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/init.d/net.lo.in b/init.d/net.lo.in
index 0752400..de393bd 100644
--- a/init.d/net.lo.in
+++ b/init.d/net.lo.in
@@ -169,6 +169,18 @@ _configure_variables()
 	done
 }
 
+_which()
+{
+	local i OIFS
+	[ -z "$1" ] && return
+	OIFS="$IFS"
+	IFS=:
+	for i in $PATH ; do
+		[ -x $i/$1 ] && echo $i/$1 && break
+	done
+	IFS=$OIFS
+}
+
 _show_address()
 {
 	einfo "received address $(_get_inet_address "${IFACE}")"

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     cd52fecc4e3fa288d22a3faf6dd8b645a4bb79d1
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  6 04:28:04 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Jan  6 04:28:04 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=cd52fecc

cgroups: turn on groups by default

The control groups we create are the ones recommended by the linux
kernel, so this should be on most of the time if cgroups are enabled in
the kernel.

---
 init.d/sysfs.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/init.d/sysfs.in b/init.d/sysfs.in
index ac6934a..7021feb 100644
--- a/init.d/sysfs.in
+++ b/init.d/sysfs.in
@@ -74,7 +74,7 @@ mount_misc()
 
 mount_cgroups()
 {
-	yesno ${rc_cgroups:-NO} || return 0
+	yesno ${rc_cgroups:-YES} || return 0
 	if [ ! -e /proc/cgroups ]; then
 		return 0
 	fi

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     dbfcf232734439da3ded008af36fc1128375b437
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  5 12:55:08 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Jan  5 12:55:08 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=dbfcf232

really disable /var/{lock,run} migration to /run

This needs to be disabled until we have tmpfiles.d support. The previous
method did not disable it correctly.

---
 init.d/bootmisc.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/init.d/bootmisc.in b/init.d/bootmisc.in
index 50c5641..ee3c20c 100644
--- a/init.d/bootmisc.in
+++ b/init.d/bootmisc.in
@@ -117,7 +117,7 @@ start()
 		fi
 	done
 
-	if [ "$RC_UNAME" = Linux -a -d /run -a false ]; then
+	if [ "$RC_UNAME" = Linux -a -d /run ] && false; then
 		migrate_to_run	/var/lock /run/lock
 		migrate_to_run	/var/run /run
 	fi

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     6d5a2d5f9e5c1e3cb4c24dfc0c2ed2c118d8e64c
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 30 16:44:56 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Dec 30 16:44:56 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=6d5a2d5f

Net: do not bring down interfaces during shutdown

---
 init.d/net.lo.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/init.d/net.lo.in b/init.d/net.lo.in
index f8ec02c..0752400 100644
--- a/init.d/net.lo.in
+++ b/init.d/net.lo.in
@@ -21,7 +21,7 @@ depend()
 	need localmount
 	after bootmisc
 	provide net
-	keyword -jail -prefix -vserver
+	keyword -shutdown -jail -prefix -vserver
 
 	case "${IFACE}" in
 		lo|lo0);;

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     6c8e8e2a964d28cc3924e61a371412f97d51b771
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 29 23:27:54 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Dec 29 23:28:05 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=6c8e8e2a

disable /run migration until we have /run in baselayout

---
 init.d/bootmisc.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/init.d/bootmisc.in b/init.d/bootmisc.in
index 96455ad..50c5641 100644
--- a/init.d/bootmisc.in
+++ b/init.d/bootmisc.in
@@ -117,7 +117,7 @@ start()
 		fi
 	done
 
-	if [ "$RC_UNAME" = Linux -a -d /run ]; then
+	if [ "$RC_UNAME" = Linux -a -d /run -a false ]; then
 		migrate_to_run	/var/lock /run/lock
 		migrate_to_run	/var/run /run
 	fi

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     29da0c8bf0b377dcdc7ca489bd783d804f444437
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 29 16:01:28 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Dec 29 16:01:28 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=29da0c8b

cgroups: default the size of the tmpfs to 10 mb

---
 init.d/sysfs.in |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/init.d/sysfs.in b/init.d/sysfs.in
index 8809bda..ac6934a 100644
--- a/init.d/sysfs.in
+++ b/init.d/sysfs.in
@@ -65,8 +65,8 @@ mount_misc()
 	if [ -d /sys/fs/cgroup ] && ! mountinfo -q /sys/fs/cgroup; then
 		if grep -qs cgroup /proc/filesystems; then
 			ebegin "Mounting cgroup filesystem"
-			mount -n -t tmpfs -o  nodev,noexec,nosuid,mode=755 \
-				cgroup_root /sys/fs/cgroup
+			local opts="nodev,noexec,nosuid,mode=755,size=${rc_cgroupsize:-10m}"
+			mount -n -t tmpfs -o ${opts} cgroup_root /sys/fs/cgroup
 			eend $?
 		fi
 	fi

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     20f612080c4f392abd622eab0afcd5ff5cea05f5
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 27 23:59:39 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Dec 27 23:59:39 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=20f61208

net: use yesno to test up_before_preup

---
 init.d/net.lo.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/init.d/net.lo.in b/init.d/net.lo.in
index 02d11a8..f8ec02c 100644
--- a/init.d/net.lo.in
+++ b/init.d/net.lo.in
@@ -504,7 +504,7 @@ start()
 	# available in preup and afterwards incase the user inadvertently
 	# brings it down
 	if [ "$(command -v preup)" = "preup" ]; then
-		[ "${_up_before_preup}" = "no" ] ||  _up 2>/dev/null
+		yesno "${_up_before_preup:-yes}" && _up 2>/dev/null
 		ebegin "Running preup"
 		eindent
 		preup || return 1

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     f6dc3d5ae91ff6a660cf71a92d4a3a120b1180a4
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 20 07:42:36 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Dec 20 07:42:36 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=f6dc3d5a

cgroups: always mount the tmpfs on /sys/fs/cgroup

X-Gentoo-Bug:395079
X-Gentoo-Bug-URL:https://bugs.gentoo.org/show_bug.cgi?id=395079

---
 init.d/sysfs.in |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/init.d/sysfs.in b/init.d/sysfs.in
index a709e5d..8809bda 100644
--- a/init.d/sysfs.in
+++ b/init.d/sysfs.in
@@ -60,15 +60,8 @@ mount_misc()
 			eend $?
 		fi
 	fi
-}
-
-mount_cgroups()
-{
-	yesno ${rc_cgroups:-NO} || return 0
-	if [ ! -e /proc/cgroups ]; then
-		return 0
-	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"
@@ -77,6 +70,14 @@ mount_cgroups()
 			eend $?
 		fi
 	fi
+}
+
+mount_cgroups()
+{
+	yesno ${rc_cgroups:-NO} || return 0
+	if [ ! -e /proc/cgroups ]; then
+		return 0
+	fi
 
 	while read name hier groups enabled rest; do
 		case "${enabled}" in

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     461c69acdbf89b029554312392279753127112ee
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 18 19:33:27 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Dec 18 19:33:27 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=461c69ac

cgroups: mount cgroups suggested by the kernel documentation

The linux kernel documentation suggests mounting a separate cgroup
hierarchy for each subsystem you want to control/monitor. This changes
the cgroups mounting code to do this.

---
 init.d/sysfs.in |   46 ++++++++++++++++++++++++++++++----------------
 1 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/init.d/sysfs.in b/init.d/sysfs.in
index d57c388..cb44b30 100644
--- a/init.d/sysfs.in
+++ b/init.d/sysfs.in
@@ -60,27 +60,36 @@ mount_misc()
 			eend $?
 		fi
 	fi
+}
 
-	# Setup Kernel Support for cgroup
-	if [ -d /sys/fs/cgroup ]; then
-		if grep -qs cgroup /proc/filesystems && \
-			! mountinfo -q /sys/fs/cgroup; then
+mount_cgroups()
+{
+	if [ ! -e /proc/cgroups ]; then
+		return 0
+	fi
+
+	if [ -d /sys/fs/cgroup ] && ! mountinfo -q /sys/fs/cgroup; then
+		if grep -qs cgroup /proc/filesystems; then
 			ebegin "Mounting cgroup filesystem"
-			mount -n -t tmpfs -o  nodev,noexec,nosuid \
-				cgroup /sys/fs/cgroup
+			mount -n -t tmpfs -o  nodev,noexec,nosuid,mode=755 \
+				cgroup_root /sys/fs/cgroup
 			eend $?
 		fi
-		if ! mountinfo -q /sys/fs/cgroup/openrc; then
-			ebegin "creating openrc control group"
-			mkdir /sys/fs/cgroup/openrc
-			mount -n -t cgroup -o  nodev,noexec,nosuid \
-				openrc /sys/fs/cgroup/openrc
-			echo 1 > /sys/fs/cgroup/openrc/notify_on_release
-			echo @LIBEXECDIR@/sh/cgroup-release-agent.sh \
-				> /sys/fs/cgroup/openrc/release_agent
-			eend
-		fi
 	fi
+
+	while read name hier groups enabled rest; do
+		case "${enabled}" in
+			1)	mkdir /sys/fs/cgroup/${name}
+				mount -t cgroup -o nodev,noexec,nosuid,${name} \
+					${name} /sys/fs/cgroup/${name}
+				;;
+		esac
+	done < /proc/cgroups
+
+	# mkdir /sys/fs/cgroup/openrc
+	# mount -t cgroup \
+	# -o nodev,noexec,nosuid,name=openrc \
+	# openrc /sys/fs/cgroup/openrc
 }
 
 start()
@@ -90,6 +99,11 @@ start()
 	retval=$?
 	if [ $retval -eq 0 ]; then
 		mount_misc
+		retval=$?
+	fi
+	if [ $retval -eq 0 ]; then
+		mount_cgroups
+		retval=$?
 	fi
 	return $retval
 }

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     46b96eb80d972db7d9d27d9635191c42016d6d96
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 12 17:39:02 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Dec 13 01:46:03 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=46b96eb8

Network: start interfaces after dbus

This is needed to allow auto-connect at boot.

Reported-by: David J Cozatt <ygdrasil <AT> comcast.net>
X-Gentoo-Bug: 390955
X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=390955

---
 init.d/net.lo.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/init.d/net.lo.in b/init.d/net.lo.in
index 2181657..ae07b52 100644
--- a/init.d/net.lo.in
+++ b/init.d/net.lo.in
@@ -25,7 +25,7 @@ depend()
 
 	case "${IFACE}" in
 		lo|lo0);;
-		*) after net.lo net.lo0;;
+		*) after net.lo net.lo0 dbus;;
 	esac
 
 	if [ "$(command -v "depend_${IFVAR}")" = "depend_${IFVAR}" ]; then

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     b628481701d1f240ff8b2411dc041db332578a8c
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 28 05:29:22 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Nov 28 05:29:22 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=b6284817

migrate-run: fix ln calls and migrate directories separately

This is based on a patch submitted by AlphatPC <AT> gmail.com.

Reported-by: AlphatPC <AT> gmail.com
X-Gentoo-Bug: 391945
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=391945

---
 init.d/migrate-run.in |   19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/init.d/migrate-run.in b/init.d/migrate-run.in
index 4eec687..02a884d 100644
--- a/init.d/migrate-run.in
+++ b/init.d/migrate-run.in
@@ -19,12 +19,19 @@ start()
 stop()
 {
 	einfo "completing /var/run and /var/lock migration."
-	if [ -d /run -a ! -L /var/lock -a ! -L /var/run ]; then
-		ebegin "Migrating /var/lock and /var/run to /run"
-		rm -rf /var/lock /var/run
-		ln -s /var/lock /run/lock
-		ln -s /var/run /run
-		eend 0
+	if [ -d /run ]; then
+		if [ ! -L /var/lock ]; then
+			ebegin "Migrating /var/lock to /run"
+			rm -rf /var/lock
+			ln -s /run/lock /var/lock
+			eend 0
+		fi
+		if [ ! -L /var/run ]; then
+			ebegin "Migrating /var/run to /run"
+			rm -rf /var/run
+			ln -s /run /var/run
+			eend 0
+		fi
 	fi
 	return 0
 }

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     ab01a74405fc316a15549aeda201521ec694981f
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 27 02:57:14 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Nov 27 02:57:14 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=ab01a744

Make migrate-run more verbose

---
 init.d/migrate-run.in |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/init.d/migrate-run.in b/init.d/migrate-run.in
index 544acb0..4eec687 100644
--- a/init.d/migrate-run.in
+++ b/init.d/migrate-run.in
@@ -12,11 +12,13 @@ depend()
 
 start()
 {
+	einfo "starting $RC_SVCNAME"
 	return 0
 }
 
 stop()
 {
+	einfo "completing /var/run and /var/lock migration."
 	if [ -d /run -a ! -L /var/lock -a ! -L /var/run ]; then
 		ebegin "Migrating /var/lock and /var/run to /run"
 		rm -rf /var/lock /var/run

[gentoo-commits] proj/openrc:master commit in: init.d/

[Mike Frysinger]

commit:     3baca9a35c4f6e2bd910d5bc54c0008c13b0501a
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 26 08:21:21 2011 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sat Nov 26 08:21:21 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=3baca9a3

fsck: fix typo in fsck mount point support

Previous commit e3b39a677b535bc2 missed adding a "[" to one of the tests.

Reported-by: Torsten Veller <tove <AT> gentoo.org>
x-Gentoo-Bug: 391941
x-Gentoo-Bug-URL: http://bugs.gentoo.org/391941
Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

---
 init.d/fsck.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/init.d/fsck.in b/init.d/fsck.in
index 03b2939..049caad 100644
--- a/init.d/fsck.in
+++ b/init.d/fsck.in
@@ -48,7 +48,7 @@ start()
 
 	if [ -n "$fsck_passno" ]; then
 		check_extra="[passno $fsck_passno] $check_extra"
-		if -n "$fsck_mnt" ]; then
+		if [ -n "$fsck_mnt" ]; then
 			eerror "Only 1 of fsck_passno and fsck_mnt must be set!"
 			return 1
 		fi

[gentoo-commits] proj/openrc:master commit in: init.d/

[Mike Frysinger]

commit:     cc45abb77b195ecd778e578cc716b90e9612e48a
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 23 18:17:20 2011 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Nov 23 18:17:20 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=cc45abb7

net.lo: fix typo in previous math commit

x-Gentoo-Bug: 391671
x-Gentoo-Bug-URL: http://bugs.gentoo.org/391671
Reported-by: Duncan <1i5t5.duncan <AT> cox.net>
Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

---
 init.d/net.lo.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/init.d/net.lo.in b/init.d/net.lo.in
index d647f31..2181657 100644
--- a/init.d/net.lo.in
+++ b/init.d/net.lo.in
@@ -144,7 +144,7 @@ _netmask2cidr()
 	local i= len=
 	local IFS=.
 	for i in $1; do
-		while [ i -ne 0 ]; do
+		while [ ${i} -ne 0 ]; do
 			: $(( len += i % 2 ))
 			: $(( i >>= 1 ))
 		done

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     b1da4dcb9913d6d28fa39c60dcf9c867c39486ef
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 25 21:05:00 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Oct 26 15:35:01 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=b1da4dcb

Add support for automounting configfs and cgroupfs

Signed-off-by: Alexey Shvetsov <alexxy <AT> gentoo.org>

---
 init.d/sysfs.in |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/init.d/sysfs.in b/init.d/sysfs.in
index ba25090..257f314 100644
--- a/init.d/sysfs.in
+++ b/init.d/sysfs.in
@@ -50,6 +50,26 @@ mount_misc()
 			eend $?
 		fi
 	fi
+
+	# Setup Kernel Support for configfs
+	if [ -d /sys/kernel/config ] && ! mountinfo -q /sys/kernel/config; then
+		if grep -qs configfs /proc/filesystems; then
+			ebegin "Mounting config filesystem"
+			mount -n -t configfs -o  nodev,noexec,nosuid \
+				configfs /sys/kernel/config
+			eend $?
+		fi
+	fi
+
+	# Setup Kernel Support for cgroup
+	if [ -d /sys/fs/cgroup ] && ! mountinfo -q /sys/fs/cgroup; then
+		if grep -qs cgroup /proc/filesystems; then
+			ebegin "Mounting cgroup filesystem"
+			mount -n -t cgroup -o  nodev,noexec,nosuid \
+				cgroup /sys/fs/cgroup
+			eend $?
+		fi
+	fi
 }
 
 start()

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     917553475227bdeab70f19edb7a4ea549a1abe8f
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  2 17:21:17 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Oct  2 17:21:17 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=91755347

Small style change

---
 init.d/net.lo.in |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/init.d/net.lo.in b/init.d/net.lo.in
index 9b6bf64..66e1945 100644
--- a/init.d/net.lo.in
+++ b/init.d/net.lo.in
@@ -41,7 +41,9 @@ depend()
 	done
 }
 
-_array_helper() {
+# Support bash arrays - sigh
+_array_helper()
+{
 	local _a=
 
 	eval _a=\$$1
@@ -50,7 +52,6 @@ _array_helper() {
 	[ -n "${_a}" ] && printf "%s\n" "${_a}"
 }
 
-# Support bash arrays - sigh
 _get_array()
 {
 	local _a=

[gentoo-commits] proj/openrc:master commit in: init.d/

[Christian Ruppert]

commit:     930f4021b1904b9c46c41c70b99d6e0620a1b59d
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 20 22:21:43 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue Sep 20 22:21:43 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=930f4021

Add a new helper functions for _{flatten,get}_array

A new helper function (_array_helper) since both, the _flatten_array and
_get_array function share partially the same code.
We also reduce multiple whitespace to a single space, remove leading newlines
as well as skipping "empty" lines.

This makes the data returned by _{flatten,get}_array much nicer than before.
It also fixes bug 366677 where net-tools having trouble with the whitespace
mentioned above. iproute2 was not affected.

Reported-by: Andrew Maltsev <am <AT> ejelta.com>
X-Gentoo-Bug: 366677
X-Gentoo-Bug-URL: https://bugs.gentoo.org/366677

---
 init.d/net.lo.in |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/init.d/net.lo.in b/init.d/net.lo.in
index 2f052ca..9b6bf64 100644
--- a/init.d/net.lo.in
+++ b/init.d/net.lo.in
@@ -41,6 +41,15 @@ depend()
 	done
 }
 
+_array_helper() {
+	local _a=
+
+	eval _a=\$$1
+	_a=$(echo "${_a}" | sed -e 's:^[[:space:]]*::' -e 's:[[:space:]]*$::' -e '/^$/d' -e 's:[[:space:]]\{1,\}: :g')
+
+	[ -n "${_a}" ] && printf "%s\n" "${_a}"
+}
+
 # Support bash arrays - sigh
 _get_array()
 {
@@ -60,10 +69,7 @@ _get_array()
 		esac
 	fi
 
-	eval _a=\$$1
-	printf "%s" "${_a}"
-	printf "\n"
-	[ -n "${_a}" ]
+	_array_helper $1
 }
 
 # Flatten bash arrays to simple strings
@@ -84,10 +90,7 @@ _flatten_array()
 		esac
 	fi
 
-	eval _a=\$$1
-	printf "%s" "${_a}"
-	printf "\n"
-	[ -n "${_a}" ]
+	_array_helper $1
 }
 
 _wait_for_carrier()

[gentoo-commits] proj/openrc:master commit in: init.d/

[Mike Frysinger]

commit:     fb485366e68d2b4bfb868693b07a57969a1faa90
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 18 19:50:12 2011 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sun Sep 18 20:01:28 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=fb485366

procfs: simplify the binfmt_misc mount check

Replace the `mountinfo` exec with a file test of the register file
which we rely on later anyways.

Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

---
 init.d/procfs.in |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/init.d/procfs.in b/init.d/procfs.in
index 645311f..8167ff9 100644
--- a/init.d/procfs.in
+++ b/init.d/procfs.in
@@ -38,8 +38,7 @@ start()
 	fi
 
 	# Setup Kernel Support for miscellaneous Binary Formats
-	if [ -d /proc/sys/fs/binfmt_misc ] \
-		&& ! mountinfo -q /proc/sys/fs/binfmt_misc; then
+	if [ -d /proc/sys/fs/binfmt_misc -a ! -e /proc/sys/fs/binfmt_misc/register ]; then
 		if grep -qs binfmt_misc /proc/filesystems; then
 			ebegin "Mounting misc binary format filesystem"
 			mount -t binfmt_misc -o nodev,noexec,nosuid \

[gentoo-commits] proj/openrc:master commit in: init.d/

[Mike Frysinger]

commit:     f52dca69849b0aef2a4644f106c152c0e456f989
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 18 19:47:16 2011 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sun Sep 18 20:01:28 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=f52dca69

procfs: drop nfsd mounting

The dedicated nfs init.d script takes care of mounting this when
necessary, and we want it there since mounting it isn't terribly
useful if you can't actually start up the nfs daemons (which the
nfs-utils package provides).

Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

---
 init.d/procfs.in |   10 ----------
 1 files changed, 0 insertions(+), 10 deletions(-)

diff --git a/init.d/procfs.in b/init.d/procfs.in
index d86814c..645311f 100644
--- a/init.d/procfs.in
+++ b/init.d/procfs.in
@@ -37,16 +37,6 @@ start()
 		fi
 	fi
 
-	# Setup Kernel Support for the NFS daemon status
-	if [ -d /proc/fs/nfsd ] && ! mountinfo -q /proc/fs/nfsd; then
-		if grep -qs nfsd /proc/filesystems; then
-			ebegin "Mounting NFS filesystem"
-			mount -t nfsd -o nodev,noexec,nosuid \
-				nfsd /proc/fs/nfsd
-			eend $?
-		fi
-	fi
-
 	# Setup Kernel Support for miscellaneous Binary Formats
 	if [ -d /proc/sys/fs/binfmt_misc ] \
 		&& ! mountinfo -q /proc/sys/fs/binfmt_misc; then

[gentoo-commits] proj/openrc:master commit in: init.d/

[Mike Frysinger]

commit:     47d305d2af41a6105824bd704a0f0f958b35871d
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 18 19:29:01 2011 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sun Sep 18 20:01:26 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=47d305d2

procfs: load config files from binfmt.d into /proc/sys/fs/binfmt_misc/register

This is a KISS version.  Let's see where we go from here in terms of
complexity.  Maybe nowhere!

X-Gentoo-Bug: 382723
X-Gentoo-Bug-URL: https://bugs.gentoo.org/382723
Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

---
 init.d/procfs.in |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/init.d/procfs.in b/init.d/procfs.in
index 43ba45a..d86814c 100644
--- a/init.d/procfs.in
+++ b/init.d/procfs.in
@@ -54,7 +54,18 @@ start()
 			ebegin "Mounting misc binary format filesystem"
 			mount -t binfmt_misc -o nodev,noexec,nosuid \
 				binfmt_misc /proc/sys/fs/binfmt_misc
-			eend $?
+			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
 

[gentoo-commits] proj/openrc:master commit in: init.d/

[Christian Ruppert]

commit:     2d180551ef5f2541e22a5eaf90b4efc7aadba914
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 11 13:12:54 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Sun Sep 11 16:51:29 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=2d180551

Fix regex pattern for umounts during shutdown

This patch fixes the regex pattern for /lib -> /lib(32|64)?
as well as the pattern for RC_SVCDIR if it contains /lib(32|64)?/.
This fixes bug 381783.

X-Gentoo-Bug: 381783
X-Gentoo-Bug-URL: https://bugs.gentoo.org/381783

---
 init.d/localmount.in |   10 +++++++---
 init.d/mount-ro.in   |   10 +++++++---
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/init.d/localmount.in b/init.d/localmount.in
index 166ee77..3fbc071 100644
--- a/init.d/localmount.in
+++ b/init.d/localmount.in
@@ -34,8 +34,12 @@ start()
 stop()
 {
 	# We never unmount / or /dev or $RC_SVCDIR
-	local x= no_umounts_r="/|/dev|/dev/.*|${RC_SVCDIR}"
-	no_umounts_r="${no_umounts_r}|/bin|/sbin|/lib|/libexec"
+
+	# Bug 381783
+	local rc_svcdir=$(echo $RC_SVCDIR | sed 's:/lib\(32\|64\)\?/:/lib(32|64)?/:g')
+
+	local x= no_umounts_r="/|/dev|/dev/.*|${rc_svcdir}"
+	no_umounts_r="${no_umounts_r}|/bin|/sbin|/lib(32|64)?|/libexec"
 	# RC_NO_UMOUNTS is an env var that can be set by plugins
 	local IFS="$IFS:"
 	for x in $no_umounts $RC_NO_UMOUNTS; do
@@ -69,7 +73,7 @@ stop()
 	done
 	[ -n "$fs" ] && fs="^($fs)$"
 	do_unmount umount --skip-point-regex "$no_umounts_r" \
-		${fs:+--skip-fstype-regex} $fs --nonetdev
+		"${fs:+--skip-fstype-regex}" $fs --nonetdev
 	eoutdent
 
 	return 0

diff --git a/init.d/mount-ro.in b/init.d/mount-ro.in
index 7049d4b..79b2e02 100644
--- a/init.d/mount-ro.in
+++ b/init.d/mount-ro.in
@@ -19,8 +19,12 @@ start()
 	# We need the do_unmount function
 	. "$RC_LIBEXECDIR"/sh/rc-mount.sh
 	eindent
-	local m="/dev|/dev/.*|/proc|/proc.*|/sys|/sys/.*|${RC_SVCDIR}" x= fs=
-	m="$m|/bin|/sbin|/lib|/libexec"
+
+	# Bug 381783
+	local rc_svcdir=$(echo $RC_SVCDIR | sed 's:/lib\(32\|64\)\?/:/lib(32|64)?/:g')
+
+	local m="/dev|/dev/.*|/proc|/proc.*|/sys|/sys/.*|${rc_svcdir}" x= fs=
+	m="$m|/bin|/sbin|/lib(32|64)?|/libexec"
 	# RC_NO_UMOUNTS is an env var that can be set by plugins
 	local IFS="$IFS:"
 	for x in $no_umounts $RC_NO_UMOUNTS; do
@@ -34,7 +38,7 @@ start()
 	[ -n "$fs" ] && fs="^($fs)$"
 	do_unmount "umount -r" \
 		--skip-point-regex "$m" \
-		${fs:+--skip-fstype-regex} $fs --nonetdev
+		"${fs:+--skip-fstype-regex}" $fs --nonetdev
 	eoutdent
 	eend $?
 }

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     7a6dbedf38e1eeffcbb36b7d77a67c56566d0409
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Fri Sep  2 06:56:41 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Sep  2 06:56:41 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=7a6dbedf

Mtab: fix typo

Reported-By: Helmuth Schmelzer <des-colo <AT> hotmail.com>
X-Gentoo-Bug: 381503
X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=381503

---
 init.d/mtab.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/init.d/mtab.in b/init.d/mtab.in
index 620fe77..0be5adb 100644
--- a/init.d/mtab.in
+++ b/init.d/mtab.in
@@ -12,7 +12,7 @@ depend()
 
 start()
 {
-	if [ -l /etc/mtab ]
+	if [ -L /etc/mtab ]
 	then
 		einfo "Skipping mtab update (mtab is a symbolic link)"
 		return 0

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     a029dee59b22bdfb30fefb90c9409be813c1f824
Author:     Yun Zheng Hu <hu <AT> fox-it <DOT> com>
AuthorDate: Sat Aug 20 19:02:04 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Aug 20 19:10:07 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=a029dee5

Do not print "null" or "noop" when configuring an interface

Note by william hubbs:

I modified the patch to compare "null" and "noop" with $1 instead of
${config}.

Reported-by:    Yun Zheng Hu <hu <AT> fox-it.com>
X-Gentoo-Bug: 379577
X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=379577

---
 init.d/net.lo.in |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/init.d/net.lo.in b/init.d/net.lo.in
index 5969bee..2f052ca 100644
--- a/init.d/net.lo.in
+++ b/init.d/net.lo.in
@@ -545,7 +545,9 @@ start()
 		[ -z "${config}" ] && break
 
 		set -- ${config}
-		ebegin "$1"
+		if [ "$1" != "null" -a "$1" != "noop" ]; then
+			ebegin "$1"
+		fi
 		eindent
 		case "$1" in
 			noop)

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     2330978300cd3a677e2a6b70ddc8c2825af03920
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 20 17:38:05 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Aug 20 17:42:24 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=23309783

Do not update mtab if it is a symbolic link

Reported-by: <junkmailnotread <AT> yahoo.com>
X-Gentoo-Bug: 370037
X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=370037

---
 init.d/mtab.in |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/init.d/mtab.in b/init.d/mtab.in
index 23a5e7d..620fe77 100644
--- a/init.d/mtab.in
+++ b/init.d/mtab.in
@@ -12,10 +12,9 @@ depend()
 
 start()
 {
-	# /etc/mtab could be a symlink to a location in /proc
-	if readlink -f /etc/mtab | grep -sq '^/proc/\(self\|[0-9]\+\)/mounts$'
+	if [ -l /etc/mtab ]
 	then
-		einfo "Skipping mtab update (link points to location in /proc)"
+		einfo "Skipping mtab update (mtab is a symbolic link)"
 		return 0
 	fi
 

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     3688c851636c9458eb88c7469bb374e5f6d0f9de
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 28 14:12:35 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Jul 28 14:21:29 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=3688c851

swclock: select a default reference file

If $RC_SVCDIR/shutdowntime does not exist, we need a default reference
file. It is safe to use @PREFIX@/sbin/runscript for this purpose.

Reported-By: Robin H. Johnson <robbat2 <AT> gentoo.org>
X-Gentoo-Bug: 376249
X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=376249

---
 init.d/swclock.in |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/init.d/swclock.in b/init.d/swclock.in
index 75f1c79..077f258 100644
--- a/init.d/swclock.in
+++ b/init.d/swclock.in
@@ -16,7 +16,9 @@ depend()
 start()
 {
 	ebegin "Setting the local clock based on last shutdown time"
-	swclock --warn
+	if ! swclock 2> /dev/null; then
+	swclock --warn @PREFIX@/sbin/runscript
+	fi
 	eend $?
 }
 

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     863ef36011144a8907359bddc3fe705e5185fd1b
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 23 23:25:55 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Jul 26 05:45:22 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=863ef360

mtab: fix test for a link to a location in /proc

/etc/mtab can be a link to a file in /proc. If it is, we should not
attempt to update /etc/mtab.

The original test used "! -w" as part of the test.  This does not
work since everything is writeable by root.

Thanks to Robin Johnson for the suggestion of using readlink -f and the
regular expression.

Reported-By: junkmailnotread <AT> yahoo.com
X-Gentoo-Bug: 370037
X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=370037

---
 init.d/mtab.in |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/init.d/mtab.in b/init.d/mtab.in
index e741bc1..23a5e7d 100644
--- a/init.d/mtab.in
+++ b/init.d/mtab.in
@@ -12,9 +12,10 @@ depend()
 
 start()
 {
-	# /etc/mtab could be a symlink to /proc/mounts
-	if [ ! -w /etc/mtab -a -L /etc/mtab ]; then
-		einfo "Skipping mtab update (non writeable symlink)"
+	# /etc/mtab could be a symlink to a location in /proc
+	if readlink -f /etc/mtab | grep -sq '^/proc/\(self\|[0-9]\+\)/mounts$'
+	then
+		einfo "Skipping mtab update (link points to location in /proc)"
 		return 0
 	fi
 

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     05c2d68192b80ec6177a01db6fe96fbaaf1b813f
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 23 21:53:16 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Jul 23 21:53:16 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=05c2d681

Mtab: fix typo

---
 init.d/mtab.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/init.d/mtab.in b/init.d/mtab.in
index cbe705b..e741bc1 100644
--- a/init.d/mtab.in
+++ b/init.d/mtab.in
@@ -14,7 +14,7 @@ start()
 {
 	# /etc/mtab could be a symlink to /proc/mounts
 	if [ ! -w /etc/mtab -a -L /etc/mtab ]; then
-		eeinfo "Skipping mtab update (non writeable symlink)"
+		einfo "Skipping mtab update (non writeable symlink)"
 		return 0
 	fi
 

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     e3b02abd7abe0cd6265cb56324018b6db003f293
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 12 20:29:04 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Jul 14 06:26:29 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=e3b02abd

Add warnings for the use of bash arrays

Currently, we allow the use of bash arrays for some configuration settings.
This is undocumented, so I want to remove the support from openrc.

The first phase of this removal will be this commit which adds warnings
to encourage people not to use bash arrays.

X-Gentoo-Bug: 374875
X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=374875

---
 init.d/net.lo.in |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/init.d/net.lo.in b/init.d/net.lo.in
index a1ec7c3..5969bee 100644
--- a/init.d/net.lo.in
+++ b/init.d/net.lo.in
@@ -48,6 +48,9 @@ _get_array()
 	if [ -n "${BASH}" ]; then
 		case "$(declare -p "$1" 2>/dev/null)" in
 			"declare -a "*)
+				ewarn "You are using a bash array for $1."
+				ewarn "This feature will be removed in the future."
+				ewarn "Please see net.example for the correct format for $1."
 				eval "set -- \"\${$1[@]}\""
 				for _a; do
 					printf "%s\n" "${_a}"
@@ -69,6 +72,9 @@ _flatten_array()
 	if [ -n "${BASH}" ]; then
 		case "$(declare -p "$1" 2>/dev/null)" in
 			"declare -a "*)
+				ewarn "You are using a bash array for $1."
+				ewarn "This feature will be removed in the future."
+				ewarn "Please see net.example for the correct format for $1."
 				eval "set -- \"\${$1[@]}\""
 				for x; do
 					printf "'%s' " "$(printf "$x" | sed "s:':'\\\'':g")"

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     0c7032840b746bc5f1e5f6cb90ad50b5da0a4fce
Author:     Kirill Elagin <kirelagin <AT> gmail <DOT> com>
AuthorDate: Thu Jul  7 16:51:39 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Jul  7 17:23:58 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=0c703284

save and restore IFS correctly

X-Gentoo-Bug: 371141
X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=371141

---
 init.d/localmount.in |    8 +-------
 init.d/mount-ro.in   |    8 +-------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/init.d/localmount.in b/init.d/localmount.in
index efbddc7..166ee77 100644
--- a/init.d/localmount.in
+++ b/init.d/localmount.in
@@ -37,16 +37,10 @@ stop()
 	local x= no_umounts_r="/|/dev|/dev/.*|${RC_SVCDIR}"
 	no_umounts_r="${no_umounts_r}|/bin|/sbin|/lib|/libexec"
 	# RC_NO_UMOUNTS is an env var that can be set by plugins
-	local OIFS=$IFS SIFS=${IFS-y}
-	IFS=$IFS:
+	local IFS="$IFS:"
 	for x in $no_umounts $RC_NO_UMOUNTS; do
 		no_umounts_r="$no_umounts_r|$x"
 	done
-	if [ "$SIFS" = y ]; then
-		IFS=$OIFS
-	else
-		unset IFS
-	fi
 
 	if [ "$RC_UNAME" = Linux ]; then
 		no_umounts_r="$no_umounts_r|/proc|/proc/.*|/run|/sys|/sys/.*"

diff --git a/init.d/mount-ro.in b/init.d/mount-ro.in
index dc2a098..7049d4b 100644
--- a/init.d/mount-ro.in
+++ b/init.d/mount-ro.in
@@ -22,16 +22,10 @@ start()
 	local m="/dev|/dev/.*|/proc|/proc.*|/sys|/sys/.*|${RC_SVCDIR}" x= fs=
 	m="$m|/bin|/sbin|/lib|/libexec"
 	# RC_NO_UMOUNTS is an env var that can be set by plugins
-	local OIFS=$IFS SIFS=${IFS-y} IFS=$IFS
-	IFS=$IFS:
+	local IFS="$IFS:"
 	for x in $no_umounts $RC_NO_UMOUNTS; do
 		m="$m|$x"
 	done
-	if [ "$SIFS" = y ]; then
-		IFS=$OIFS
-	else
-		unset IFS
-	fi
 	m="^($m)$"
 	fs=
 	for x in $net_fs_list $extra_net_fs_list; do

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     2050e67911ee21651da43c578b93d49cee379201
Author:     Kirill Elagin <kirelagin <AT> gmail <DOT> com>
AuthorDate: Fri Jun 24 16:59:14 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Jun 24 17:13:28 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=2050e679

localmount: make OIFS and CIFS local in stop function

X-Gentoo-Bug: 371141
X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=371141

---
 init.d/localmount.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/init.d/localmount.in b/init.d/localmount.in
index b4f7346..3b7ba44 100644
--- a/init.d/localmount.in
+++ b/init.d/localmount.in
@@ -37,7 +37,7 @@ stop()
 	local x= no_umounts_r="/|/dev|/dev/.*|${RC_SVCDIR}"
 	no_umounts_r="${no_umounts_r}|/bin|/sbin|/lib|/libexec"
 	# RC_NO_UMOUNTS is an env var that can be set by plugins
-	OIFS=$IFS SIFS=${IFS-y}
+	local OIFS=$IFS SIFS=${IFS-y}
 	IFS=$IFS:
 	for x in $no_umounts $RC_NO_UMOUNTS; do
 		no_umounts_r="$no_umounts_r|$x"

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     8947c00204e771a669433708de7aa740dca9d16c
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 18 03:13:14 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Jun 18 15:06:41 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=8947c002

sysctl: do not make unknown keys fatal

If unknown keys are found, currently sysctl would add all of its valid
settings, but then leave itself marked as "stopped".  Since this is not
really what we want, make unknown keys a non-fatal error.

Reported-by: Christian Ruppert <idl0r <AT> gentoo.org>
Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

---
 init.d/sysctl.Linux.in |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/init.d/sysctl.Linux.in b/init.d/sysctl.Linux.in
index 83e7536..19b4942 100644
--- a/init.d/sysctl.Linux.in
+++ b/init.d/sysctl.Linux.in
@@ -10,16 +10,25 @@ depend()
 
 start()
 {
-	local conf= retval=0
+	local conf= retval=0 err errs
+
 	ebegin "Configuring kernel parameters"
 	eindent
+
 	for conf in /etc/sysctl.d/*.conf /etc/sysctl.conf; do
 		if [ -r "$conf" ]; then
 			vebegin "applying $conf"
-			sysctl -p "$conf" >/dev/null
+			if ! err=$(sysctl -q -p "$conf" 2>&1) ; then
+				errs="${errs} ${err}"
+				sysctl -q -e -p "${conf}"
+			fi
 			veend $? || retval=1
 		fi
 	done
+
 	eoutdent
-	eend $retval "Some errors were encountered"
+	if [ ${retval} -eq 0 ] && [ -n "${errs}" ] ; then
+		ewarn "Unknown keys:${errs}"
+	fi
+	eend $retval "Some errors were encountered: ${errs}"
 }

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     a2c8e5ce50ca88a8d73f828453ca67f00fff1081
Author:     Diego Elio Pettenò <flameeyes <AT> gmail <DOT> com>
AuthorDate: Thu Jun  2 14:06:27 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Jun  2 16:34:13 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=a2c8e5ce

Don't set hostname on containers.

LXC already provides a means to set the utsname/hostname of the system, so
avoid overriding the user's configuration through hostname here.

Signed-off-by: Diego Elio Pettenò <flameeyes <AT> gmail.com>

---
 init.d/hostname.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/init.d/hostname.in b/init.d/hostname.in
index a7c54c8..d859ee8 100644
--- a/init.d/hostname.in
+++ b/init.d/hostname.in
@@ -5,7 +5,7 @@
 description="Sets the hostname of the machine."
 
 depend() {
-	keyword -prefix
+	keyword -prefix -lxc
 }
 
 start()

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     8202e7dce4065b79c272dc11941b371a9c4f99fc
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Thu Apr 21 18:02:49 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Apr 21 18:02:49 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=8202e7dc

add back the eend command in start/stop for local service

This was added back due to a user request. It will always be on a line
of its ownbecause I'm considering adding more verbose info messages to
local that show when each service is run if local is run with the -v
option.

X-Gentoo-Bug: 363343
X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=363343

---
 init.d/local.in |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/init.d/local.in b/init.d/local.in
index 4db492e..17a4c86 100644
--- a/init.d/local.in
+++ b/init.d/local.in
@@ -27,7 +27,7 @@ start()
 		local_start
 	fi
 
-	return 0
+	eend 0
 }
 
 stop()
@@ -47,5 +47,5 @@ stop()
 		local_stop
 	fi
 
-	return 0
+	eend 0
 }

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     ede4d1cd60ca7ce283095833b3ad545a6364e178
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 18 15:28:47 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Apr 18 20:26:19 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=ede4d1cd

Don't unmount /run on shutdown

This is needed so that udev will stop properly on shutdown.

X-Gentoo-Bug: 363971
X-Gentoo-Bug-Url: http://bugs.gentoo.org/show_bug.cgi?id=363971

---
 init.d/localmount.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/init.d/localmount.in b/init.d/localmount.in
index e2ea801..b4f7346 100644
--- a/init.d/localmount.in
+++ b/init.d/localmount.in
@@ -49,7 +49,7 @@ stop()
 	fi
 
 	if [ "$RC_UNAME" = Linux ]; then
-		no_umounts_r="$no_umounts_r|/proc|/proc/.*|/sys|/sys/.*"
+		no_umounts_r="$no_umounts_r|/proc|/proc/.*|/run|/sys|/sys/.*"
 	fi
 	no_umounts_r="^($no_umounts_r)$"
 

[gentoo-commits] proj/openrc:master commit in: init.d/

[Anthony G. Basile]

commit:     ac56ab7f6df616a7a40878b59f647b8042108def
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 17 13:12:20 2011 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Apr 17 13:12:20 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=ac56ab7f

Check for /sys/module/usbcore before modprobe usbcore

The use of /proc/bus/usb to mount usbfs has been deprecated, but
the option is still available in the kernel.  The new approach is
to use /sys.  We should not modprobe usbcore if either /proc/bus/usb
or /sys/module/usbcore exist.

X-Gentoo-Bug: 363551
X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=363551
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>

---
 init.d/procfs.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/init.d/procfs.in b/init.d/procfs.in
index c5331b8..049fade 100644
--- a/init.d/procfs.in
+++ b/init.d/procfs.in
@@ -14,7 +14,7 @@ depend()
 start()
 {
 	# Make sure we insert usbcore if it's a module
-	if [ -f /proc/modules -a ! -d /proc/bus/usb ]; then
+	if [ -f /proc/modules -a ! -d /sys/module/usbcore -a ! -d /proc/bus/usb ]; then
 		modprobe -q usbcore
 	fi
 

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     75722dac4ed11ea90f4eeda2095ed75293ec3586
Author:     Sebastian Thorarensen <indigo176 <AT> blinkenshell <DOT> org>
AuthorDate: Thu Apr 14 20:21:02 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Apr 14 20:21:02 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=75722dac

termencoding should run after bootmisc

This change is necessary so that the unicode flag is not erased by
bootmisc.

X-Gentoo-Bug: 363611
X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=363611

---
 init.d/termencoding.in |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/init.d/termencoding.in b/init.d/termencoding.in
index 5bb417b..e022e0d 100644
--- a/init.d/termencoding.in
+++ b/init.d/termencoding.in
@@ -11,6 +11,7 @@ depend()
 {
 	keyword -openvz -prefix -uml -vserver -xenu
 	need root
+	after bootmisc
 }
 
 start()

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     03cd55aa19c53801ee5ab2ff816a8abf088fff52
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 11 20:33:41 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Apr 11 20:33:41 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=03cd55aa

start loopback interface before mtab

X-Gentoo-Bug: 292894
X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=292894

---
 init.d/net.lo.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/init.d/net.lo.in b/init.d/net.lo.in
index f5da39b..68c8895 100644
--- a/init.d/net.lo.in
+++ b/init.d/net.lo.in
@@ -22,7 +22,7 @@ depend()
 	keyword -jail -prefix -vserver
 
 	case "${IFACE}" in
-		lo|lo0) need root ;;
+		lo|lo0) before mtab ; need root ;;
 		*) after bootmisc net.lo net.lo0 ; need localmount ;;
 	esac
 

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     85827d474c23d47202384b4b3e430bf24d72c5d8
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 10 22:24:44 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Apr 10 22:24:44 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=85827d47

remove "after bootmisc" dependency from loopback interface

---
 init.d/net.lo.in |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/init.d/net.lo.in b/init.d/net.lo.in
index 1615b0c..f5da39b 100644
--- a/init.d/net.lo.in
+++ b/init.d/net.lo.in
@@ -18,13 +18,12 @@ depend()
 	local IFACE=${RC_SVCNAME#*.}
 	local IFVAR=$(shell_var "${IFACE}")
 
-	after bootmisc
 	provide net
 	keyword -jail -prefix -vserver
 
 	case "${IFACE}" in
 		lo|lo0) need root ;;
-		*) after net.lo net.lo0 ; need localmount ;;
+		*) after bootmisc net.lo net.lo0 ; need localmount ;;
 	esac
 
 	if [ "$(command -v "depend_${IFVAR}")" = "depend_${IFVAR}" ]; then

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     c7c278dfd4765e0ad7935a9bbd0a130a2c9f1320
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  8 19:01:13 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Apr  8 19:01:13 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=c7c278df

do not timeout waiting for bootmisc to complete

It is possible for bootmisc to take longer than 60 seconds to complete
and services should not time out waiting for it.

X-Gentoo-Bug: 360405
X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=360405

---
 init.d/bootmisc.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/init.d/bootmisc.in b/init.d/bootmisc.in
index 37f187b..f9f020a 100644
--- a/init.d/bootmisc.in
+++ b/init.d/bootmisc.in
@@ -7,7 +7,7 @@ depend()
 	need localmount
 	before logger
 	after clock sysctl
-	keyword -prefix
+	keyword -prefix -timeout
 }
 
 dir_writeable()

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     46e67badd2d5edd4a6907f896aafecdafcc11211
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  7 12:19:53 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Apr  7 12:19:53 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=46e67bad

fix typo in staticroute

X-Gentoo-Bug: 362205
X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=362205

---
 init.d/staticroute.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/init.d/staticroute.in b/init.d/staticroute.in
index 9995d37..1df5d4c 100644
--- a/init.d/staticroute.in
+++ b/init.d/staticroute.in
@@ -81,7 +81,7 @@ do_routes()
 					*) family=;;
 					esac
 				fi
-				route $famly $xtra $2 -$args
+				route $family $xtra $2 -$args
 				;;
 			esac
 			veend $?

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     7c1a2defb6fdec4190a2256bd023857e30ecb7a7
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 23 18:42:42 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 16:25:25 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=7c1a2def

bootmisc: clean up tmpdir cleaning

Make sure that the `cd` into the $dir actually happened.  This we don't
have to worry about relative paths deleting stuff it shouldn't.  This
step shouldn't fail, but who knows, and better to be sane than to wipe
out someone's valuables.

When wiping, automatically fall back to a dedicated `find` if the initial
`rm` failed on us.  This should help with the speed issues related to the
later `find`.

Have the later find only search the top level allowing `rm` to walk the
directory contents.  This means that -xdev no longer applies, but since
the earlier `rm` wasn't doing -xdev either and no one has complained thus
far, let's assume it isn't an issue.  Also convert to the -exec...+ form
so that we don't have to worry about long argument lists, and add -- to
the `rm` that was previously missing.  In practice, this shouldn't matter
as we've already deleted all those files, but better safe than sorry.

When cleaning, since we've already done a `cd` into the $dir, no point in
prefixing all the paths with $dir too.  Go with the relative loving.

Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>
X-Gentoo-Bug: 359831
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=359831

---
 init.d/bootmisc.in |   43 ++++++++++++++++++++-----------------------
 1 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/init.d/bootmisc.in b/init.d/bootmisc.in
index 320e7e8..37f187b 100644
--- a/init.d/bootmisc.in
+++ b/init.d/bootmisc.in
@@ -26,14 +26,15 @@ cleanup_tmp_dir()
 	fi
 	dir_writeable "$dir" || return 1
 	chmod a+rwt "$dir" 2> /dev/null
-	cd "$dir"
+	cd "$dir" || return 1
 	if yesno $wipe_tmp; then
 		ebegin "Wiping $dir directory"
-		local startopts="-x . -depth"
-		[ "$RC_UNAME" = Linux ] && startopts=". -xdev -depth"
 
-		# Faster than find
-		rm -rf -- [^ajlq\.]*
+		# Faster than raw find
+		if ! rm -rf -- [^ajlq\.]* 2>/dev/null ; then
+			# Blah, too many files
+			find . -maxdepth 1 -name '[^ajlq\.]*' -exec rm -rf -- {} +
+		fi
 
 		# pam_mktemp creates a .private directory within which
 		# each user gets a private directory with immutable
@@ -41,27 +42,23 @@ cleanup_tmp_dir()
 		# remove it.
 		[ -d /tmp/.private ] && chattr -R -a /tmp/.private 2> /dev/null
 
-		find $startopts ! -name . \
-			! -path "./lost+found" \
-			! -path "./lost+found/*" \
-			! -path "./quota.user" \
-			! -path "./quota.user/*" \
-			! -path "./aquota.user" \
-			! -path "./aquota.user/*" \
-			! -path "./quota.group" \
-			! -path "./quota.group/*" \
-			! -path "./aquota.group" \
-			! -path "./aquota.group/*" \
-			! -path "./journal" \
-			! -path "./journal/*" \
-			-exec rm -rf {} \;
+		# Prune the paths that are left
+		find . -maxdepth 1 \
+			! -name . \
+			! -name lost+found \
+			! -name quota.user \
+			! -name aquota.user \
+			! -name quota.group \
+			! -name aquota.group \
+			! -name journal \
+			-exec rm -rf -- {} +
 		eend 0
 	else
 		ebegin "Cleaning $dir directory"
-		rm -rf -- "$dir"/.X*-lock "$dir"/esrv* "$dir"/kio* \
-			"$dir"/jpsock.* "$dir"/.fam* "$dir"/.esd* \
-			"$dir"/orbit-* "$dir"/ssh-* "$dir"/ksocket-* \
-			"$dir"/.*-unix
+		rm -rf -- .X*-lock esrv* kio* \
+			jpsock.* .fam* .esd* \
+			orbit-* ssh-* ksocket-* \
+			.*-unix
 		eend 0
 	fi
 }

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     25049d3e80aeb17d4d62a653cfa8223fae56ddd0
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 24 03:41:03 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Mar 24 03:41:03 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=25049d3e

termencoding needs root  to be mounted read/write

X-Gentoo-Bug: 360215
X-Gentoo-Bug-URL: http://bugs.gentoo.org/360215

---
 init.d/termencoding.in |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/init.d/termencoding.in b/init.d/termencoding.in
index fea27ee..5bb417b 100644
--- a/init.d/termencoding.in
+++ b/init.d/termencoding.in
@@ -10,6 +10,7 @@ ttyn=${rc_tty_number:-${RC_TTY_NUMBER:-12}}
 depend()
 {
 	keyword -openvz -prefix -uml -vserver -xenu
+	need root
 }
 
 start()

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     60d8d4f5bbdfc3e91ed4adce0ee1315e1bdf47b6
Author:     Ed Wildgoose <gentoo <AT> wildgooses <DOT> com>
AuthorDate: Tue Mar 22 04:49:40 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Mar 22 04:55:55 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=60d8d4f5

do not delete addresses when stopping a ppp interface.

This is important in situations where ppp is being used in a demand
dialing setup.

X-Gentoo-Bug: 359069
X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=359069

---
 init.d/net.lo.in |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/init.d/net.lo.in b/init.d/net.lo.in
index b194a23..822e3f5 100644
--- a/init.d/net.lo.in
+++ b/init.d/net.lo.in
@@ -684,7 +684,11 @@ stop()
 
 	# Only delete addresses for interfaces that exist
 	if _exists; then
-		_delete_addresses "${IFACE}"
+		# PPP can manage it's own addresses when IN_BACKGROUND
+		# Important in case "demand" set on the ppp link
+		if ! (yesno ${IN_BACKGROUND} && is_ppp) ; then
+			_delete_addresses "${IFACE}"
+		fi
 	fi
 
 	for module in ${MODULES}; do

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     87302487d20bda52735031bf8f53fa57c2e33a03
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  6 17:50:06 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Mar  6 17:50:06 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=87302487

savecache should not fail if we are shutting down

Since mount-ro needs to run unconditionally, we need to have savecache
report that it ran successfully when the system is shutting down.

X-Gentoo-Bug: 356393
X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=356393

---
 init.d/savecache.in |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/init.d/savecache.in b/init.d/savecache.in
index 2c981c6..d2d51b8 100644
--- a/init.d/savecache.in
+++ b/init.d/savecache.in
@@ -8,17 +8,22 @@ start()
 {
 	if [ -e "$RC_SVCDIR"/clock-skewed ]; then
 		ewarn "WARNING: clock skew detected!"
-		if ! yesno "savecache_skewed"; then
+		if ! yesno "${RC_GOINGDOWN}"; then
 			eerror "Not saving deptree cache"
 			return 1
 		fi
 	fi
 	ebegin "Saving dependency cache"
+	local rc=
 	if [ ! -d "$RC_LIBEXECDIR"/cache ]; then
 		rm -rf "$RC_LIBEXECDIR"/cache
 		if ! mkdir "$RC_LIBEXECDIR"/cache; then
-			eend $?
-			return $?
+			rc=$?
+			if yesno "${RC_GOINGDOWN}"; then
+				rc=0
+			fi
+			eend $rc
+			return $rc
 		fi
 	fi
 	local save=
@@ -28,5 +33,9 @@ start()
 	if [ -n "$save" ]; then
 		cp -p $save "$RC_LIBEXECDIR"/cache 2>/dev/null
 	fi
-	eend $?
+	rc=$?
+	if yesno "${RC_GOINGDOWN}"; then
+		rc=0
+	fi
+	eend $rc
 }

[gentoo-commits] proj/openrc:master commit in: init.d/

[Anthony G. Basile]

commit:     bae0a693a9271b3ed0f723fdafc22efe5f07b70e
Author:     Sebastian Thorarensen <indigo176 <AT> blinkenshell <DOT> org>
AuthorDate: Mon Feb 14 23:51:15 2011 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Feb 14 23:54:35 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=bae0a693

Set unicode mode immediately at boot without consolefont

X-Gentoo-Bug: 354793
X-Gentoo-Bug-URL: http://bugs.gentoo.org/354793
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>

---
 init.d/consolefont.in  |    6 ------
 init.d/termencoding.in |   11 +++++++++++
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/init.d/consolefont.in b/init.d/consolefont.in
index d3acd75..75c2fd1 100644
--- a/init.d/consolefont.in
+++ b/init.d/consolefont.in
@@ -61,12 +61,6 @@ start()
 		done
 		cp "$font" "$RC_LIBEXECDIR"/console
 		echo "${font##*/}" >"$RC_LIBEXECDIR"/console/font
-		if yesno ${unicode:-${UNICODE}}; then
-			echo "" > "$RC_LIBEXECDIR"/console/unicode
-		else
-			rm -f "$RC_LIBEXECDIR"/console/unicode
-		fi
-
 	fi
 
 	return $retval

diff --git a/init.d/termencoding.in b/init.d/termencoding.in
index 734d220..fea27ee 100644
--- a/init.d/termencoding.in
+++ b/init.d/termencoding.in
@@ -31,5 +31,16 @@ start()
 		printf "\033%s" "$termencoding" >$ttydev$n
 		n=$(($n + 1))
 	done
+
+	# Save the encoding for use immediately at boot
+	if [ -w "$RC_LIBEXECDIR" ]; then
+		mkdir -p "$RC_LIBEXECDIR"/console
+		if yesno ${unicode:-${UNICODE}}; then
+			echo "" > "$RC_LIBEXECDIR"/console/unicode
+		else
+			rm -f "$RC_LIBEXECDIR"/console/unicode
+		fi
+	fi
+
 	eend 0
 }

[gentoo-commits] proj/openrc:master commit in: init.d/

[Mike Frysinger]

commit:     35d38c3561fa5e16c6d2e00e033e48dc200ae42c
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  6 22:24:52 2011 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Mon Feb 14 17:06:58 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=35d38c35

local: quote script names to handle spaces

Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

---
 init.d/local.in |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/init.d/local.in b/init.d/local.in
index 5583fea..4db492e 100644
--- a/init.d/local.in
+++ b/init.d/local.in
@@ -16,7 +16,7 @@ start()
 
 	local file
 	for file in @SYSCONFDIR@/local.d/*.start ; do
-		[ -x $file ] && $file
+		[ -x "$file" ] && "$file"
 	done
 
 	if type local_start >/dev/null 2>&1; then
@@ -36,7 +36,7 @@ stop()
 
 	local file
 	for file in @SYSCONFDIR@/local.d/*.stop; do
-		[ -x $file ] && $file
+		[ -x "$file" ] && "$file"
 	done
 
 	if type local_start >/dev/null 2>&1; then

[gentoo-commits] proj/openrc:master commit in: init.d/

[Mike Frysinger]

commit:     11fcb0217e952fc9597ddfdb3d6ea110c3b37fcc
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  6 18:23:53 2011 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Mon Feb 14 17:06:58 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=11fcb021

hwclock: fix typo from an earlier style commit

Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

---
 init.d/hwclock.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/init.d/hwclock.in b/init.d/hwclock.in
index f673d35..640d997 100644
--- a/init.d/hwclock.in
+++ b/init.d/hwclock.in
@@ -91,7 +91,7 @@ start()
 	# If setting UTC, don't bother to run hwclock when first booting
 	# as that's the default
 	if [ "$PREVLEVEL" != N -o \
-		"$utc_cmd}" != --utc -o \
+		"$utc_cmd" != --utc -o \
 		-n "$clock_args" ];
 	then
 		if yesno $clock_hctosys; then

[gentoo-commits] proj/openrc:master commit in: init.d/

[Anthony G. Basile]

commit:     c8b5078660f2b94b3c64f0a71ea6cde7df76678e
Author:     Anthony G. Basile <basile <AT> opensource <DOT> dyc <DOT> edu>
AuthorDate: Mon Feb 14 09:41:08 2011 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Feb 14 09:41:08 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=c8b50786

Fix bug #354805

---
 init.d/localmount.in |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/init.d/localmount.in b/init.d/localmount.in
index 2a8e96f..e2ea801 100644
--- a/init.d/localmount.in
+++ b/init.d/localmount.in
@@ -58,8 +58,8 @@ stop()
 
 	. "$RC_LIBEXECDIR"/sh/rc-mount.sh
 
-	# Umount loopback devices
-	einfo "Unmounting loopback devices"
+	# Umount loop devices
+	einfo "Unmounting loop devices"
 	eindent
 	do_unmount "umount -d" --skip-point-regex "$no_umounts_r" \
 		--node-regex "^/dev/loop"

[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     ebd79394a31d40c72d7f96a1cb832d1130777537
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Mon Feb  7 16:29:38 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Feb 10 05:15:24 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=ebd79394

set timezone if RC_HCTOSYS is not set

We need to set the timezone for the system clock even when we allow the
kernel to set the time.

X-Gentoo-Bug: 248131
X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=248131

---
 init.d/hwclock.in |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/init.d/hwclock.in b/init.d/hwclock.in
index 040d84a..f673d35 100644
--- a/init.d/hwclock.in
+++ b/init.d/hwclock.in
@@ -64,7 +64,6 @@ _hwclock()
 
 start()
 {
-	yesno $clock_hctosys || return 0
 	local retval=0 errstr=""
 	setupopts
 
@@ -95,7 +94,11 @@ start()
 		"$utc_cmd}" != --utc -o \
 		-n "$clock_args" ];
 	then
-		_hwclock --hctosys $utc_cmd $clock_args
+		if yesno $clock_hctosys; then
+			_hwclock --hctosys $utc_cmd $clock_args
+		else
+			_hwclock --systz $utc_cmd $clock_args
+		fi
 		retval=$(($retval + $?))
 	fi