- orphaned, outdated

[packages/autofs.git] / autofs.init

diff --git a/autofs.init b/autofs.init
index 331420c2c0e385d1098dce6369ea639ea56b46a4..6370f0a699f500954f970632c4ed707baaa4bff8 100644 (file)
--- a/autofs.init
+++ b/autofs.init
@@ -5,8 +5,8 @@
 #
 # chkconfig:   2345 72 08
 #
-# description: Script for automount using a Sun-style "master map".
-#              We first look for a local /etc/autofs/auto.master, then a YP
+# description: Script for automount using a Sun-style "master map". \
+#              We first look for a local /etc/autofs/auto.master, then a YP \
 #              map with that name
 #
 # processname: autofs
@@ -24,15 +24,14 @@
 
 # Check that networking is up.
 if is_yes "${NETWORKING}"; then
-       if [ ! -f /var/lock/subsys/network ]; then
-               # nls "ERROR: Networking is down. %s can't be run." <service>
+       if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
                msg_network_down automounter
                exit 1
        fi
 else
        exit 0
 fi
-                       
+
 DAEMON=/usr/sbin/automount
 
 #
@@ -50,6 +49,8 @@ if [ -f /etc/autofs/auto.master ]; then
        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 +60,15 @@ if [ -f /etc/autofs/auto.master ]; then
                        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
        )
@@ -67,7 +77,7 @@ fi
 #
 # Check for YellowPage maps to be loaded
 #
-if is_yes $USE_YP; then 
+if is_yes $USE_YP; then
        if [ -e /usr/bin/ypcat ] && \
           [ `ypcat -k auto.master 2>/dev/null | wc -l` -gt 0 ]; then
                ypcat -k auto.master | (
@@ -100,7 +110,7 @@ case "$1" in
        if [ ! -f /var/lock/subsys/autofs ]; then
                msg_starting automounter
                busy
-               getmounts | sh 
+               getmounts | sh
                RETVAL=$?
                [ $RETVAL -eq 0 ] && ok || fail
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/autofs
@@ -111,7 +121,6 @@ case "$1" in
   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