summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Jones <cretin@gentoo.org>2003-07-26 10:46:45 +0000
committerStefan Jones <cretin@gentoo.org>2003-07-26 10:46:45 +0000
commit3b10dbaa9c4e9e1c30ce65e122dc3e9a8a63cc1a (patch)
tree66e1f1e72f1fee215e821ebe11c608115bcf8f58 /net-fs/autofs/files
parentcosmetic change. windowmaker is now a dependancy here instead of gnustep-make (diff)
downloadgentoo-2-3b10dbaa9c4e9e1c30ce65e122dc3e9a8a63cc1a.tar.gz
gentoo-2-3b10dbaa9c4e9e1c30ce65e122dc3e9a8a63cc1a.tar.bz2
gentoo-2-3b10dbaa9c4e9e1c30ce65e122dc3e9a8a63cc1a.zip
Small fixup of --timeout option
Diffstat (limited to 'net-fs/autofs/files')
-rw-r--r--net-fs/autofs/files/autofs.confd7
-rw-r--r--net-fs/autofs/files/autofs.rc86
2 files changed, 8 insertions, 5 deletions
diff --git a/net-fs/autofs/files/autofs.confd b/net-fs/autofs/files/autofs.confd
index 228bc6b8a609..33a3d07a5de7 100644
--- a/net-fs/autofs/files/autofs.confd
+++ b/net-fs/autofs/files/autofs.confd
@@ -1,9 +1,12 @@
# Config file for /etc/init.d/autofs
-FLAGS="defaults 21"
-
#
# e.g. localoptions='rsize=8192,wsize=8192'
#
localoptions=''
+#
+# additional options for automount, ie. timeout
+#
+daemonoptions='--timeout 60'
+
diff --git a/net-fs/autofs/files/autofs.rc8 b/net-fs/autofs/files/autofs.rc8
index 8d84fd995c88..698ec42964b0 100644
--- a/net-fs/autofs/files/autofs.rc8
+++ b/net-fs/autofs/files/autofs.rc8
@@ -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/autofs/files/autofs.rc8,v 1.5 2003/02/28 04:01:55 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/files/autofs.rc8,v 1.6 2003/07/26 10:46:45 cretin Exp $
# rc file for automount using a Sun-style "master map".
# We first look for a local /etc/auto.master, then a YP
@@ -82,7 +82,7 @@ function getmounts()
# pull those particular options out.
# echo DAEMONOPTIONS OPTIONS $daemonoptions $options
startupoptions=
- if echo $options | grep -q -- '-t' ; then
+ if echo $options $daemonoptions | grep -q -- '-t' ; then
startupoptions="--timeout $(echo $daemonoptions $options | \
sed 's/.*--*t\(imeout\)*[ \t=]*\([0-9][0-9]*\).*$/\2/g')"
fi
@@ -203,4 +203,4 @@ reload() {
restart() {
svc_stop
svc_start
-} \ No newline at end of file
+}