diff -uNr nfs-utils/files-old/nfs.confd nfs-utils/files/nfs.confd --- nfs-utils/files-old/nfs.confd 2002-12-12 15:55:09.000000000 +0100 +++ nfs-utils/files/nfs.confd 2004-01-02 11:37:44.633637568 +0100 @@ -13,4 +13,7 @@ # OPTIONS to pass to rpc.rquotad # ex. RPCRQUOTADOPTS="-p 32764" -RPCRQUOTADOPTS="" \ No newline at end of file +RPCRQUOTADOPTS="" + +# Timeout for exportfs +EXPORTFSTIMEOUT="30" diff -uNr nfs-utils/files-old/nfs-2 nfs-utils/files/nfs-2 --- nfs-utils/files-old/nfs-2 2003-07-26 11:39:44.000000000 +0200 +++ nfs-utils/files/nfs-2 2004-01-02 11:04:09.000000000 +0100 @@ -62,7 +62,7 @@ ebegin "Exporting NFS directories" $exportfs -r 1>&2 & pid=$! - ( sleep 30; kill -9 $pid &>/dev/null ) & + ( sleep $EXPORTFSTIMEOUT; kill -9 $pid &>/dev/null ) & wait $pid eend $? "Error exporting NFS directories" fi @@ -129,7 +129,7 @@ # shutdown process can continue. $exportfs -ua 1>&2 & pid=$! - ( sleep 30; kill -9 $pid &>/dev/null ) & + ( sleep $EXPORTFSTIMEOUT; kill -9 $pid &>/dev/null ) & wait $pid eend $? "Error unexporting NFS directories" fi @@ -144,7 +144,7 @@ ebegin "Reloading /etc/exports" $exportfs -r 1>&2 & pid=$! - ( sleep 30; kill -9 $pid &>/dev/null ) & + ( sleep $EXPORTFSTIMEOUT; kill -9 $pid &>/dev/null ) & wait $pid eend $? "Error exporting NFS directories" }