Skip to contentSkip to conversation

Fixes to init script errors introduced in Debian patches

PATCH Arthur Korn 2 participants 2 messages Oct 21, 2004 – Oct 22, 2004 Kernel automounter

lore
Share & tools
lore
#0 lore raw

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.

samples/rc.autofs.in +1 -1
diff -ruN autofs-4.1.3.orig/samples/rc.autofs.in autofs-4.1.3/samples/rc.autofs.in
@@ -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
samples/rc.autofs.in +3 -3
diff -ruN autofs-4.1.3.orig/samples/rc.autofs.in autofs-4.1.3/samples/rc.autofs.in
@@ -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

Signature · 5 lines
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

_______________________________________________
autofs mailing list
[email protected]
http://linux.kernel.org/mailman/listinfo/autofs

maintainer
#1 lore raw
Quoted 7 lines · Arthur Korn

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.

Is that the -t error I got the other day on my Debian install? Do you upload these to the experimental packages about the same time as you post here?

<ot>
If I add a patches to the patches directory, with an appropriate order number, will they be picked up when I build the deb, or do I do it differently?
</ot>

Ian