let init.d script create needed dirs #113486

Package-Manager: portage-2.0.53_rc7

3 files changed, 17 insertions, 10 deletions

diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index 1654c2d501c9..88f883adca28 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -5,7 +5,7 @@ MD5 b2c2e3d2fe34adf5699943ba00ccb402 ChangeLog 10586
 MD5 3a3d8bd1a03bbf2c51a4e77a3516febd files/digest-nfs-utils-1.0.6-r6 67
 MD5 46e91b0dea9cbbfedcdccc9386b6326d files/digest-nfs-utils-1.0.7-r2 67
 MD5 a02eed87e5d581e56feb0f6dfd18e6df files/exports 66
-MD5 8d3d9ac54a272ccbd554d80df273c51a files/nfs 6750
+MD5 1d8228f424a87830f927ea90b9ad2b7f files/nfs 6863
 MD5 3c693e012dcb68827b8f82cc98fa129b files/nfs-utils-0.3.3-rquotad-overflow.patch 1243
 MD5 3878538fac900450212b414f8c8c39ab files/nfs-utils-1.0.6-uclibc.patch 547
 MD5 df57bdbe3dfddd40cda65b04509d5957 files/nfs-utils-1.0.6-usn36.patch.gz 5596
@@ -15,11 +15,11 @@ MD5 fc332370f9517304bc251f505b17abf2 files/nfs.confd 533
 MD5 1f3e6130e4a60767a213d34ff3131ae4 files/nfsmount 1171
 MD5 9cee4adcef8a47ea4ee35090f7f89b0a metadata.xml 225
 MD5 a5785bca6bda4d00aabdc28e36802df1 nfs-utils-1.0.6-r6.ebuild 2926
-MD5 e29c1034de44312ab28a6111ba2722d0 nfs-utils-1.0.7-r2.ebuild 3375
+MD5 5aa17cc2095bdbd3379b5eb15ab91784 nfs-utils-1.0.7-r2.ebuild 3346
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDgC9+gIKl8Uu19MoRAvjRAJ9HSktAQIl3PfgcNCvNKaBml9pEowCeJPhU
-egCZMrbX29QHCcDq9M2DLSU=
-=lRLX
+iD8DBQFDh2wXgIKl8Uu19MoRAlA/AJ9b27bwsD0DyiFW3eAzbT7Yr553fQCfdRO6
+duqdK9M83hIJcolGZzmYf14=
+=daug
 -----END PGP SIGNATURE-----
diff --git a/net-fs/nfs-utils/files/nfs b/net-fs/nfs-utils/files/nfs
index 1fafe55f5590..07e68475e979 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.11 2005/10/08 20:34:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs,v 1.12 2005/11/25 19:53:01 vapier Exp $
 
 #---------------------------------------------------------------------------
 # This script starts/stops the following
@@ -35,10 +35,16 @@ depend() {
 	after quota
 }
 
+mkdir_nfsdirs() {
+	local d
+	for d in /var/lib/nfs/{rpc_pipefs,v4recovery,v4root} ; do
+		[[ ! -d ${d} ]] && mkdir -p "${d}"
+	done
+}
+
 mount_pipefs() {
 	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 $?
@@ -140,7 +146,7 @@ waitfor_exportfs() {
 
 start() {
 	# Make sure nfs support is loaded in the kernel #64709
-	if [ -e /proc/modules ] ; then
+	if [[ -e /proc/modules ]] && ! grep -qs nfsd /proc/filesystems ; then
 		modprobe nfsd &> /dev/null
 	fi
 
@@ -154,6 +160,8 @@ start() {
 	fi
 	# now that nfsd is mounted inside /proc, we can safely start mountd later
 
+	mkdir_nfsdirs
+
 	mount_pipefs
 	start_idmapd
 	start_gssd
diff --git a/net-fs/nfs-utils/nfs-utils-1.0.7-r2.ebuild b/net-fs/nfs-utils/nfs-utils-1.0.7-r2.ebuild
index aad0f0722255..2e88e93c60a9 100644
--- a/net-fs/nfs-utils/nfs-utils-1.0.7-r2.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-1.0.7-r2.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-r2.ebuild,v 1.2 2005/11/20 08:09:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.0.7-r2.ebuild,v 1.3 2005/11/25 19:53:01 vapier Exp $
 
 inherit eutils flag-o-matic
 
@@ -73,7 +73,6 @@ src_install() {
 	keepdir /var/lib/nfs/{sm,sm.bak}
 	mv "${D}"/var/lib/nfs/* "${D}"/usr/lib/nfs
 	keepdir /var/lib/nfs
-	keepdir /var/lib/nfs/v4root
 
 	# Install some client-side binaries in /sbin
 	dodir /sbin