From: "William Hubbs" <williamh@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/openrc:master commit in: /, init.d/
Date: Tue, 18 Aug 2015 23:28:57 +0000 (UTC) [thread overview]
Message-ID: <1439940348.2a439c85bd69efc14847b4397bd6783cac051405.williamh@OpenRC> (raw)
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"
}
next reply other threads:[~2015-08-18 23:29 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-18 23:28 William Hubbs [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-08-14 15:24 [gentoo-commits] proj/openrc:master commit in: /, init.d/ William Hubbs
2018-05-07 23:21 William Hubbs
2018-05-07 23:21 William Hubbs
2016-10-25 15:51 William Hubbs
2015-08-18 23:28 William Hubbs
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1439940348.2a439c85bd69efc14847b4397bd6783cac051405.williamh@OpenRC \
--to=williamh@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox