diff options
author | Stefan Jones <cretin@gentoo.org> | 2003-07-26 09:32:16 +0000 |
---|---|---|
committer | Stefan Jones <cretin@gentoo.org> | 2003-07-26 09:32:16 +0000 |
commit | e7201ac10332e1b232387a7a9df0fe50dbae55d2 (patch) | |
tree | f07b85899e697b855db35c6a5352dc460c7c1a1f /net-fs | |
parent | Version bump (needed for dev-php/PECL-sqlite). (diff) | |
download | historical-e7201ac10332e1b232387a7a9df0fe50dbae55d2.tar.gz historical-e7201ac10332e1b232387a7a9df0fe50dbae55d2.tar.bz2 historical-e7201ac10332e1b232387a7a9df0fe50dbae55d2.zip |
Fix long timeout time for exporting filesystems
Diffstat (limited to 'net-fs')
-rw-r--r-- | net-fs/nfs-utils/ChangeLog | 6 | ||||
-rw-r--r-- | net-fs/nfs-utils/Manifest | 4 | ||||
-rw-r--r-- | net-fs/nfs-utils/files/nfs-2 | 17 |
3 files changed, 17 insertions, 10 deletions
diff --git a/net-fs/nfs-utils/ChangeLog b/net-fs/nfs-utils/ChangeLog index 13b2469cd3e9..634dbc39705a 100644 --- a/net-fs/nfs-utils/ChangeLog +++ b/net-fs/nfs-utils/ChangeLog @@ -1,9 +1,13 @@ # ChangeLog for net-fs/nfs-utils # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.22 2003/07/19 19:29:52 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.23 2003/07/26 09:32:16 cretin Exp $ *nfs-utils-1.0.5-r1 (19 Jul 2003) + 26 Jul 2003; Stefan Jones <cretin@gentoo.org> files/nfs-2: + Fixed waiting on exportfs to finish. Use wait $pidofexportfs ( let kill + finish in background ) Speedups of 29secs! + 19 Jul 2003; Aron Griffis <agriffis@gentoo.org> nfs-utils-1.0.5-r1.ebuild, files/nfs-2: Change exportfs timeouts from 5 seconds to 30 seconds to prevent prematurely diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest index ad7f5be00a9f..228e2629111d 100644 --- a/net-fs/nfs-utils/Manifest +++ b/net-fs/nfs-utils/Manifest @@ -2,11 +2,11 @@ MD5 f7782767ba2c749c4015b109a218f369 nfs-utils-1.0.5.ebuild 1911 MD5 46df3de30a3194ba950d5f66e1b408dd nfs-utils-1.0.5-r1.ebuild 1918 MD5 b46af45b8acea0fc23c697913ea229cd nfs-utils-1.0.1-r1.ebuild 1911 MD5 459bf83dd49739fb9c7191e012f74ddf nfs-utils-0.3.3-r1.ebuild 1504 -MD5 34ea55470f76a0be121ba16a86dc906d ChangeLog 3558 +MD5 bbb617698b810064e80e84e772ff61f6 ChangeLog 3739 MD5 d36e5306c46430c4a62657e9ea514ddd files/nfs 4443 MD5 cc56dba449d210ecbbe1beeb3114a6f4 files/nfs.confd 348 MD5 3b44b94c2a6c8335c53302efdf4907f8 files/nfs-1 4705 -MD5 3e9f55a9f32346d63aeec1d0589b4df1 files/nfs-2 4708 +MD5 223877ca3acb19aebace02b15945bf7d files/nfs-2 4755 MD5 da4b8b95f4c8a015c4a69257ea6582e1 files/digest-nfs-utils-1.0.1-r1 66 MD5 3219e53cb07ef64536526153158b7ab2 files/digest-nfs-utils-1.0.5-r1 67 MD5 3219e53cb07ef64536526153158b7ab2 files/digest-nfs-utils-1.0.5 67 diff --git a/net-fs/nfs-utils/files/nfs-2 b/net-fs/nfs-utils/files/nfs-2 index 42c29e9d5a24..0930f666d4a0 100644 --- a/net-fs/nfs-utils/files/nfs-2 +++ b/net-fs/nfs-utils/files/nfs-2 @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs-2,v 1.1 2003/07/19 19:29:52 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs-2,v 1.2 2003/07/26 09:32:16 cretin Exp $ #--------------------------------------------------------------------------- # This script starts/stops the following @@ -61,8 +61,9 @@ start() { if grep -q '^/' /etc/exports &>/dev/null; then ebegin "Exporting NFS directories" $exportfs -r 1>&2 & - ( sleep 30; kill -9 $! &>/dev/null & ) - wait + pid=$! + ( sleep 30; kill -9 $pid &>/dev/null ) & + wait $pid eend $? "Error exporting NFS directories" fi @@ -127,8 +128,9 @@ stop() { # If that's the case, then try to kill it so the # shutdown process can continue. $exportfs -ua 1>&2 & - ( sleep 30; kill -9 $! &>/dev/null & ) - wait + pid=$! + ( sleep 30; kill -9 $pid &>/dev/null ) & + wait $pid eend $? "Error unexporting NFS directories" fi @@ -141,8 +143,9 @@ reload() { # bootup process can continue. ebegin "Reloading /etc/exports" $exportfs -r 1>&2 & - ( sleep 30; kill -9 $! &>/dev/null & ) - wait + pid=$! + ( sleep 30; kill -9 $pid &>/dev/null ) & + wait $pid eend $? "Error exporting NFS directories" } |