commit: 85da4a5e2621dc5f5356d440735aa058008a1b7e Author: William Hubbs <w.d.hubbs <AT> gmail <DOT> com> AuthorDate: Wed Oct 1 22:14:25 2014 +0000 Commit: William Hubbs <williamh <AT> gentoo <DOT> org> CommitDate: Thu Oct 16 21:41:02 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=85da4a5e
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 --- init.d/netmount.in | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/init.d/netmount.in b/init.d/netmount.in index 39ab0bc..f6145f0 100644 --- a/init.d/netmount.in +++ b/init.d/netmount.in @@ -2,10 +2,7 @@ # Copyright (c) 2007-2009 Roy Marples <r...@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"
