[gentoo-commits] gentoo-x86 commit in net-fs/nfs-utils/files: rpc.idmapd.initd nfs.initd rpc.statd.initd rpc.gssd.initd digest-nfs-utils-1.1.1

[Mike Frysinger (vapier)]

vapier      07/12/29 09:33:28

  Modified:             rpc.idmapd.initd nfs.initd rpc.statd.initd
                        rpc.gssd.initd
  Added:                digest-nfs-utils-1.1.1
  Log:
  Version bump #197336 by Francisco Javier.  Tweak nfs init.d needs based on exportfs #172431.  Only mount nfsd fs in nfs init.d script.  Mount rpc_pipefs in rpc.idmapd and rpc.gssd after making sure the dir exists #180425 by Maurice Volaski.
  (Portage version: 2.1.4_rc11)

Revision  Changes    Path
1.4                  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.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/nfs-utils/files/rpc.idmapd.initd?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/nfs-utils/files/rpc.idmapd.initd?r1=1.3&r2=1.4

Index: rpc.idmapd.initd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.idmapd.initd,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rpc.idmapd.initd	12 May 2007 11:27:06 -0000	1.3
+++ rpc.idmapd.initd	29 Dec 2007 09:33:28 -0000	1.4
@@ -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.3 2007/05/12 11:27:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.idmapd.initd,v 1.4 2007/12/29 09:33:28 vapier Exp $
 
 [ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs
 
@@ -21,6 +21,7 @@
 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 $?
@@ -28,33 +29,7 @@
 	fi
 }
 
-umount_pipefs() {
-	[ "${restarting}" = "yes" -o "${RC_CMD}" = "restart" ] && return 0
-	if grep -qs "rpc_pipefs /var/lib/nfs/rpc_pipefs" /proc/mounts ; then
-		ebegin "Unmounting RPC pipefs"
-		umount /var/lib/nfs/rpc_pipefs
-		eend $?
-	fi
-}
-
-mount_nfsd() {
-	# Make sure nfs support is loaded in the kernel #64709
-	if [ -e /proc/modules ] && ! grep -qs nfsd /proc/filesystems ; then
-		modprobe nfsd &> /dev/null
-	fi
-
-	# This is the new "kernel 2.6 way" to handle the exports file
-	if grep -qs nfsd /proc/filesystems ; then
-		if ! grep -qs "nfsd /proc/fs/nfs" /proc/mounts ; then
-			ebegin "Mounting nfsd filesystem in /proc"
-			mount -t nfsd -o nodev,noexec,nosuid nfsd /proc/fs/nfs
-			eend $?
-		fi
-	fi
-}
-
 start() {
-	mount_nfsd
 	mount_pipefs
 
 	ebegin "Starting idmapd"
@@ -63,16 +38,9 @@
 }
 
 stop() {
-	local ret
-
 	ebegin "Stopping idmapd"
 	start-stop-daemon --stop --quiet --exec ${rpc_bin}
-	ret=$?
-	eend ${ret}
-
-	umount_pipefs
-
-	return ${ret}
+	eend $?
 }
 
 restart() {



1.7                  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.7&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/nfs-utils/files/nfs.initd?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/nfs-utils/files/nfs.initd?r1=1.6&r2=1.7

Index: nfs.initd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs.initd,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- nfs.initd	16 Aug 2007 23:35:19 -0000	1.6
+++ nfs.initd	29 Dec 2007 09:33:28 -0000	1.7
@@ -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.6 2007/08/16 23:35:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs.initd,v 1.7 2007/12/29 09:33:28 vapier Exp $
 
 opts="reload"
 
@@ -17,10 +17,9 @@
 
 depend() {
 	local myneed=""
-	awk '!/^[[:space:]]*#/ && $3 == "nfs4" { exit ($4 ~ /sec=krb/ ? 1 : 2) }' /etc/fstab
-	local ret=$?
-	[ ${ret} -ne 0 ] && myneed="${myneed} rpc.idmapd"
-	[ ${ret} -eq 1 ] && myneed="${myneed} rpc.gssd"
+	if ! awk '!/^[[:space:]]*#/ && $2 ~ /sec=/ { exit 1 }' /etc/exports ; then
+		myneed="${myneed} rpc.gssd"
+	fi
 	need portmap rpc.statd ${myneed}
 	use ypbind net dns rpc.rquotad rpc.idmapd rpc.gssd
 	after quota



1.5                  net-fs/nfs-utils/files/rpc.statd.initd

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

Index: rpc.statd.initd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.statd.initd,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rpc.statd.initd	29 Dec 2007 06:57:34 -0000	1.4
+++ rpc.statd.initd	29 Dec 2007 09:33:28 -0000	1.5
@@ -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.statd.initd,v 1.4 2007/12/29 06:57:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.statd.initd,v 1.5 2007/12/29 09:33:28 vapier Exp $
 
 [ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs
 
@@ -14,22 +14,6 @@
 	after quota
 }
 
-mount_nfsd() {
-	# Make sure nfs support is loaded in the kernel #64709
-	if [ -e /proc/modules ] && ! grep -qs nfsd /proc/filesystems ; then
-		modprobe nfsd &> /dev/null
-	fi
-
-	# This is the new "kernel 2.6 way" to handle the exports file
-	if grep -qs nfsd /proc/filesystems ; then
-		if ! grep -qs "nfsd /proc/fs/nfs" /proc/mounts ; then
-			ebegin "Mounting nfsd filesystem in /proc"
-			mount -t nfsd -o nodev,noexec,nosuid nfsd /proc/fs/nfs
-			eend $?
-		fi
-	fi
-}
-
 is_running() {
 	# Don't start rpc.statd if already started by someone else ...
 	# Don't try and kill it if it's already dead ...
@@ -37,11 +21,9 @@
 }
 
 start() {
-	mount_nfsd
-
 	is_running && return 0
 	ebegin "Starting NFS statd"
-	start-stop-daemon --start --quiet --exec ${rpc_bin} -- ${OPTS_RPC_STATD}
+	start-stop-daemon --start --quiet --exec ${rpc_bin} -- --no-notify ${OPTS_RPC_STATD}
 	eend $?
 }
 



1.5                  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.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/nfs-utils/files/rpc.gssd.initd?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/nfs-utils/files/rpc.gssd.initd?r1=1.4&r2=1.5

Index: rpc.gssd.initd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.gssd.initd,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rpc.gssd.initd	12 May 2007 11:27:06 -0000	1.4
+++ rpc.gssd.initd	29 Dec 2007 09:33:28 -0000	1.5
@@ -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.gssd.initd,v 1.4 2007/05/12 11:27:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.gssd.initd,v 1.5 2007/12/29 09:33:28 vapier Exp $
 
 [ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs
 
@@ -14,17 +14,12 @@
 	after quota
 }
 
-mount_nfsd() {
-	# Make sure nfs support is loaded in the kernel #64709
-	if [ -e /proc/modules ] && ! grep -qs nfsd /proc/filesystems ; then
-		modprobe nfsd &> /dev/null
-	fi
-
-	# This is the new "kernel 2.6 way" to handle the exports file
-	if grep -qs nfsd /proc/filesystems ; then
-		if ! grep -qs "nfsd /proc/fs/nfs" /proc/mounts ; then
-			ebegin "Mounting nfsd filesystem in /proc"
-			mount -t nfsd -o nodev,noexec,nosuid nfsd /proc/fs/nfs
+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
@@ -38,7 +33,7 @@
 	ret=$((ret + $?))
 }
 start() {
-	mount_nfsd
+	mount_pipefs
 
 	local ret=0
 	start_it gssd ${gssd} ${OPTS_RPC_GSSD}



1.1                  net-fs/nfs-utils/files/digest-nfs-utils-1.1.1

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

Index: digest-nfs-utils-1.1.1
===================================================================
MD5 d1bc62def760c79f6f77925ed2937b0b nfs-utils-1.1.1-001-xlog_segfault_fix.dif 1222
RMD160 5635abdd46e0b24a23fd54748d1c42dc32171a21 nfs-utils-1.1.1-001-xlog_segfault_fix.dif 1222
SHA256 dc1aecf7f989ac0564e51c6b75827429a8407402f87b594ff6d413d41b318dcb nfs-utils-1.1.1-001-xlog_segfault_fix.dif 1222
MD5 c8dc8379fb32c8044e3c1f20dd86793d nfs-utils-1.1.1-002-svcgssd_pass_down_principal_name.dif 6533
RMD160 a37d368c230c6e680d44978b17c807ff9c2a72eb nfs-utils-1.1.1-002-svcgssd_pass_down_principal_name.dif 6533
SHA256 41011ec373d0ca628857738b633068681d569d547b1c80f3c448730eea518af5 nfs-utils-1.1.1-002-svcgssd_pass_down_principal_name.dif 6533
MD5 407785488241f9db67b1874e3f36370e nfs-utils-1.1.1.tar.gz 803906
RMD160 e56bd8f06ad116a48e79cb819dcc693ae0dc7cdd nfs-utils-1.1.1.tar.gz 803906
SHA256 3d642d5adaf91f047396b873394f50fa8bb976e7f067a027ccebd1b319194429 nfs-utils-1.1.1.tar.gz 803906



-- 
gentoo-commits@g.o mailing list