Small fixup of --timeout option

4 files changed, 26 insertions, 18 deletions

diff --git a/net-fs/autofs/ChangeLog b/net-fs/autofs/ChangeLog
index e2261cddbe51..534e4a501f82 100644
--- a/net-fs/autofs/ChangeLog
+++ b/net-fs/autofs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-fs/autofs
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/ChangeLog,v 1.18 2003/05/25 15:00:37 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/ChangeLog,v 1.19 2003/07/26 10:46:45 cretin Exp $
+
+  26 Jul 2003; Stefan Jones <cretin@gentoo.org> files/autofs.rc8 
+  files/autofs.confd:
+  Fixed the --timeout options, can be specified in daemonoptions in 
+  autofs.confd or via the last option in the misc.master file.
 
   25 May 2003; Martin Holzer <mholzer@gentoo.org> autofs-3.1.7-r3.ebuild,
   autofs-3.1.7-r4.ebuild, autofs-3.1.7-r5.ebuild:
diff --git a/net-fs/autofs/Manifest b/net-fs/autofs/Manifest
index af89ef95a272..e6ee65cc60dd 100644
--- a/net-fs/autofs/Manifest
+++ b/net-fs/autofs/Manifest
@@ -1,21 +1,21 @@
-MD5 eae9aaee8739e5bb5a362c7b02cfc6a0 ChangeLog 3160
 MD5 d6f9d13de10b5fa495f3a3845670e23d autofs-3.1.7-r3.ebuild 1312
-MD5 c5c326df41aaf43432b40e7ca346d46b autofs-3.1.7-r4.ebuild 1764
 MD5 16b1cbe7b4032d989a7ac1fa8c903559 autofs-3.1.7-r5.ebuild 1786
-MD5 256e713e8b47896dd2049326ec26fc78 files/auto.home 239
+MD5 958a16c8644f2542f42233108333fa7e ChangeLog 3381
+MD5 c5c326df41aaf43432b40e7ca346d46b autofs-3.1.7-r4.ebuild 1764
+MD5 a132f5883b92e2b509fa66e429f913ab files/autofs.confd 186
+MD5 3e9a4415d9928180bd9d1a7a09d4d2e7 files/ldap_config.patch 785
 MD5 7dfc74b098600c091681c950b67b1022 files/auto.master 237
-MD5 aa40e8bef91418943312910e73d05eed files/auto.misc 319
-MD5 17069c72cadc641378d58ec1d0910647 files/autofs 3569
-MD5 d4034f19318f0595b2065e474571412e files/autofs.confd 125
+MD5 39ac8cc927dab754a7694abdb1a2cdc5 files/open_max.diff 408
+MD5 7fa23f910baa8aa00609bd74a60c8e34 files/autofs1.confd 137
 MD5 fd7e79d67508e701a1ed7cf630047097 files/autofs.rc6 3747
 MD5 c6cb109b55bf405262d053651485c165 files/autofs.rc7 3637
-MD5 920a82cac4940ba4981df4b69dd56595 files/autofs.rc8 5176
-MD5 7fa23f910baa8aa00609bd74a60c8e34 files/autofs1.confd 137
-MD5 41de856a77a074078968ff244b863f88 files/automount.diff 322
+MD5 df83cf8c5095657f4692b1d54bb32282 files/autofs.rc8 5192
+MD5 17069c72cadc641378d58ec1d0910647 files/autofs 3569
+MD5 256e713e8b47896dd2049326ec26fc78 files/auto.home 239
+MD5 aa40e8bef91418943312910e73d05eed files/auto.misc 319
 MD5 ee656860c0682821d144556f674ca481 files/digest-autofs-3.1.7-r3 64
 MD5 ee656860c0682821d144556f674ca481 files/digest-autofs-3.1.7-r4 64
 MD5 ee656860c0682821d144556f674ca481 files/digest-autofs-3.1.7-r5 64
-MD5 a872a3743192bbca4f78ecec7f74df03 files/ldap.diff 367
-MD5 3e9a4415d9928180bd9d1a7a09d4d2e7 files/ldap_config.patch 785
+MD5 41de856a77a074078968ff244b863f88 files/automount.diff 322
 MD5 77884391a3fbf365a88f5d2230b548d9 files/nisyp.patch 419
-MD5 39ac8cc927dab754a7694abdb1a2cdc5 files/open_max.diff 408
+MD5 a872a3743192bbca4f78ecec7f74df03 files/ldap.diff 367
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
+}