From: Mike Frysinger <vapier@gentoo.org>
Date: Sat, 24 Mar 2007 10:14:43 +0000 (+0000)
Subject: Mount nfsd filesystem at /proc/fs/nfsd rather than /proc/fs/nfs.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4330b400b5d7a40ec35cc64fa909fa86cf1743ce;p=gentoo.git

Mount nfsd filesystem at /proc/fs/nfsd rather than /proc/fs/nfs.
Package-Manager: portage-2.1.2.2
---

diff --git a/net-fs/nfs-utils/ChangeLog b/net-fs/nfs-utils/ChangeLog
index e25872cc4245..5714bd4ac525 100644
--- a/net-fs/nfs-utils/ChangeLog
+++ b/net-fs/nfs-utils/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-fs/nfs-utils
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.88 2007/03/24 09:14:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.89 2007/03/24 10:14:43 vapier Exp $
+
+  24 Mar 2007; Mike Frysinger <vapier@gentoo.org> files/nfs:
+  Mount nfsd filesystem at /proc/fs/nfsd rather than /proc/fs/nfs.
 
 *nfs-utils-1.0.12-r1 (24 Mar 2007)
 
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index f016cc85af29..f15c24a3d06e 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -5,10 +5,10 @@ AUX exports 66 RMD160 0a61ad40dc321be39fb54d5b9fe717caa714e878 SHA1 52ed6b74643e
 MD5 a02eed87e5d581e56feb0f6dfd18e6df files/exports 66
 RMD160 0a61ad40dc321be39fb54d5b9fe717caa714e878 files/exports 66
 SHA256 5d6356df546682e2f1a87131d1bb67de9b1f9a34d3a5742343dc64e890cf71d5 files/exports 66
-AUX nfs 6877 RMD160 ae366a1cb1f3d1537154e316bb72a9fad8615aeb SHA1 45cd7850a56acc9a17b6b1659e21087de8105dbd SHA256 c795cf3a62f54c1679687a2bbdd8db8f2613487a4745c610ecb1b11214193d3f
-MD5 c6414f38e3c66119e2038df34d67cb11 files/nfs 6877
-RMD160 ae366a1cb1f3d1537154e316bb72a9fad8615aeb files/nfs 6877
-SHA256 c795cf3a62f54c1679687a2bbdd8db8f2613487a4745c610ecb1b11214193d3f files/nfs 6877
+AUX nfs 6879 RMD160 2016eebfaaa69337eee02e2b2a973f7b7e5798ad SHA1 c2d35305c9a4d6d47c5f2611324cfa0fe33e741d SHA256 25d6f28b67b4c90f0fa1b9a2cbff54240d527f83a1c61faac9d8f8dcbd72d680
+MD5 bc3242a5ff4a16c50ff4d972e88b7d64 files/nfs 6879
+RMD160 2016eebfaaa69337eee02e2b2a973f7b7e5798ad files/nfs 6879
+SHA256 25d6f28b67b4c90f0fa1b9a2cbff54240d527f83a1c61faac9d8f8dcbd72d680 files/nfs 6879
 AUX nfs-utils-0.3.3-rquotad-overflow.patch 1243 RMD160 6ee6c4780080fc85ab51064a816fb2fa505ea0c5 SHA1 4078e806388cdcea5218e10d2ba5a1cf1e1fcb41 SHA256 eab80cae9dca3c9682f124981ae79cb5f953aff53a4f7e456df6dc15513cc568
 MD5 3c693e012dcb68827b8f82cc98fa129b files/nfs-utils-0.3.3-rquotad-overflow.patch 1243
 RMD160 6ee6c4780080fc85ab51064a816fb2fa505ea0c5 files/nfs-utils-0.3.3-rquotad-overflow.patch 1243
@@ -80,10 +80,10 @@ EBUILD nfs-utils-1.0.9.ebuild 2929 RMD160 08b61561f8adac0c2ca22f42ed3b0cbdb29f6d
 MD5 3d5497055a0b9b1fd93b31364e577b95 nfs-utils-1.0.9.ebuild 2929
 RMD160 08b61561f8adac0c2ca22f42ed3b0cbdb29f6d96 nfs-utils-1.0.9.ebuild 2929
 SHA256 94753c05c1352c7655e9a1a38d60f212a56a1c4ab22f64522c0e19428145b08b nfs-utils-1.0.9.ebuild 2929
-MISC ChangeLog 12850 RMD160 d74361ebcfbce488232ebd3a48f82ec7da8ca663 SHA1 07fd91b997093d29161e88b9292deb337551f947 SHA256 050f9e043fbaf72e486998a4bc40d934cbeb6f543dca718f5a68959e2b88d474
-MD5 a6a4044f794f679ea2cb9bac7223e57c ChangeLog 12850
-RMD160 d74361ebcfbce488232ebd3a48f82ec7da8ca663 ChangeLog 12850
-SHA256 050f9e043fbaf72e486998a4bc40d934cbeb6f543dca718f5a68959e2b88d474 ChangeLog 12850
+MISC ChangeLog 12979 RMD160 c125caefe33ac80a77ce4cdf66cbdbce1482b769 SHA1 8f42a64f4e17d042d31112e039633ee9e0422a65 SHA256 d7fe479d29fa2b86d75e501653fa5307b865df29c3b8e36af11b7693be71834a
+MD5 466682111a94917c71d6d21c27fb2082 ChangeLog 12979
+RMD160 c125caefe33ac80a77ce4cdf66cbdbce1482b769 ChangeLog 12979
+SHA256 d7fe479d29fa2b86d75e501653fa5307b865df29c3b8e36af11b7693be71834a ChangeLog 12979
 MISC metadata.xml 225 RMD160 477581252d7edf18d7b8a274766e2ed04c61935a SHA1 02c4f79d48d465ad7bca76f706d0f7cb7dd039df SHA256 42f511d0cc6e82e29b011c686ba8bb7965f4d92eb6e47ba3e63d4c7edfe9883a
 MD5 9cee4adcef8a47ea4ee35090f7f89b0a metadata.xml 225
 RMD160 477581252d7edf18d7b8a274766e2ed04c61935a metadata.xml 225
@@ -109,7 +109,7 @@ SHA256 45ce27b77bf35f168dee66b458d6ecd57242510bfb9fedf1a637b9b795dea73f files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGBOv68bi6rjpTunYRApTGAKDVhmxdeeAqIEJ8r9OEzZaEvqqioACgugaz
-WmjRJZ2eGhG4n9s4rPkuns0=
-=fyjh
+iD8DBQFGBPoy8bi6rjpTunYRAlDwAJ0TVmtLh/A9KaxNvwJ3AaeLVNb91wCZAb8G
+N9E7kA8+JyTUPh/ZtDItNRQ=
+=iw3b
 -----END PGP SIGNATURE-----
diff --git a/net-fs/nfs-utils/files/nfs b/net-fs/nfs-utils/files/nfs
index 5d9adf0ed976..1c37706bf7bc 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.13 2007/01/10 00:49:52 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs,v 1.14 2007/03/24 10:14:43 vapier Exp $
 
 #---------------------------------------------------------------------------
 # This script starts/stops the following
@@ -151,10 +151,10 @@ start() {
 	fi
 
 	# This is the new "kernel 2.6 way" to handle the exports file
-	if grep -q nfsd /proc/filesystems &>/dev/null; then
-		if ! grep -q "nfsd /proc/fs/nfs" /proc/mounts &>/dev/null; then
+	if grep -qs nfsd /proc/filesystems ; then
+		if ! grep -qs "^nfsd[[:space:]]/proc/fs/nfsd[[:space:]]" /proc/mounts ; then
 			ebegin "Mounting nfsd filesystem in /proc"
-			mount -t nfsd nfsd /proc/fs/nfs
+			mount -t nfsd nfsd /proc/fs/nfsd
 			eend $? "Error mounting nfsd filesystem in /proc"
 		fi
 	fi