Fixes to init script errors introduced in Debian patches

From: "Arthur Korn" <arthur@korn.ch>
To: autofs@linux.kernel.org
Subject: Fixes to init script errors introduced in Debian patches
Date: Thu, 21 Oct 2004 23:19:01 +0200	[thread overview]
Message-ID: <20041021211901.GA11243@turing> (raw)


[-- Attachment #1.1: Type: text/plain, Size: 1924 bytes --]

Hi

Two small bugs with causing quite some problems have been fixed.

These have been introduced with the changes made by me to the
init script for Debian. Since I posted those changes here
previously, I supply the fixes as well.

diff -ruN autofs-4.1.3.orig/samples/rc.autofs.in autofs-4.1.3/samples/rc.autofs.in

--- autofs-4.1.3.orig/samples/rc.autofs.in	2004-10-21 21:55:10.000000000 +0200
+++ autofs-4.1.3/samples/rc.autofs.in	2004-10-21 21:55:03.000000000 +0200
@@ -91,7 +91,7 @@
 #
 function getschemes()
 {
-    if grep -q '^automount: ' /etc/nsswitch.conf; then
+    if grep -q ^automount: /etc/nsswitch.conf; then
         grep ^automount: /etc/nsswitch.conf | \
                 sed -e 's/^.*://' -e 's/\[.*\]/ /g'
     else


diff -ruN autofs-4.1.3.orig/samples/rc.autofs.in autofs-4.1.3/samples/rc.autofs.in
--- autofs-4.1.3.orig/samples/rc.autofs.in	2004-10-21 21:48:49.000000000 +0200
+++ autofs-4.1.3/samples/rc.autofs.in	2004-10-21 21:48:41.000000000 +0200
@@ -188,10 +188,10 @@
 		: echo DAEMONOPTIONS OPTIONS $daemonoptions $options
 		startupoptions=
 		if echo "$options $daemonoptions" | grep -q -- '-t' ; then
-		    # the first timout value in "$options $daemonoptions" is
+		    # the last timout value in "$daemonoptions $options" is
 		    # the one that is taken.
-		    startupoptions="--timeout=$(echo $options $daemonoptions | \
-		      sed 's/^.?*--*t\(imeout\)*[ \t=]*\([0-9][0-9]*\).*$/\2/')"
+		    startupoptions="--timeout=$(echo $daemonoptions $options| \
+		      sed 's/^.*--*t\(imeout\)*[ \t=]*\([0-9][0-9]*\).*$/\2/')"
 		fi
 		if echo "$daemonoptions $options" | grep -q -- '-g' ; then
 		    startupoptions="$startupoptions --ghost"

ciao, 2ri
-- 
Secure email, spread GPG, clearsign all mail. http://www.gnupg.org
.
Nearly all men can stand adversity, but if you want to test a man's 
character, give him power.
 -- Abraham Lincoln

[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 189 bytes --]

[-- Attachment #2: Type: text/plain, Size: 140 bytes --]

_______________________________________________
autofs mailing list
autofs@linux.kernel.org
http://linux.kernel.org/mailman/listinfo/autofs
