From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id D9CF01387B1 for ; Sat, 18 Oct 2014 18:54:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 59728E09FD; Sat, 18 Oct 2014 18:54:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 16828E09FD for ; Sat, 18 Oct 2014 18:54:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1558534028C for ; Sat, 18 Oct 2014 18:54:04 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4B18082E7 for ; Sat, 18 Oct 2014 18:54:02 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1413495662.85da4a5e2621dc5f5356d440735aa058008a1b7e.williamh@OpenRC> Subject: [gentoo-commits] proj/openrc:master commit in: init.d/ X-VCS-Repository: proj/openrc X-VCS-Files: init.d/netmount.in X-VCS-Directories: init.d/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 85da4a5e2621dc5f5356d440735aa058008a1b7e X-VCS-Branch: master Date: Sat, 18 Oct 2014 18:54:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 640881a6-319a-46b7-aa03-58f8359984fa X-Archives-Hash: 33f70b71c295d06733cc72eb518e7c3f commit: 85da4a5e2621dc5f5356d440735aa058008a1b7e Author: William Hubbs gmail com> AuthorDate: Wed Oct 1 22:14:25 2014 +0000 Commit: William Hubbs gentoo 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 # 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"