- updated

Changed files:
    apmd.init -> 1.8

diff --git a/apmd.init b/apmd.init
index 6f8a0753011c6edc1d0352a7ff1fb890b6b5ff9f..8b7c65204db52ebc4a37e47147c0c2f3e28e82f8 100644 (file)
--- a/apmd.init
+++ b/apmd.init
@@ -11,7 +11,7 @@
 . /etc/rc.d/init.d/functions
 
 if [ ! -f /proc/apm ]; then  
-       modprobe apm && echo "No kernel APM support!"; exit 1
+       modprobe apm && nls "No kernel APM support!"; exit 1
 fi
 
 CONFIG=/etc/sysconfig/apmd
@@ -19,15 +19,26 @@ CONFIG=/etc/sysconfig/apmd
 # See how we were called.
 case "$1" in
   start)
-       msg_starting APM
-       [ -r "$CONFIG" ] && . "$CONFIG"
-       daemon /usr/sbin/apmd "$APMD_OPTIONS"
-       touch /var/lock/subsys/apmd
+       # Check if the service is already running?
+       if [ ! -f /var/lock/subsys/apmd ]; then
+               msg_starting APM
+               [ -r "$CONFIG" ] && . "$CONFIG"
+               daemon apmd "$APMD_OPTIONS"
+               touch /var/lock/subsys/apmd
+       else
+               msg_already_running APM
+               exit 1
+       fi
        ;;
   stop)
-       msg_stopping APM
-       killproc apmd
-       rm -f /var/lock/subsys/apmd
+       if [ -f /var/lock/subsys/apmd ]; then
+               msg_stopping APM
+               killproc apmd
+               rm -f /var/lock/subsys/apmd
+       else
+               msg_not_running APM
+               exit 1
+       fi
        ;;
   status)
        status apmd
@@ -37,6 +48,6 @@ case "$1" in
        $0 start
        ;;
   *)
-       msg_usage "$0 {start|stop|status|restart|reload}"
+       msg_usage "$0 {start|stop|restart|reload|status}"
        exit 1
 esac