Add support for integrated idmapd #71607 by Keith M Wesolowski.

Package-Manager: portage-2.0.51.19

6 files changed, 58 insertions, 17 deletions

diff --git a/net-fs/nfs-utils/ChangeLog b/net-fs/nfs-utils/ChangeLog
index d789155a1dfb..e65af3187f1a 100644
--- a/net-fs/nfs-utils/ChangeLog
+++ b/net-fs/nfs-utils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-fs/nfs-utils
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.66 2005/02/05 01:43:53 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.67 2005/03/15 05:43:49 vapier Exp $
+
+*nfs-utils-1.0.7-r1 (15 Mar 2005)
+
+  15 Mar 2005; Mike Frysinger <vapier@gentoo.org> files/nfs,
+  files/nfs.confd, -nfs-utils-1.0.7.ebuild, +nfs-utils-1.0.7-r1.ebuild:
+  Add support for integrated idmapd #71607 by Keith M Wesolowski.
 
 *nfs-utils-1.0.7 (04 Feb 2005)
 
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index b31e9aeb61a8..5cb951569fe9 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -1,13 +1,13 @@
-MD5 0bf4e0b17c916406a441b8d5e2ca8308 ChangeLog 9781
+MD5 75f56d496900cb694d2638cd67c82759 ChangeLog 10014
 MD5 9cee4adcef8a47ea4ee35090f7f89b0a metadata.xml 225
 MD5 a5785bca6bda4d00aabdc28e36802df1 nfs-utils-1.0.6-r6.ebuild 2926
-MD5 d35b63443f735e275ff9937e4f463dd7 nfs-utils-1.0.7.ebuild 2905
-MD5 d8ecaecabf0d9c9bfb7d6c437e59bf5f files/nfs 5278
-MD5 46e91b0dea9cbbfedcdccc9386b6326d files/digest-nfs-utils-1.0.7 67
+MD5 15d5d313d9876b6e8439131efa41ebc8 nfs-utils-1.0.7-r1.ebuild 2908
+MD5 21621dd473ef1b9bf3d4fdde0b738c51 files/nfs 5964
 MD5 a02eed87e5d581e56feb0f6dfd18e6df files/exports 66
-MD5 a23ae1dac684526aeaa679372648f9bf files/nfs.confd 616
+MD5 3defefc4b3e59990198a2e0cb797d4da files/nfs.confd 666
 MD5 b8368dca9c921631ed7019c5c08c3a11 files/nfsmount 1163
 MD5 3878538fac900450212b414f8c8c39ab files/nfs-utils-1.0.6-uclibc.patch 547
 MD5 df57bdbe3dfddd40cda65b04509d5957 files/nfs-utils-1.0.6-usn36.patch.gz 5596
 MD5 3c693e012dcb68827b8f82cc98fa129b files/nfs-utils-0.3.3-rquotad-overflow.patch 1243
 MD5 3a3d8bd1a03bbf2c51a4e77a3516febd files/digest-nfs-utils-1.0.6-r6 67
+MD5 46e91b0dea9cbbfedcdccc9386b6326d files/digest-nfs-utils-1.0.7-r1 67
diff --git a/net-fs/nfs-utils/files/digest-nfs-utils-1.0.7 b/net-fs/nfs-utils/files/digest-nfs-utils-1.0.7-r1
index 0b0ec24d0c0b..0b0ec24d0c0b 100644
--- a/net-fs/nfs-utils/files/digest-nfs-utils-1.0.7
+++ b/net-fs/nfs-utils/files/digest-nfs-utils-1.0.7-r1
diff --git a/net-fs/nfs-utils/files/nfs b/net-fs/nfs-utils/files/nfs
index 566fcea761b9..489eaec9d7bf 100755
--- a/net-fs/nfs-utils/files/nfs
+++ b/net-fs/nfs-utils/files/nfs
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs,v 1.9 2005/03/15 05:23:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs,v 1.10 2005/03/15 05:43:49 vapier Exp $
 
 #---------------------------------------------------------------------------
 # This script starts/stops the following
@@ -17,26 +17,56 @@ opts="reload"
 
 # This variable is used for controlling whether or not to run exportfs -ua;
 # see stop() for more information
-restarting=yes
+restarting=no
 
 # The binary locations
 exportfs=/usr/sbin/exportfs
 statd=/sbin/rpc.statd
+idmapd=/usr/sbin/rpc.idmapd
 rquotad=/usr/sbin/rpc.rquotad
 nfsd=/usr/sbin/rpc.nfsd
 mountd=/usr/sbin/rpc.mountd
 
 depend() {
-	use ypbind
+	use ypbind net
+	need portmap
+	after quota
+}
+
+start_idmapd() {
+	[[ ! -x ${idmapd} ]] && return 0
 
-	local myneed="net portmap"
-	if [ -x /sbin/idmapd ] ; then
-		if grep -q rpc_pipefs /proc/filesystems &>/dev/null; then
-			myneed="${myneed} idmapd"
+	if grep -q rpc_pipefs /proc/filesystems ; then
+		if ! grep -q "rpc_pipefs /var/lib/nfs/rpc_pipefs" /proc/mounts ; then
+			[[ ! -d /var/lib/nfs/rpc_pipefs ]] && 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
-	need ${myneed}
-	after quota
+
+	ebegin "Starting idmapd"
+	${idmapd} ${RPCIDMAPDOPTS}
+	eend $?
+}
+
+stop_idmapd() {
+	[[ ! -x ${idmapd} ]] && return 0
+
+	ebegin "Stopping idmapd"
+	start-stop-daemon --stop --quiet --exec ${idmapd}
+	ret=$?
+	eend ${ret}
+
+	if [[ $restarting == "no" ]] ; then
+		if grep -q "rpc_pipefs /var/lib/nfs/rpc_pipefs" /proc/mounts ; then
+			ebegin "Unmounting RPC pipefs"
+			umount /var/lib/nfs/rpc_pipefs
+			eend $?
+		fi
+	fi
+
+	return ${ret}
 }
 
 start_statd() {
@@ -81,6 +111,7 @@ start() {
 	fi
 	# now that nfsd is mounted inside /proc, we can safely start mountd later
 
+	start_idmapd
 	start_statd
 
 	# Exportfs likes to hang if networking isn't working.
@@ -157,6 +188,7 @@ stop() {
 	fi
 
 	stop_statd
+	stop_idmapd
 }
 
 reload() {
diff --git a/net-fs/nfs-utils/files/nfs.confd b/net-fs/nfs-utils/files/nfs.confd
index 77bea666e568..346158174e8e 100644
--- a/net-fs/nfs-utils/files/nfs.confd
+++ b/net-fs/nfs-utils/files/nfs.confd
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs.confd,v 1.7 2004/10/09 18:51:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs.confd,v 1.8 2005/03/15 05:43:49 vapier Exp $
 
 # Config file for /etc/init.d/nfs
 
@@ -18,5 +18,8 @@ RPCMOUNTDOPTS=""
 # ex. RPCSTATDOPTS="-p 32765 -o 32766"
 RPCSTATDOPTS=""
 
+# Options to pass to rpc.idmapd
+RPCIDMAPDOPTS=""
+
 # Timeout (in seconds) for exportfs
 EXPORTFSTIMEOUT=30
diff --git a/net-fs/nfs-utils/nfs-utils-1.0.7.ebuild b/net-fs/nfs-utils/nfs-utils-1.0.7-r1.ebuild
index 41de5e22f237..e7cc1f009fd6 100644
--- a/net-fs/nfs-utils/nfs-utils-1.0.7.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-1.0.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.0.7.ebuild,v 1.3 2005/03/15 05:23:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.0.7-r1.ebuild,v 1.1 2005/03/15 05:43:49 vapier Exp $
 
 inherit gnuconfig eutils flag-o-matic