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

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

[William Hubbs]

commit:     7341cd882fba522c1f1d183603334839bd4df7fc
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Mon Aug 10 23:45:36 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Aug 17 23:21:39 2015 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=7341cd88

allow localmount and netmount to fail

 NEWS.md              | 11 +++++++++++
 init.d/localmount.in |  3 ---
 init.d/netmount.in   |  1 -
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index 20e3c27..69fab7f 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -3,6 +3,17 @@
 This file will contain a list of notable changes for each release. Note
 the information in this file is in reverse order.
 
+## OpenRC-x.xx
+
+The behaviour of localmount and netmount in this version is changing. In
+the past, these services always started successfully. In this version,
+they will be able to fail if file systems they mount fail to mount. If
+you have file systems listed in fstab which should not be mounted at
+boot time, make sure to add noauto to the mount options. If you have
+file systems that you want to attempt to mount at boot time but failure
+should be allowed, add nofail to the mount options for these file
+systems in fstab.
+
 ## OpenRC-0.14
 
 The binfmt service, which registers misc binary formats with the Linux

diff --git a/init.d/localmount.in b/init.d/localmount.in
index b2e8ef1..67e4303 100644
--- a/init.d/localmount.in
+++ b/init.d/localmount.in
@@ -29,9 +29,6 @@ start()
 	ebegin "Mounting local filesystems"
 	mount -at "$types" $no_netdev
 	eend $? "Some local filesystem failed to mount"
-
-	# Always return 0 - some local mounts may not be critical for boot
-	return 0
 }
 
 stop()

diff --git a/init.d/netmount.in b/init.d/netmount.in
index 66ba409..2ce5c2a 100644
--- a/init.d/netmount.in
+++ b/init.d/netmount.in
@@ -27,7 +27,6 @@ start()
 		rc=$?
 	fi
 	ewend $rc "Could not mount all network filesystems"
-	return 0
 }
 
 stop()

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

[William Hubbs]

commit:     2a439c85bd69efc14847b4397bd6783cac051405
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Mon Aug 17 22:51:06 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Aug 18 23:25:48 2015 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=2a439c85

local/netmount: remove uses of -O [no]_netdev

This was causing an incompatibility with busybox, and we do not use it
in Gentoo.

 BUSYBOX.md           |  5 -----
 NEWS.md              | 18 +++++++++++++-----
 init.d/localmount.in |  5 ++---
 init.d/netmount.in   |  8 --------
 4 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/BUSYBOX.md b/BUSYBOX.md
index db7ca51..8d93356 100644
--- a/BUSYBOX.md
+++ b/BUSYBOX.md
@@ -12,11 +12,6 @@ configuration settings for best results with OpenRC.
 CONFIG_START_STOP_DAEMON -- The start-stop-daemon applet is not compatible with
 start-stop-daemon in OpenRC.
 
-CONFIG_MOUNT -- The mount applet does not support the -O [no]_netdev options to
-skip over or include network file systems when the -a option is present.
-
-CONFIG_UMOUNT -- The umount applet does not support the -O option along with -a.
-
 CONFIG_SWAPONOFF -- The swapon applet does not support the -e option
 or recognize the nofail option in fstab.
 

diff --git a/NEWS.md b/NEWS.md
index 69fab7f..cb8eaba 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -3,17 +3,25 @@
 This file will contain a list of notable changes for each release. Note
 the information in this file is in reverse order.
 
-## OpenRC-x.xx
+## OpenRC-0.18
 
-The behaviour of localmount and netmount in this version is changing. In
-the past, these services always started successfully. In this version,
-they will be able to fail if file systems they mount fail to mount. If
-you have file systems listed in fstab which should not be mounted at
+The behaviour of localmount and netmount is changing. In the past, these
+services always started successfully. However, now they will fail if a
+file system they attempt to mount cannot be mounted.
+
+If you have file systems listed in fstab which should not be mounted at
 boot time, make sure to add noauto to the mount options. If you have
 file systems that you want to attempt to mount at boot time but failure
 should be allowed, add nofail to the mount options for these file
 systems in fstab.
 
+In this version, we are dropping the use of the -O switch for
+mount/umount -a. This is being dropped because it is util-linux
+specific and not compatible with busybox.
+
+This should not be a regression for Gentoo users, but I am publishing
+this here because it may be for others.
+
 ## OpenRC-0.14
 
 The binfmt service, which registers misc binary formats with the Linux

diff --git a/init.d/localmount.in b/init.d/localmount.in
index 67e4303..9d05ebc 100644
--- a/init.d/localmount.in
+++ b/init.d/localmount.in
@@ -15,19 +15,18 @@ depend()
 start()
 {
 	# Mount local filesystems in /etc/fstab.
-	local types="noproc" x= no_netdev=
+	local types="noproc" x=
 	for x in $net_fs_list $extra_net_fs_list; do
 		types="${types},no${x}"
 	done
 
 	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
+	mount -at "$types"
 	eend $? "Some local filesystem failed to mount"
 }
 

diff --git a/init.d/netmount.in b/init.d/netmount.in
index 2ce5c2a..99db185 100644
--- a/init.d/netmount.in
+++ b/init.d/netmount.in
@@ -22,10 +22,6 @@ start()
 	ebegin "Mounting network filesystems"
 	mount -at $fs
 	rc=$?
-	if [ "$RC_UNAME" = Linux ]; then
-		mount -a -O _netdev
-		rc=$?
-	fi
 	ewend $rc "Could not mount all network filesystems"
 }
 
@@ -53,9 +49,5 @@ stop()
 	retval=$?
 
 	eoutdent
-	if [ "$RC_UNAME" = Linux ]; then
-		umount -a -O _netdev
-		retval=$?
-	fi
 	eend $retval "Failed to unmount network filesystems"
 }

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

[William Hubbs]

commit:     003657c973ea338a19f2b7294190af9d76cf5cea
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 24 21:19:22 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Oct 25 15:49:14 2016 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=003657c9

init.d/loopback: drop scope on loopback

Busybox does not support the 'scope' argument on 'ip address add' or 'ip
route add', this is documented in BUSYBOX.md, but is no longer actually
needed, as the kernel does get it right without manual specification,
and the ifconfig variant already relies on the kernel to get it right.
This is part of #103.

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

 BUSYBOX.md         | 3 ---
 init.d/loopback.in | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/BUSYBOX.md b/BUSYBOX.md
index db7ca51..c8a78e7 100644
--- a/BUSYBOX.md
+++ b/BUSYBOX.md
@@ -22,9 +22,6 @@ or recognize the nofail option in fstab.
 
 CONFIG_SETFONT -- The setfont applet does not support the -u option from kbd.
 
-CONFIG_IP -- The ip applet  doesn't support the "scope" modifier for
-"ip route add" and "ip address add".
-
 CONFIG_BB_SYSCTL -- The sysctl applet does not support the --system command
 line switch.
 

diff --git a/init.d/loopback.in b/init.d/loopback.in
index f76dfce..59bdae2 100644
--- a/init.d/loopback.in
+++ b/init.d/loopback.in
@@ -21,8 +21,8 @@ start()
 	if [ "$RC_UNAME" = Linux ]; then
 		ebegin "Bringing up network interface lo"
 		if command -v ip > /dev/null 2>&1; then
-			ip addr add 127.0.0.1/8 dev lo brd + scope host
-			ip route add 127.0.0.0/8 dev lo scope host
+			ip 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

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

[William Hubbs]

commit:     6b475ab26992f1dd8815700828df46abc4b71d27
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Fri Mar 16 19:33:01 2018 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Mar 16 19:33:01 2018 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=6b475ab2

init.d/modules: add code from modules-load service

There is no reason for these to be separate services. I did add a
provide so that we don't break backward compatibility.

 NEWS.md                |  7 +++++
 init.d/Makefile        |  4 +--
 init.d/modules-load.in | 72 --------------------------------------------------
 init.d/modules.in      | 62 +++++++++++++++++++++++++++++++++++++++++--
 4 files changed, 69 insertions(+), 76 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index b64d5d8a..f7849093 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -4,6 +4,13 @@ OpenRC NEWS
 This file will contain a list of notable changes for each release. Note
 the information in this file is in reverse order.
 
+## OpenRC 0.36
+
+In this release, the modules-load service has been combined into the
+modules service since there is no reason I know of to keep them
+separate. However, modules also provides modules-load in case you were
+using modules-load in  your dependencies.
+
 ## OpenRC 0.35
 
 In this version, the cgroups mounting logic has been moved from the

diff --git a/init.d/Makefile b/init.d/Makefile
index 9c97e1ed..e18f7a9f 100644
--- a/init.d/Makefile
+++ b/init.d/Makefile
@@ -19,10 +19,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 \
-		modules-load.in mixer.in nscd.in powerd.in syscons.in
+		mixer.in nscd.in powerd.in syscons.in
 
 SRCS-Linux=	agetty.in binfmt.in devfs.in cgroups.in dmesg.in hwclock.in \
-	consolefont.in keymaps.in killprocs.in modules.in modules-load.in \
+	consolefont.in keymaps.in killprocs.in modules.in \
 	mount-ro.in mtab.in numlock.in procfs.in net-online.in sysfs.in \
 termencoding.in
 

diff --git a/init.d/modules-load.in b/init.d/modules-load.in
deleted file mode 100644
index f71f704d..00000000
--- a/init.d/modules-load.in
+++ /dev/null
@@ -1,72 +0,0 @@
-#!@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
-}
-
-find_modfiles()
-{
-	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##*/}"
-		done
-	done
-	basenames=$(printf "$basenames" | sort -u)
-	for x in $basenames; do
-		for y in $dirs; do
-			[ -r $y/$x ] &&
-				fn=$y/$x
-		done
-		files="$files $fn"
-	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 --use-blacklist -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 2eab77f0..d6dd7a29 100644
--- a/init.d/modules.in
+++ b/init.d/modules.in
@@ -14,10 +14,65 @@ description="Loads a user defined list of kernel modules."
 depend()
 {
 	use isapnp
-	want modules-load
+	provide modules-load
 	keyword -docker -lxc -openvz -prefix -systemd-nspawn -vserver
 }
 
+find_modfiles()
+{
+	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##*/}"
+		done
+	done
+	basenames=$(printf "$basenames" | sort -u)
+	for x in $basenames; do
+		for y in $dirs; do
+			[ -r $y/$x ] &&
+				fn=$y/$x
+		done
+		files="$files $fn"
+	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 --use-blacklist -q "$x"; rc=$? ;;
+			*) ;;
+		esac
+		eend $rc "Failed to load $x"
+	done
+}
+
+modules_load_d()
+{
+	local x
+	files=$(find_modfiles)
+	for x in $files; do
+		load_modules $x
+	done
+	return 0
+}
+
 FreeBSD_modules()
 {
 	local cnt=0 x
@@ -82,7 +137,10 @@ Linux_modules()
 start()
 {
 	case "$RC_UNAME" in
-		FreeBSD|Linux) ${RC_UNAME}_modules ;;
+		FreeBSD|Linux) 
+			modules_load_d
+			${RC_UNAME}_modules
+			;;
 		*) ;;
 	esac
 	return 0

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

[William Hubbs]

commit:     a3d0e293eebcb92564c473e61ca42724844fb279
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Mon May  7 23:12:55 2018 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon May  7 23:12:55 2018 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=a3d0e293

Remove localmount from dependencies for linux-only services

This removes localmount from the dependencies of the consolefont,
keymaps, numlock and procfs services.

These services are Linux only and the default modern linux system has /
and /usr on the same file system.

This also fixes the following issue.

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

 NEWS.md               | 7 +++++++
 init.d/consolefont.in | 2 +-
 init.d/keymaps.in     | 2 +-
 init.d/numlock.in     | 1 -
 init.d/procfs.in      | 1 -
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index f7849093..328247da 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -11,6 +11,13 @@ modules service since there is no reason I know of to keep them
 separate. However, modules also provides modules-load in case you were
 using modules-load in  your dependencies.
 
+The consolefont, keymaps, numlock and procfs service scripts no longer
+have a dependency on localmount.
+If you are a linux user and are still separaating / from /usr,
+you will need to add the following line to the appropriate conf.d files:
+
+rc_need="localmount"
+
 ## OpenRC 0.35
 
 In this version, the cgroups mounting logic has been moved from the

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

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

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

diff --git a/init.d/procfs.in b/init.d/procfs.in
index 8fed9514..edc8ee19 100644
--- a/init.d/procfs.in
+++ b/init.d/procfs.in
@@ -16,7 +16,6 @@ depend()
 	after clock
 	use devfs
 	want modules
-	need localmount
 	keyword -docker -lxc -openvz -prefix -systemd-nspawn -vserver
 }
 

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

[William Hubbs]

commit:     7cb8d943236fe651ac54c64f8167f7c4369f649c
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Tue Aug 14 15:21:27 2018 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Aug 14 15:21:27 2018 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=7cb8d943

Stop mounting efivarfs read-only

We do not need to do this any longer since all supported linux kernels
make efivarfs immutable and the tools that manipulate it are aware of
this feature.

This fixes https://github.com/openrc/openrc/issues/238.

 NEWS.md         | 7 +++++++
 init.d/sysfs.in | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/NEWS.md b/NEWS.md
index e9605031..3767c18b 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -11,6 +11,13 @@ The only place I know that this was used was Gentoo Baselayout 1.x, so
 it shouldn't affect anyone since baselayout-1 has been dead for a few
 years.
 
+Since all supported Linux kernel versions now make efivarfs immutable
+and all of the tools that access efivarfs are aware of this, we no
+longer mount efivarfs read-only. See the following github issue for more
+information:
+
+https://github.com/openrc/openrc/issues/238
+
 ## OpenRC 0.37
 
 start-stop-daemon now supports logging stdout and stderr of daemons to

diff --git a/init.d/sysfs.in b/init.d/sysfs.in
index f0d02e5c..89707120 100644
--- a/init.d/sysfs.in
+++ b/init.d/sysfs.in
@@ -101,7 +101,7 @@ mount_misc()
 	if [ -d /sys/firmware/efi/efivars ] &&
 		! mountinfo -q /sys/firmware/efi/efivars; then
 		ebegin "Mounting efivarfs filesystem"
-		mount -n -t efivarfs -o ro \
+		mount -n -t efivarfs -o ${sysfs_opts} \
 			efivarfs /sys/firmware/efi/efivars 2> /dev/null
 		eend 0
 	fi