[gentoo-commits] gentoo-x86 commit in net-fs/nfs-utils/files: rpc.idmapd.initd nfsmount.initd nfs.initd rpc.svcgssd.initd rpc.gssd.initd nfs-utils-1.1.2-mount-eacces.patch

[Mike Frysinger (vapier)]

vapier      08/05/04 09:53:34

  Modified:             rpc.idmapd.initd nfsmount.initd nfs.initd
                        rpc.svcgssd.initd rpc.gssd.initd
  Added:                nfs-utils-1.1.2-mount-eacces.patch
  Log:
  Dont bother checking for config anymore #219495 by Davide Pesavento.  Load sunrpc module if rpc_pipefs is not available #219566 by Martin von Gagern.  Add change from Fedora to exit immediately upon perm denied errors when mounting #219729 by Stefaan De Roeck.
  (Portage version: 2.2_pre5)

Revision  Changes    Path
1.6                  net-fs/nfs-utils/files/rpc.idmapd.initd

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/nfs-utils/files/rpc.idmapd.initd?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/nfs-utils/files/rpc.idmapd.initd?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/nfs-utils/files/rpc.idmapd.initd?r1=1.5&r2=1.6

Index: rpc.idmapd.initd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.idmapd.initd,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rpc.idmapd.initd	4 Feb 2008 22:23:24 -0000	1.5
+++ rpc.idmapd.initd	4 May 2008 09:53:34 -0000	1.6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.idmapd.initd,v 1.5 2008/02/04 22:23:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.idmapd.initd,v 1.6 2008/05/04 09:53:34 vapier Exp $
 
 [ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs
 
@@ -19,14 +19,19 @@
 }
 
 mount_pipefs() {
-	if grep -qs rpc_pipefs /proc/filesystems ; then
-		if ! grep -qs "rpc_pipefs /var/lib/nfs/rpc_pipefs" /proc/mounts ; then
-			mkdir -p /var/lib/nfs/rpc_pipefs
-			ebegin "Mounting RPC pipefs"
-			mount -t rpc_pipefs rpc_pipefs /var/lib/nfs/rpc_pipefs
-			eend $?
-		fi
-	fi
+	# if things are already mounted, let's just return
+	grep -qs "rpc_pipefs /var/lib/nfs/rpc_pipefs" /proc/mounts && return 0
+
+	# if rpc_pipefs is not available, try to load sunrpc for it #219566
+	grep -qs rpc_pipefs /proc/filesystems || modprobe -q sunrpc
+	# if still not available, let's bail
+	grep -qs rpc_pipefs /proc/filesystems || return 1
+
+	# now just do it for kicks
+	mkdir -p /var/lib/nfs/rpc_pipefs
+	ebegin "Mounting RPC pipefs"
+	mount -t rpc_pipefs rpc_pipefs /var/lib/nfs/rpc_pipefs
+	eend $?
 }
 
 start() {



1.12                 net-fs/nfs-utils/files/nfsmount.initd

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/nfs-utils/files/nfsmount.initd?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/nfs-utils/files/nfsmount.initd?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/nfs-utils/files/nfsmount.initd?r1=1.11&r2=1.12

Index: nfsmount.initd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfsmount.initd,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- nfsmount.initd	22 Apr 2008 07:43:16 -0000	1.11
+++ nfsmount.initd	4 May 2008 09:53:34 -0000	1.12
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfsmount.initd,v 1.11 2008/04/22 07:43:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfsmount.initd,v 1.12 2008/05/04 09:53:34 vapier Exp $
 
 [ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs
 
@@ -13,7 +13,7 @@
 		[ ${ret} -eq 10 ] && myneed="${myneed} rpc.gssd"
 		[ ${ret} -eq 20 ] && myneed="${myneed} rpc.idmapd"
 	fi
-	type -t config 2>/dev/null 1>&2 && config /etc/fstab
+	config /etc/fstab
 	need net portmap rpc.statd ${myneed}
 	use ypbind dns rpc.idmapd rpc.gssd
 }



1.13                 net-fs/nfs-utils/files/nfs.initd

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/nfs-utils/files/nfs.initd?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/nfs-utils/files/nfs.initd?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/nfs-utils/files/nfs.initd?r1=1.12&r2=1.13

Index: nfs.initd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs.initd,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- nfs.initd	20 Apr 2008 00:52:24 -0000	1.12
+++ nfs.initd	4 May 2008 09:53:34 -0000	1.13
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs.initd,v 1.12 2008/04/20 00:52:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs.initd,v 1.13 2008/05/04 09:53:34 vapier Exp $
 
 opts="reload"
 
@@ -22,7 +22,7 @@
 			myneed="${myneed} rpc.svcgssd"
 		fi
 	fi
-	type -t config 2>/dev/null 1>&2 && config /etc/exports
+	config /etc/fstab
 	need portmap rpc.statd ${myneed}
 	use ypbind net dns rpc.rquotad rpc.idmapd rpc.svcgssd
 	after quota



1.3                  net-fs/nfs-utils/files/rpc.svcgssd.initd

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/nfs-utils/files/rpc.svcgssd.initd?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/nfs-utils/files/rpc.svcgssd.initd?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/nfs-utils/files/rpc.svcgssd.initd?r1=1.2&r2=1.3

Index: rpc.svcgssd.initd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.svcgssd.initd,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rpc.svcgssd.initd	21 Apr 2008 07:56:15 -0000	1.2
+++ rpc.svcgssd.initd	4 May 2008 09:53:34 -0000	1.3
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.svcgssd.initd,v 1.2 2008/04/21 07:56:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.svcgssd.initd,v 1.3 2008/05/04 09:53:34 vapier Exp $
 
 [ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs
 
@@ -12,14 +12,19 @@
 }
 
 mount_pipefs() {
-	if grep -qs rpc_pipefs /proc/filesystems ; then
-		if ! grep -qs "rpc_pipefs /var/lib/nfs/rpc_pipefs" /proc/mounts ; then
-			mkdir -p /var/lib/nfs/rpc_pipefs
-			ebegin "Mounting RPC pipefs"
-			mount -t rpc_pipefs rpc_pipefs /var/lib/nfs/rpc_pipefs
-			eend $?
-		fi
-	fi
+	# if things are already mounted, let's just return
+	grep -qs "rpc_pipefs /var/lib/nfs/rpc_pipefs" /proc/mounts && return 0
+
+	# if rpc_pipefs is not available, try to load sunrpc for it #219566
+	grep -qs rpc_pipefs /proc/filesystems || modprobe -q sunrpc
+	# if still not available, let's bail
+	grep -qs rpc_pipefs /proc/filesystems || return 1
+
+	# now just do it for kicks
+	mkdir -p /var/lib/nfs/rpc_pipefs
+	ebegin "Mounting RPC pipefs"
+	mount -t rpc_pipefs rpc_pipefs /var/lib/nfs/rpc_pipefs
+	eend $?
 }
 
 start() {



1.9                  net-fs/nfs-utils/files/rpc.gssd.initd

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/nfs-utils/files/rpc.gssd.initd?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/nfs-utils/files/rpc.gssd.initd?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/nfs-utils/files/rpc.gssd.initd?r1=1.8&r2=1.9

Index: rpc.gssd.initd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.gssd.initd,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- rpc.gssd.initd	21 Apr 2008 07:56:15 -0000	1.8
+++ rpc.gssd.initd	4 May 2008 09:53:34 -0000	1.9
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.gssd.initd,v 1.8 2008/04/21 07:56:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.gssd.initd,v 1.9 2008/05/04 09:53:34 vapier Exp $
 
 [ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs
 
@@ -12,14 +12,19 @@
 }
 
 mount_pipefs() {
-	if grep -qs rpc_pipefs /proc/filesystems ; then
-		if ! grep -qs "rpc_pipefs /var/lib/nfs/rpc_pipefs" /proc/mounts ; then
-			mkdir -p /var/lib/nfs/rpc_pipefs
-			ebegin "Mounting RPC pipefs"
-			mount -t rpc_pipefs rpc_pipefs /var/lib/nfs/rpc_pipefs
-			eend $?
-		fi
-	fi
+	# if things are already mounted, let's just return
+	grep -qs "rpc_pipefs /var/lib/nfs/rpc_pipefs" /proc/mounts && return 0
+
+	# if rpc_pipefs is not available, try to load sunrpc for it #219566
+	grep -qs rpc_pipefs /proc/filesystems || modprobe -q sunrpc
+	# if still not available, let's bail
+	grep -qs rpc_pipefs /proc/filesystems || return 1
+
+	# now just do it for kicks
+	mkdir -p /var/lib/nfs/rpc_pipefs
+	ebegin "Mounting RPC pipefs"
+	mount -t rpc_pipefs rpc_pipefs /var/lib/nfs/rpc_pipefs
+	eend $?
 }
 
 start() {



1.1                  net-fs/nfs-utils/files/nfs-utils-1.1.2-mount-eacces.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/nfs-utils/files/nfs-utils-1.1.2-mount-eacces.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/nfs-utils/files/nfs-utils-1.1.2-mount-eacces.patch?rev=1.1&content-type=text/plain

Index: nfs-utils-1.1.2-mount-eacces.patch
===================================================================
http://bugs.gentoo.org/219729

commit 697e28939b7d0a3e0ffe3b6bd516213a55f5a063
Author: Jeff Layton <jlaton@××××××.com>
Date:   Mon Apr 14 09:03:13 2008 -0400

    Change how mount.nfs handles EACCES errors. Currently,
    EACCES is a non-fatal error which means the mount will be
    retied. This caused mounts to hang for 2mins when the client
    does not have permission to access the export. In a strict
    interpretation, the error that should be returned is EPERM, but
    this is not always the case. So due to the fuzzy interpretation,
    of EPERM and EACCES, EACCESS is now a fatal error
    
    Signed-off-by: Steve Dickson <steved@××××××.com>

diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c
index cadb1f4..cdd610e 100644
--- a/utils/mount/stropts.c
+++ b/utils/mount/stropts.c
@@ -252,7 +252,6 @@ static int set_mandatory_options(const char *type,
 static int is_permanent_error(int error)
 {
 	switch (error) {
-	case EACCES:
 	case ESTALE:
 	case ETIMEDOUT:
 	case ECONNREFUSED:



-- 
gentoo-commits@l.g.o mailing list