diff options
| author | William Hubbs <w.d.hubbs@gmail.com> | 2014-10-01 17:14:25 -0500 |
|---|---|---|
| committer | William Hubbs <w.d.hubbs@gmail.com> | 2014-10-16 16:41:02 -0500 |
| commit | 85da4a5e2621dc5f5356d440735aa058008a1b7e (patch) | |
| tree | c22286d67c5f737100cb690c971818d06a219962 | |
| parent | ad770d739cd7d68dd16b4b2e23d4822ebeb3305b (diff) | |
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
| -rw-r--r-- | init.d/netmount.in | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/init.d/netmount.in b/init.d/netmount.in index 39ab0bca..f6145f0f 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" |