Process /etc/exports.d/*.exports too #459600 by Joakim Tjernlund.

(Portage version: 2.2.0_alpha169/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)

2 files changed, 20 insertions, 19 deletions

diff --git a/net-fs/nfs-utils/ChangeLog b/net-fs/nfs-utils/ChangeLog
index dafcaaab0688..64bb770d85f1 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.209 2013/01/01 19:47:00 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.210 2013/03/24 19:37:22 vapier Exp $
+
+  24 Mar 2013; Mike Frysinger <vapier@gentoo.org> files/nfs.initd:
+  Process /etc/exports.d/*.exports too #459600 by Joakim Tjernlund.
 
   01 Jan 2013; Jeroen Roovers <jer@gentoo.org> nfs-utils-1.2.6.ebuild:
   Stable for HPPA (bug #445564).
diff --git a/net-fs/nfs-utils/files/nfs.initd b/net-fs/nfs-utils/files/nfs.initd
index c99a1bf849e9..ab25b4d18bee 100755
--- a/net-fs/nfs-utils/files/nfs.initd
+++ b/net-fs/nfs-utils/files/nfs.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 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.26 2011/09/18 01:51:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs.initd,v 1.27 2013/03/24 19:37:22 vapier Exp $
 
 extra_started_commands="reload"
 
@@ -17,20 +17,18 @@ smnotify=/usr/sbin/sm-notify
 
 depend() {
 	local myneed=""
-	if [ -e /etc/exports ] ; then
-		# XXX: no way to detect NFSv4 is desired and so need rpc.idmapd
-		myneed="${myneed} $(
-			awk '!/^[[:space:]]*#/ {
-				# clear the path to avoid spurious matches
-				$1 = "";
-				if ($0 ~ /[(][^)]*sec=(krb|spkm)[^)]*[)]/) {
-					print "rpc.svcgssd"
-					exit 0
-				}
-				}' /etc/exports
-			)"
-	fi
-	config /etc/exports
+	# XXX: no way to detect NFSv4 is desired and so need rpc.idmapd
+	myneed="${myneed} $(
+		awk '!/^[[:space:]]*#/ {
+			# clear the path to avoid spurious matches
+			$1 = "";
+			if ($0 ~ /[(][^)]*sec=(krb|spkm)[^)]*[)]/) {
+				print "rpc.svcgssd"
+				exit 0
+			}
+		}' /etc/exports /etc/exports.d/*.exports 2>/dev/null
+	)"
+	config /etc/exports /etc/exports.d/*.exports
 	need portmap rpc.statd ${myneed} ${NFS_NEEDED_SERVICES}
 	use ypbind net dns rpc.rquotad rpc.idmapd rpc.svcgssd
 	after quota
@@ -46,7 +44,7 @@ mkdir_nfsdirs() {
 
 waitfor_exportfs() {
 	local pid=$1
-	( sleep ${EXPORTFS_TIMEOUT:-30}; kill -9 $pid 2>/dev/null ) &
+	( sleep ${EXPORTFS_TIMEOUT:-30}; kill -9 ${pid} 2>/dev/null ) &
 	wait $1
 }
 
@@ -91,7 +89,7 @@ start() {
 	# Exportfs likes to hang if networking isn't working.
 	# If that's the case, then try to kill it so the
 	# bootup process can continue.
-	if grep -qs '^[[:space:]]*/' /etc/exports ; then
+	if grep -qs '^[[:space:]]*/' /etc/exports /etc/exports.d/*.exports ; then
 		ebegin "Exporting NFS directories"
 		${exportfs} -r &
 		waitfor_exportfs $!