From b84f0661d3da391f01158f4f6dbcca5e66191e68 Mon Sep 17 00:00:00 2001
From: kueller <kueller@504e572c-2e33-0410-9681-be2bf7408885>
Date: Mon, 20 Sep 2010 13:28:27 +0000
Subject: [PATCH] =?UTF-8?q?Verbesserung=20des=20Startups=20mit=20upstart?=
 =?UTF-8?q?=20(trennung=20pre-start/exec).=20/etc/sysconfig/autofstime=20e?=
 =?UTF-8?q?nth=C3=A4lt=20NUR=20noch=20den=20timeoutwert?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: svn://svn.compuextreme.de/Viitor/V962/Viitor_autofs@5825 504e572c-2e33-0410-9681-be2bf7408885
---
 etc/init/autofs-nis.conf |  6 +++---
 etc/init/autofs.conf     |  9 ++++-----
 etc/sysconfig/autofstime | 20 +-------------------
 3 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/etc/init/autofs-nis.conf b/etc/init/autofs-nis.conf
index 16db721..cdc5fd6 100644
--- a/etc/init/autofs-nis.conf
+++ b/etc/init/autofs-nis.conf
@@ -8,9 +8,8 @@ stop on stopping ypclient
 
 console output
 
-script
+pre-start script
 	source /etc/init/functions
-	source /etc/sysconfig/autofstime
 	if grep automount /etc/nsswitch.conf|grep -q nis; then
 		if [ -f /var/run/autofs/automount_nis.pid ]; then
 			if ps -ef|awk '{print $2}'|grep -q `cat /var/run/autofs/automount_nis.pid`; then
@@ -20,6 +19,7 @@ script
 				rm /var/run/autofs/automount_nis.pid
 			fi
 		fi
-		automount -f -C -p /var/run/autofs/automount_nis.pid -t $TIMEOUT nis:auto.master
 	fi
 end script
+
+exec automount -f -C -p /var/run/autofs/automount_nis.pid -t `cat /etc/sysconfig/autofstime` nis:auto.master
diff --git a/etc/init/autofs.conf b/etc/init/autofs.conf
index 4a88506..2b3a9c8 100644
--- a/etc/init/autofs.conf
+++ b/etc/init/autofs.conf
@@ -8,10 +8,8 @@ stop on runlevel [016]
 
 console none
 
-script
-  source /etc/init/functions
-  source /etc/sysconfig/autofstime
-
+pre-start script
+	source /etc/init/functions
 	if [ -f /etc/sysconfig/auto.master ] && grep automount /etc/nsswitch.conf|grep -q files; then
 		if [ -f /var/run/autofs/automount_files.pid  ]; then
 			if ps -ef|awk '{print $2}'|grep -q `cat /var/run/autofs/automount_files.pid`; then
@@ -22,6 +20,7 @@ script
 				rm /var/run/autofs/automount_files.pid
 			fi
 		fi
-		automount -f -p /var/run/autofs/automount_files.pid -t $TIMEOUT /etc/sysconfig/auto.master
 	fi
 end script
+
+exec automount -f -p /var/run/autofs/automount_files.pid -t `cat /etc/sysconfig/autofstime`  /etc/sysconfig/auto.master
diff --git a/etc/sysconfig/autofstime b/etc/sysconfig/autofstime
index e0999fd..00750ed 100644
--- a/etc/sysconfig/autofstime
+++ b/etc/sysconfig/autofstime
@@ -1,19 +1 @@
-#!/bin/bash
-#Definition der Timeout Zeit für autofs. Nach $TIMEOUT Sekunden nicht
-#benutzt werden, wird ein autofs mount wieder dismounted
-#(c) Rainmaker MultiMedia OHG
-#
-#$Author$
-#$Date$
-#$Revision$
-#
-#$Log$
-#Revision 1.1  2001/09/23 00:10:47  kueller
-#Initial revision
-#
-#Revision 1.1.1.1  2001/08/25 16:21:48  kueller
-#AddOns fuer autofs
-#
-#
-
-TIMEOUT=3
+3