diff options
author | William Hubbs <w.d.hubbs@gmail.com> | 2015-08-17 17:51:06 -0500 |
---|---|---|
committer | William Hubbs <w.d.hubbs@gmail.com> | 2015-08-18 18:25:48 -0500 |
commit | 2a439c85bd69efc14847b4397bd6783cac051405 (patch) | |
tree | e53494e5a5678e57cc2db3be0100e06e2b17a5b7 /init.d | |
parent | 7341cd882fba522c1f1d183603334839bd4df7fc (diff) |
local/netmount: remove uses of -O [no]_netdev
This was causing an incompatibility with busybox, and we do not use it
in Gentoo.
Diffstat (limited to 'init.d')
-rw-r--r-- | init.d/localmount.in | 5 | ||||
-rw-r--r-- | init.d/netmount.in | 8 |
2 files changed, 2 insertions, 11 deletions
diff --git a/init.d/localmount.in b/init.d/localmount.in index 67e43035..9d05ebcf 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 2ce5c2a9..99db1858 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" } |