- fix stop,

[packages/autofs.git] / autofs.init

diff --git a/autofs.init b/autofs.init
index 0d475599dad9ded44fb9b95ee290d10d0c5c4207..d4bec538d41afa6fc63f1ccd2205b4b538d1f0d2 100644 (file)
--- a/autofs.init
+++ b/autofs.init
@@ -1,19 +1,19 @@
-#!/bin/bash
+#!/bin/sh
 #
 #       $Id$
 #
 #      /etc/rc.d/init.d/autofs
 #
 #      rc file for automount using a Sun-style "master map".
-#      We first look for a local /etc/auto.master, then a YP
+#      We first look for a local /etc/autofs/auto.master, then a YP
 #      map with that name
 #
-# chkconfig: - 72 08
+# chkconfig: 2345 72 08
 # description: automatically mounts filesystems when you use \
 #   them, and unmounts them later when you are not using them.
 # processname: automount
 #   Note that there may be multiple processes names automount
-# config: /etc/auto.master
+# config: /etc/autofs/auto.master
 #   Note that all other config files are automatically reloaded
 #   and may be different on different systems; we can ignore them
 #   here
@@ -34,7 +34,7 @@ localoptions=''
 #      order # to activate all the mount points. It is used to figure out
 #      the difference of automount points in case of a reload
 #
-function getmounts()
+getmounts()
 {
 #
 #      Check for local maps to be loaded
@@ -108,41 +108,22 @@ case "$1" in
            touch /var/lock/subsys/automount
            deltext
            ok
+       else
+           echo "Automounter already is running"
        fi
        ;;
   stop)
        show Stopping automounter
-       busy
-        kill -TERM $(/sbin/pidof /usr/sbin/automount)
+       killproc automount -TERM
        rm -f /var/lock/subsys/automount
-       deltext
-       ok
        ;;
-  reload|restart)
+  restart|reload)
        if [ ! -f /var/lock/subsys/automount ]; then
                echo "Automounter not running"
                exit 1
        fi
-       echo "Checking for changes to /etc/auto.master ...."
-       TMP1=`mktemp /tmp/autofs.XXXXXX` || { echo "could not make temp file" >&2; exit 1; }
-       TMP2=`mktemp /tmp/autofs.XXXXXX` || { echo "could not make temp file" >&2; exit 1; }
-       getmounts >$TMP1
-       ps ax|grep "[0-9]:[0-9][0-9] /usr/sbin/automount " | (
-           while read pid tt stat time command; do
-               echo "$command" >>$TMP2
-               if ! grep -q "^$command" $TMP2; then
-                       kill -USR2 $pid
-                       echo "Stop $command"
-               fi
-           done
-       )
-       cat $TMP1 | ( while read x; do
-               if ! grep -q "^$x" $TMP2; then
-                       $x
-                       echo "Start $x"
-               fi
-        done )
-       rm -f $TMP1 $TMP2
+       $0 stop
+       $0 start
        ;;
   status)
        echo "Configured Mount Points:"