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

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

[William Hubbs]

commit:     1b26d547a50e2554483bdbfd288fae75fd76bfa0
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Thu Aug 14 18:50:48 2014 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Aug 14 18:50:48 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=1b26d547

Deprecate the mtab service script

The mtab service script is no longer needed on modern Linux systems, so
we can remove it in 1.0. However, we need to set a deprecation notice
first.

---
 FEATURE-REMOVAL-SCHEDULE | 11 +++++++++++
 init.d/mtab.in           | 10 +++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/FEATURE-REMOVAL-SCHEDULE b/FEATURE-REMOVAL-SCHEDULE
index 682bed8..2c05a3e 100644
--- a/FEATURE-REMOVAL-SCHEDULE
+++ b/FEATURE-REMOVAL-SCHEDULE
@@ -59,3 +59,14 @@ Why: Depprecated in favor of executable scripts in @SYSCONFDIR@/local.d
 Who:
 
 ---------------------------
+
+What: the mtab service script
+
+When: 1.0
+
+Why: /etc/mtab should be a symbolic link to /proc/self/mounts on modern
+	 Linux systems
+
+Who:
+
+---------------------------

diff --git a/init.d/mtab.in b/init.d/mtab.in
index 8e5bc2f..0cd7369 100644
--- a/init.d/mtab.in
+++ b/init.d/mtab.in
@@ -12,12 +12,16 @@ depend()
 
 start()
 {
-	if [ -L /etc/mtab ]
-	then
-		einfo "Skipping mtab update (mtab is a symbolic link)"
+	if [ -L /etc/mtab ]; then
 		return 0
 	fi
 
+	ewarn "Please run the following command as root on your system."
+	ewarn
+	ewarn "ln -snf /proc/self/mounts /etc/mtab"
+	ewarn
+	ewarn "The support for updating /etc/mtab as a file is"
+	ewarn "deprecated and will be removed in the future."
 	ebegin "Updating /etc/mtab"
 	if ! echo 2>/dev/null >/etc/mtab; then
 		ewend 1 "/etc/mtab is not updateable"

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

[William Hubbs]

commit:     645f7b6947d9fc44fbece0931a3ddb10d3d79b27
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Sat Aug 16 20:07:48 2014 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Aug 16 20:07:48 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=645f7b69

adjust deprecation schedule for mtab

- Quiet the deprecation messages forr now
- update the feature removal schedule to reflect that it will be removed
  in 2.0.

---
 FEATURE-REMOVAL-SCHEDULE | 2 +-
 init.d/mtab.in           | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/FEATURE-REMOVAL-SCHEDULE b/FEATURE-REMOVAL-SCHEDULE
index 2c05a3e..271316f 100644
--- a/FEATURE-REMOVAL-SCHEDULE
+++ b/FEATURE-REMOVAL-SCHEDULE
@@ -62,7 +62,7 @@ Who:
 
 What: the mtab service script
 
-When: 1.0
+When: 2.0
 
 Why: /etc/mtab should be a symbolic link to /proc/self/mounts on modern
 	 Linux systems

diff --git a/init.d/mtab.in b/init.d/mtab.in
index 0cd7369..61b57bd 100644
--- a/init.d/mtab.in
+++ b/init.d/mtab.in
@@ -16,12 +16,6 @@ start()
 		return 0
 	fi
 
-	ewarn "Please run the following command as root on your system."
-	ewarn
-	ewarn "ln -snf /proc/self/mounts /etc/mtab"
-	ewarn
-	ewarn "The support for updating /etc/mtab as a file is"
-	ewarn "deprecated and will be removed in the future."
 	ebegin "Updating /etc/mtab"
 	if ! echo 2>/dev/null >/etc/mtab; then
 		ewend 1 "/etc/mtab is not updateable"

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

[William Hubbs]

commit:     c60ef5c381e9edc7e30be9dcc9cc7e123515452e
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Sun Aug 17 16:23:52 2014 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Aug 17 16:23:52 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=c60ef5c3

mtab: add verbose level deprecation warnings

---
 FEATURE-REMOVAL-SCHEDULE | 2 +-
 init.d/mtab.in           | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/FEATURE-REMOVAL-SCHEDULE b/FEATURE-REMOVAL-SCHEDULE
index 271316f..344711f 100644
--- a/FEATURE-REMOVAL-SCHEDULE
+++ b/FEATURE-REMOVAL-SCHEDULE
@@ -62,7 +62,7 @@ Who:
 
 What: the mtab service script
 
-When: 2.0
+When: make warnings more visible in 1.0, remove in 2.0
 
 Why: /etc/mtab should be a symbolic link to /proc/self/mounts on modern
 	 Linux systems

diff --git a/init.d/mtab.in b/init.d/mtab.in
index 61b57bd..e38d33e 100644
--- a/init.d/mtab.in
+++ b/init.d/mtab.in
@@ -17,6 +17,11 @@ start()
 	fi
 
 	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

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

[William Hubbs]

commit:     1b26d547a50e2554483bdbfd288fae75fd76bfa0
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Thu Aug 14 18:50:48 2014 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Aug 14 18:50:48 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=1b26d547

Deprecate the mtab service script

The mtab service script is no longer needed on modern Linux systems, so
we can remove it in 1.0. However, we need to set a deprecation notice
first.

---
 FEATURE-REMOVAL-SCHEDULE | 11 +++++++++++
 init.d/mtab.in           | 10 +++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/FEATURE-REMOVAL-SCHEDULE b/FEATURE-REMOVAL-SCHEDULE
index 682bed8..2c05a3e 100644
--- a/FEATURE-REMOVAL-SCHEDULE
+++ b/FEATURE-REMOVAL-SCHEDULE
@@ -59,3 +59,14 @@ Why: Depprecated in favor of executable scripts in @SYSCONFDIR@/local.d
 Who:
 
 ---------------------------
+
+What: the mtab service script
+
+When: 1.0
+
+Why: /etc/mtab should be a symbolic link to /proc/self/mounts on modern
+	 Linux systems
+
+Who:
+
+---------------------------

diff --git a/init.d/mtab.in b/init.d/mtab.in
index 8e5bc2f..0cd7369 100644
--- a/init.d/mtab.in
+++ b/init.d/mtab.in
@@ -12,12 +12,16 @@ depend()
 
 start()
 {
-	if [ -L /etc/mtab ]
-	then
-		einfo "Skipping mtab update (mtab is a symbolic link)"
+	if [ -L /etc/mtab ]; then
 		return 0
 	fi
 
+	ewarn "Please run the following command as root on your system."
+	ewarn
+	ewarn "ln -snf /proc/self/mounts /etc/mtab"
+	ewarn
+	ewarn "The support for updating /etc/mtab as a file is"
+	ewarn "deprecated and will be removed in the future."
 	ebegin "Updating /etc/mtab"
 	if ! echo 2>/dev/null >/etc/mtab; then
 		ewend 1 "/etc/mtab is not updateable"

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

[William Hubbs]

commit:     645f7b6947d9fc44fbece0931a3ddb10d3d79b27
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Sat Aug 16 20:07:48 2014 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Aug 16 20:07:48 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=645f7b69

adjust deprecation schedule for mtab

- Quiet the deprecation messages forr now
- update the feature removal schedule to reflect that it will be removed
  in 2.0.

---
 FEATURE-REMOVAL-SCHEDULE | 2 +-
 init.d/mtab.in           | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/FEATURE-REMOVAL-SCHEDULE b/FEATURE-REMOVAL-SCHEDULE
index 2c05a3e..271316f 100644
--- a/FEATURE-REMOVAL-SCHEDULE
+++ b/FEATURE-REMOVAL-SCHEDULE
@@ -62,7 +62,7 @@ Who:
 
 What: the mtab service script
 
-When: 1.0
+When: 2.0
 
 Why: /etc/mtab should be a symbolic link to /proc/self/mounts on modern
 	 Linux systems

diff --git a/init.d/mtab.in b/init.d/mtab.in
index 0cd7369..61b57bd 100644
--- a/init.d/mtab.in
+++ b/init.d/mtab.in
@@ -16,12 +16,6 @@ start()
 		return 0
 	fi
 
-	ewarn "Please run the following command as root on your system."
-	ewarn
-	ewarn "ln -snf /proc/self/mounts /etc/mtab"
-	ewarn
-	ewarn "The support for updating /etc/mtab as a file is"
-	ewarn "deprecated and will be removed in the future."
 	ebegin "Updating /etc/mtab"
 	if ! echo 2>/dev/null >/etc/mtab; then
 		ewend 1 "/etc/mtab is not updateable"

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

[William Hubbs]

commit:     c60ef5c381e9edc7e30be9dcc9cc7e123515452e
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Sun Aug 17 16:23:52 2014 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Aug 17 16:23:52 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=c60ef5c3

mtab: add verbose level deprecation warnings

---
 FEATURE-REMOVAL-SCHEDULE | 2 +-
 init.d/mtab.in           | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/FEATURE-REMOVAL-SCHEDULE b/FEATURE-REMOVAL-SCHEDULE
index 271316f..344711f 100644
--- a/FEATURE-REMOVAL-SCHEDULE
+++ b/FEATURE-REMOVAL-SCHEDULE
@@ -62,7 +62,7 @@ Who:
 
 What: the mtab service script
 
-When: 2.0
+When: make warnings more visible in 1.0, remove in 2.0
 
 Why: /etc/mtab should be a symbolic link to /proc/self/mounts on modern
 	 Linux systems

diff --git a/init.d/mtab.in b/init.d/mtab.in
index 61b57bd..e38d33e 100644
--- a/init.d/mtab.in
+++ b/init.d/mtab.in
@@ -17,6 +17,11 @@ start()
 	fi
 
 	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

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

[William Hubbs]

commit:     dac5966ca40610797d2b2aabef17154ca3dc20af
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Thu Oct  1 22:16:14 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Oct  1 22:33:43 2015 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=dac5966c

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

This reverts commit 2a439c85bd69efc14847b4397bd6783cac051405.
There is another use case for -O involving iscsi, so we can't remove it.

 BUSYBOX.md           |  5 +++++
 NEWS.md              | 16 ++++------------
 init.d/localmount.in |  5 +++--
 init.d/netmount.in   |  8 ++++++++
 4 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/BUSYBOX.md b/BUSYBOX.md
index 8d93356..db7ca51 100644
--- a/BUSYBOX.md
+++ b/BUSYBOX.md
@@ -12,6 +12,11 @@ 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 cb8eaba..819a340 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -5,23 +5,15 @@ the information in this file is in reverse order.
 
 ## OpenRC-0.18
 
-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
+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.
 
-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 f4bf15f..29e7348 100644
--- a/init.d/localmount.in
+++ b/init.d/localmount.in
@@ -15,18 +15,19 @@ depend()
 start()
 {
 	# Mount local filesystems in /etc/fstab.
-	local types="noproc" x= rc=
+	local types="noproc" x= no_netdev= rc=
 	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"
+	mount -at "$types" $no_netdev
 	eend $? "Some local filesystem failed to mount"
 	rc=$?
 	if [ "$RC_UNAME" != Linux ]; then

diff --git a/init.d/netmount.in b/init.d/netmount.in
index d9cf9c5..d1f3cff 100644
--- a/init.d/netmount.in
+++ b/init.d/netmount.in
@@ -22,6 +22,10 @@ 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"
 	if [ "$RC_UNAME" != Linux ]; then
 		rc=0
@@ -53,5 +57,9 @@ 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:     f87a9eec3d23ea01578500972f1df993d5d24fba
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Tue Jun 13 17:45:35 2017 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Jun 13 18:19:36 2017 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=f87a9eec

init.d/sysfs: mount efivars read only

This fixes #134.

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

diff --git a/NEWS.md b/NEWS.md
index 90a452b6..53802b40 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -3,6 +3,13 @@
 This file will contain a list of notable changes for each release. Note
 the information in this file is in reverse order.
 
+## OpenRC-0.28
+
+This version mounts efivars read only due to concerns about changes in
+this file system making systems unbootable.  If you need to change something
+in this path, you will need to re-mount it read-write, make the change
+and re-mount it read-only.
+
 ## OpenRC-0.25
 
 This version contains an OpenRC-specific implementation of init for

diff --git a/init.d/sysfs.in b/init.d/sysfs.in
index e493f584..a2538114 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 ${sysfs_opts} \
+		mount -n -t efivarfs -o ro \
 			efivarfs /sys/firmware/efi/efivars 2> /dev/null
 		eend 0
 	fi