- add OPTIONS and make it by default "--ghost"

Changed files:
    autofs.init -> 1.29
    autofs.sysconfig -> 1.3

diff --git a/autofs.init b/autofs.init
index 6370f0a699f500954f970632c4ed707baaa4bff8..aff3f1794f5856c46dea4db9796e935c18f5591c 100644 (file)
--- a/autofs.init
+++ b/autofs.init
@@ -54,11 +54,11 @@ if [ -f /etc/autofs/auto.master ]; then
                        map=`echo "/etc/autofs/$map" | sed -e 's:^/etc\/autofs//:/:'`
                        options=`echo "$options" | sed -e 's/\(^\|[ \t]\)-/\1/g'`
                        if [ -x $map ]; then
-                               echo "$DAEMON --timeout $TIMEOUT $dir program $map $options"
+                               echo "$DAEMON --timeout ${TIMEOUT} ${OPTIONS} $dir program $map $options"
                        elif [ -f $map ]; then
-                               echo "$DAEMON --timeout $TIMEOUT $dir file $map $options"
+                               echo "$DAEMON --timeout ${TIMEOUT} ${OPTIONS} $dir file $map $options"
                        else
-                               echo "$DAEMON --timeout $TIMEOUT $dir `basename $map` $options"
+                               echo "$DAEMON --timeout ${TIMEOUT} ${OPTIONS} $dir `basename $map` $options"
                        fi
                        else
                                map=`echo $map | cut -f2- -d:`
@@ -66,7 +66,7 @@ if [ -f /etc/autofs/auto.master ]; then
                                        if [ "$maptype" = "file" ]; then
                                                map=`echo "/etc/autofs/$map" | sed -e 's:^/etc\/autofs//:/:'`
                                        fi
-                                       echo "$DAEMON --timeout $TIMEOUT $dir $maptype $map $options"
+                                       echo "$DAEMON --timeout $TIMEOUT ${OPTIONS} $dir $maptype $map $options"
                                fi
                        fi
                fi
@@ -93,7 +93,7 @@ if is_yes $USE_YP; then
                                options=`echo "$options" | sed -e '
                                  s/--*t\(imeout\)*[ \t]*[0-9][0-9]*//g
                                  s/\(^\|[ \t]\)-/\1/g'`
-                               echo "$DAEMON --timeout $TIMEOUT $mountoptions \
+                               echo "$DAEMON --timeout $TIMEOUT ${OPTIONS} $mountoptions \
                                  $dir yp $map $options"
                        fi
                done

diff --git a/autofs.sysconfig b/autofs.sysconfig
index ce6d0bd4dd318818d0bc326091f64ab6f72917d6..065867a5b76281f53c4963fe6b874c107f7adb86 100644 (file)
--- a/autofs.sysconfig
+++ b/autofs.sysconfig
@@ -6,3 +6,6 @@
 TIMEOUT=60
 # Set it to yes if you want autofs to take maps from YP
 USE_YP=no
+
+# Additional daemon options
+OPTIONS="-g"