Set a default timeout of 30 seconds in case EXPORTFSTIMEOUT is unset in conf.d/nfs

5 files changed, 21 insertions, 14 deletions

diff --git a/net-fs/nfs-utils/ChangeLog b/net-fs/nfs-utils/ChangeLog
index d961963f25cd..52cd9cc93647 100644
--- a/net-fs/nfs-utils/ChangeLog
+++ b/net-fs/nfs-utils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-fs/nfs-utils
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.42 2004/06/25 20:24:15 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.43 2004/07/07 16:51:04 agriffis Exp $
+
+*nfs-utils-1.0.6-r4 (07 Jul 2004)
+
+  07 Jul 2004; Aron Griffis <agriffis@gentoo.org> files/nfs-5,
+  -nfs-utils-1.0.6-r3.ebuild, +nfs-utils-1.0.6-r4.ebuild:
+  Set a default timeout of 30 seconds in case EXPORTFSTIMEOUT is unset in
+  conf.d/nfs
 
   25 Jun 2004; Danny van Dyk <kugelfang@gentoo.org> nfs-utils-1.0.6.ebuild:
   Marked stable on amd64.
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index 85940c9bccd4..a5a22ff846bc 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -1,16 +1,16 @@
-MD5 da35bfbe5478a64de2cb729adf968a5a ChangeLog 6771
-MD5 9cee4adcef8a47ea4ee35090f7f89b0a metadata.xml 225
-MD5 50e8125cff661e1d923cc7fe68c2443b nfs-utils-1.0.5-r1.ebuild 1927
 MD5 c416a92376073a3dfff76b97feade559 nfs-utils-1.0.6-r1.ebuild 2498
+MD5 50e8125cff661e1d923cc7fe68c2443b nfs-utils-1.0.5-r1.ebuild 1927
 MD5 4b7e8c4bd92672689cb09758a0740c3d nfs-utils-1.0.6.ebuild 2536
-MD5 962eb68ee036a9ea8851d1bb1d2e2fa8 nfs-utils-1.0.6-r3.ebuild 2710
+MD5 da35bfbe5478a64de2cb729adf968a5a ChangeLog 6771
+MD5 9cee4adcef8a47ea4ee35090f7f89b0a metadata.xml 225
+MD5 962eb68ee036a9ea8851d1bb1d2e2fa8 nfs-utils-1.0.6-r4.ebuild 2710
+MD5 3da96ccc6af7da277d20e11c4178a37d files/nfs.confd 544
+MD5 54cfb747aeae0de5ae5856024465d69f files/nfs-2 4743
+MD5 19501f6de1fee02698a6e0524ec15bf4 files/nfs-3 5142
+MD5 72660577b3ffd1d51743938e0a054027 files/nfs-5 5168
 MD5 3219e53cb07ef64536526153158b7ab2 files/digest-nfs-utils-1.0.5-r1 67
-MD5 3a3d8bd1a03bbf2c51a4e77a3516febd files/digest-nfs-utils-1.0.6 67
 MD5 3a3d8bd1a03bbf2c51a4e77a3516febd files/digest-nfs-utils-1.0.6-r1 67
+MD5 3a3d8bd1a03bbf2c51a4e77a3516febd files/digest-nfs-utils-1.0.6-r4 67
+MD5 3a3d8bd1a03bbf2c51a4e77a3516febd files/digest-nfs-utils-1.0.6 67
 MD5 a02eed87e5d581e56feb0f6dfd18e6df files/exports 66
-MD5 54cfb747aeae0de5ae5856024465d69f files/nfs-2 4743
-MD5 19501f6de1fee02698a6e0524ec15bf4 files/nfs-3 5142
-MD5 3da96ccc6af7da277d20e11c4178a37d files/nfs.confd 544
 MD5 22ffe6ab0f66c1b67b80b4b8dd2b23d9 files/nfsmount 1156
-MD5 3a3d8bd1a03bbf2c51a4e77a3516febd files/digest-nfs-utils-1.0.6-r3 67
-MD5 72660577b3ffd1d51743938e0a054027 files/nfs-5 5168
diff --git a/net-fs/nfs-utils/files/digest-nfs-utils-1.0.6-r3 b/net-fs/nfs-utils/files/digest-nfs-utils-1.0.6-r4
index 319c3d94379e..319c3d94379e 100644
--- a/net-fs/nfs-utils/files/digest-nfs-utils-1.0.6-r3
+++ b/net-fs/nfs-utils/files/digest-nfs-utils-1.0.6-r4
diff --git a/net-fs/nfs-utils/files/nfs-5 b/net-fs/nfs-utils/files/nfs-5
index e99a563eb3b4..8afc512ac18c 100644
--- a/net-fs/nfs-utils/files/nfs-5
+++ b/net-fs/nfs-utils/files/nfs-5
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs-5,v 1.1 2004/06/12 00:19:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs-5,v 1.2 2004/07/07 16:51:04 agriffis Exp $
 
 #---------------------------------------------------------------------------
 # This script starts/stops the following
@@ -59,7 +59,7 @@ stop_statd() {
 
 waitfor_exportfs() {
 	local pid=$1
-	( sleep ${EXPORTFSTIMEOUT}; kill -9 $pid &>/dev/null ) &
+	( sleep ${EXPORTFSTIMEOUT:-30}; kill -9 $pid &>/dev/null ) &
 	wait $1
 }
 
diff --git a/net-fs/nfs-utils/nfs-utils-1.0.6-r3.ebuild b/net-fs/nfs-utils/nfs-utils-1.0.6-r4.ebuild
index f3b2d07f0b9e..3df3bf48682c 100644
--- a/net-fs/nfs-utils/nfs-utils-1.0.6-r3.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-1.0.6-r4.ebuild
@@ -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/nfs-utils-1.0.6-r3.ebuild,v 1.2 2004/06/25 03:09:51 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.0.6-r4.ebuild,v 1.1 2004/07/07 16:51:04 agriffis Exp $
 
 inherit gnuconfig