Author: glen Date: Wed Jul 29 05:28:36 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- formatting
---- Files affected:
packages/autofs:
autofs.init (1.31 -> 1.32)
---- Diffs:
================================================================
Index: packages/autofs/autofs.init
diff -u packages/autofs/autofs.init:1.31 packages/autofs/autofs.init:1.32
--- packages/autofs/autofs.init:1.31 Fri Nov 14 10:28:32 2008
+++ packages/autofs/autofs.init Wed Jul 29 07:28:29 2009
@@ -47,10 +47,14 @@
if [ -f /etc/autofs/auto.master ]; then
cat /etc/autofs/auto.master | sed -e '/^#/d' -e '/^$/d'| (
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
+ if [ ! -z "$dir" -a ! -z "$map" -a x`echo "$map" | cut -c1` !=
'x-' ]; then
+ :
+ else
+ continue
+ fi
+
+ 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
@@ -60,14 +64,13 @@
else
echo "$DAEMON --timeout ${TIMEOUT} ${OPTIONS}
$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
${OPTIONS} $dir $maptype $map $options"
+ 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 ${OPTIONS}
$dir $maptype $map $options"
fi
fi
done
@@ -131,10 +134,10 @@
# See how we were called.
case "$1" in
start)
- start
+ start
;;
stop)
- stop
+ stop
;;
restart|force-reload)
stop
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/autofs/autofs.init?r1=1.31&r2=1.32&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
