diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2004-06-12 00:19:08 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2004-06-12 00:19:08 +0000 |
| commit | e7af8181bfbf29b3f859cf04ed8b53ed257f6866 (patch) | |
| tree | e2edf652d3771596c9232206aa4472f967e3239d /net-fs/nfs-utils/files | |
| parent | Added RDEPEND=!app-misc/glimpse due to both providing /usr/bin/agrep. bug #53... (diff) | |
| download | gentoo-2-e7af8181bfbf29b3f859cf04ed8b53ed257f6866.tar.gz gentoo-2-e7af8181bfbf29b3f859cf04ed8b53ed257f6866.tar.bz2 gentoo-2-e7af8181bfbf29b3f859cf04ed8b53ed257f6866.zip | |
fix #30522 #37004 #49444
Diffstat (limited to 'net-fs/nfs-utils/files')
| -rw-r--r-- | net-fs/nfs-utils/files/digest-nfs-utils-1.0.6-r3 (renamed from net-fs/nfs-utils/files/digest-nfs-utils-1.0.6-r2) | 0 | ||||
| -rw-r--r-- | net-fs/nfs-utils/files/nfs-5 (renamed from net-fs/nfs-utils/files/nfs-4) | 20 | ||||
| -rw-r--r-- | net-fs/nfs-utils/files/nfs.confd | 7 |
3 files changed, 17 insertions, 10 deletions
diff --git a/net-fs/nfs-utils/files/digest-nfs-utils-1.0.6-r2 b/net-fs/nfs-utils/files/digest-nfs-utils-1.0.6-r3 index 319c3d94379e..319c3d94379e 100644 --- a/net-fs/nfs-utils/files/digest-nfs-utils-1.0.6-r2 +++ b/net-fs/nfs-utils/files/digest-nfs-utils-1.0.6-r3 diff --git a/net-fs/nfs-utils/files/nfs-4 b/net-fs/nfs-utils/files/nfs-5 index d10b0b4b16c5..e99a563eb3b4 100644 --- a/net-fs/nfs-utils/files/nfs-4 +++ 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-4,v 1.1 2004/06/08 19:04:04 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs-5,v 1.1 2004/06/12 00:19:08 vapier Exp $ #--------------------------------------------------------------------------- # This script starts/stops the following @@ -57,6 +57,12 @@ stop_statd() { eend $? "Error stopping NFS statd" } +waitfor_exportfs() { + local pid=$1 + ( sleep ${EXPORTFSTIMEOUT}; kill -9 $pid &>/dev/null ) & + wait $1 +} + start() { # This is the new "kernel 2.6 way" to handle the exports file if grep -q nfsd /proc/filesystems &>/dev/null; then @@ -76,9 +82,7 @@ start() { if grep -q '^/' /etc/exports &>/dev/null; then ebegin "Exporting NFS directories" $exportfs -r 1>&2 & - pid=$! - ( sleep 30; kill -9 $pid &>/dev/null ) & - wait $pid + waitfor_exportfs $! eend $? "Error exporting NFS directories" fi @@ -141,9 +145,7 @@ stop() { # If that's the case, then try to kill it so the # shutdown process can continue. $exportfs -ua 1>&2 & - pid=$! - ( sleep 30; kill -9 $pid &>/dev/null ) & - wait $pid + waitfor_exportfs $! eend $? "Error unexporting NFS directories" fi @@ -156,9 +158,7 @@ reload() { # bootup process can continue. ebegin "Reloading /etc/exports" $exportfs -r 1>&2 & - pid=$! - ( sleep 30; kill -9 $pid &>/dev/null ) & - wait $pid + waitfor_exportfs $! eend $? "Error exporting NFS directories" } diff --git a/net-fs/nfs-utils/files/nfs.confd b/net-fs/nfs-utils/files/nfs.confd index 51089dabbdf9..fef0151232df 100644 --- a/net-fs/nfs-utils/files/nfs.confd +++ b/net-fs/nfs-utils/files/nfs.confd @@ -1,3 +1,7 @@ +# 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.confd,v 1.5 2004/06/12 00:19:08 vapier Exp $ + # Config file for /etc/init.d/nfs # Number of servers to be started up by default @@ -10,3 +14,6 @@ RPCMOUNTDOPTS="" # Options to pass to rpc.statd # ex. RPCSTATDOPTS="-p 32765 -o 32766" RPCSTATDOPTS="" + +# Timeout (in seconds) for exportfs +EXPORTFSTIMEOUT=30 |