- RETVAL initial setting

[packages/aumix.git] / aumix.init

diff --git a/aumix.init b/aumix.init
index 7bc510571ffaba982b4500bdc5602a39068b397f..f338ad2d8f849d47e39be36d2aa55ad2adfbc3c7 100644 (file)
--- a/aumix.init
+++ b/aumix.init
@@ -10,8 +10,9 @@
 # Source function library
 . /etc/rc.d/init.d/functions
 
-. /etc/sysconfig/aumix
+[ -f /etc/sysconfig/aumix ] && . /etc/sysconfig/aumix
 
+RETVAL=0
 # See how we were called.
 case "$1" in
   start)
@@ -22,14 +23,10 @@ case "$1" in
                if [ "$AUMIX_AUTO_INIT" = "yes" ]; then
                        aumix -f /etc/aumixrc -L >/dev/null
                        RETVAL=$?
-                       [ $RETVAL -eq 0 ] && touch /var/lock/subsys/aumix
-               else
-                       touch /var/lock/subsys/aumix
                fi
-               ok
+               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/aumix && ok || fail
        else
                nls "Sound card mixer is already set up"
-               exit 1
        fi
         ;;
   stop)
@@ -43,20 +40,17 @@ case "$1" in
                ok
        else
                nls "Sound card mixer hasn't been set up"
-               exit 1
        fi      
         ;;
-  restart)
+  restart|force-reload)
         $0 stop
        $0 start
+       exit $0
         ;;
   save)
-       show "Saving sound card mixer's settings"
-       busy
-       aumix -f /etc/aumixrc -S
-       ok
+       run_cmd "Saving sound card mixer's settings" aumix -f /etc/aumixrc -S
        ;;
-  restore)
+  restore|reload)
        show "Setting up sound card mixer"
        busy
        aumix -f /etc/aumixrc -L >/dev/null
@@ -87,8 +81,8 @@ case "$1" in
         fi
         ;;
   *)
-       msg_usage "$0 {start|stop|restart|save|restore|status}"
-        exit 1
+       msg_usage "$0 {start|stop|restart|reload|force-reload|save|restore|status}"
+        exit 3
 esac
 
 exit $RETVAL