Author: glen Date: Sun Mar 6 19:19:45 2005 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- changes by Kacper Kornet <[EMAIL PROTECTED]>
---- Files affected:
SOURCES:
autofs.init (1.25 -> 1.26)
---- Diffs:
================================================================
Index: SOURCES/autofs.init
diff -u SOURCES/autofs.init:1.25 SOURCES/autofs.init:1.26
--- SOURCES/autofs.init:1.25 Sat Oct 2 12:44:55 2004
+++ SOURCES/autofs.init Sun Mar 6 20:19:40 2005
@@ -50,6 +50,8 @@
while read dir map options; do
if [ ! -z "$dir" -a ! -z "$map" \
-a x`echo "$map" | cut -c1` != 'x-' ]; then
+ maptype=`echo $map | cut -f1 -d:`
+ if [ "$maptype" = "$map" ]; then
map=`echo "/etc/autofs/$map" | sed -e
's:^/etc\/autofs//:/:'`
options=`echo "$options" | sed -e 's/\(^\|[
\t]\)-/\1/g'`
if [ -x $map ]; then
@@ -59,6 +61,15 @@
else
echo "$DAEMON --timeout $TIMEOUT $dir `basename
$map` $options"
fi
+ else
+ map=`echo $map | cut -f2- -d:`
+ if [ ! -z "$map" ]; then
+ if [ "$maptype" = "file" ]; then
+ map=`echo "/etc/autofs/$map" |
sed -e 's:^/etc\/autofs//:/:'`
+ fi
+ echo "$DAEMON --timeout $TIMEOUT $dir
$maptype $map $options"
+ fi
+ fi
fi
done
)
@@ -111,7 +122,6 @@
stop)
if [ -f /var/lock/subsys/autofs ]; then
msg_stopping automounter
-# automount -TERM
killproc automount
rm -f /var/lock/subsys/autofs >/dev/null 2>&1
else
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/autofs.init?r1=1.25&r2=1.26&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
