- correct adm path

[packages/bigsister.git] / bigsister.init

diff --git a/bigsister.init b/bigsister.init
index 0670ef25cae7d101c46a6cd8af74b836c4bc52b5..03a069853d1fd697b6f772561d0d9e09463c56e7 100644 (file)
--- a/bigsister.init
+++ b/bigsister.init
@@ -15,23 +15,28 @@
 [ -f /etc/sysconfig/bigsister ] && . /etc/sysconfig/bigsister
 
 # Check that networking is up.
-if is_no "${NETWORKING}"; then
-       # nls "ERROR: Networking is down. %s can't be run." <service>
-       msg_network_down Big Sister
-       exit 1
+if is_yes "${NETWORKING}"; then
+       if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
+               # nls "ERROR: Networking is down. %s can't be run." <service>
+               msg_network_down Big Sister
+               exit 1
+       fi
+else
+       exit 0
 fi
 
 bs_killproc() {                # kill the named process(es)
        msg_stopping "${4-$1}"
        pid=`ps -e -o pid,comm,args 2>/dev/null | grep -w perl 2>/dev/null | grep " $1 " 2>/dev/null | grep -v grep | awk '{ print $1 }'`
        if [ "$pid" != "" ]; then 
-               kill $2 $pid && ( ok ; : ) || fail
+               kill $2 $pid && ok || fail
        else
-               [ "$3" = "y" ] && ( died ; : ) || ok
+               [ "$3" != "y" ] && ok || died
        fi
 }
 
 
+RETVAL=0
 # See how we were called.
 case "$1" in
   start)
@@ -43,19 +48,19 @@ case "$1" in
                        uxmonprefix="su - bs -s /bin/sh"
                fi
                umask 022
-               if [ -f /usr/lib/bs/bin/bsmon -a -f /etc/bs/etc/bsmon.cfg ]; then
+               if [ -f /usr/share/bigsister/bin/bsmon -a -f  /usr/share/bigsister/etc/bsmon.cfg ]; then
                        msg_starting "Big Sister bsmon"
-                       $uxmonprefix -c "/usr/bin/setsid /usr/lib/bs/bin/bsmon" > /dev/null 2>&1
+                       $uxmonprefix -c "/usr/bin/setsid /usr/share/bigsister/bin/bsmon" > /dev/null 2>&1
                        RETVAL=$?
-                       [ "$RETVAL" = "0" ] && ok || ( fail ; exit $RETVAL )
+                       [ "$RETVAL" -eq 0 ] && ok || ( fail ; exit $RETVAL )
                fi
-               if [ -f /usr/lib/bs/bin/bbd -a -f /etc/bs/adm/bb-display.cfg ]; then
+               if [ -f /usr/share/bigsister/bin/bbd -a -f /etc/bigsister/bb-display.cfg ]; then
                        msg_starting "Big Sister bbd"
-                       $uxmonprefix -c "/usr/bin/setsid /usr/lib/bs/bin/bbd -b /usr/lib/bs $BBD_ARGS" >/dev/null 2>&1
+                       $uxmonprefix -c "/usr/bin/setsid /usr/share/bigsister/bin/bbd -b /var/lib/bigsister $BBD_ARGS" >/dev/null 2>&1
                        RETVAL=$?
-                       [ "$RETVAL" = "0" ] && ok || ( fail ; exit $RETVAL )
+                       [ "$RETVAL" -eq 0 ] && ok || ( fail ; exit $RETVAL )
                fi
-               for f in /etc/bs/adm/uxmon-net* ; do
+               for f in /etc/bigsister/uxmon-net* ; do
                        set `basename $f`
                        case $1 in
                          *bak|*%|*~|*.rpmsave|*.rpmorig|*.rpmnew)
@@ -63,22 +68,21 @@ case "$1" in
                                ;;
                          *)
                                msg_starting "Big Sister uxmon $1"
-                               $uxmonprefix -c "/usr/bin/setsid /usr/lib/bs/uxmon/uxmon -r /usr/lib/bs/uxmon/uxmon-rules.pl -b /usr/lib/bs -c $1" >/dev/null 2>&1
+                               $uxmonprefix -c "/usr/bin/setsid /usr/share/bigsister/uxmon/uxmon -r /usr/share/bigsister/uxmon/uxmon-rules.pl -b /var/lib/bigsister -c $1" >/dev/null 2>&1
                                RETVAL=$?
-                               [ "$RETVAL" = "0" ] && ok || ( fail ; exit $RETVAL )
+                               [ "$RETVAL" -eq 0 ] && ok || ( fail ; exit $RETVAL )
                                ;;
                        esac
                done
-               if [ -f /etc/bs/adm/bstrapd.cfg ]; then
+               if [ -f /usr/share/bigsister/etc/bstrapd.cfg ]; then
                        # bstrapd will only run as root
                        msg_starting "Big Sister bstrapd"
-                       /usr/bin/setsid /usr/lib/bs/bin/bstrapd >/dev/null 2>&1
-                       [ "$RETVAL" = "0" ] && ok || ( fail ; exit $RETVAL )
+                       /usr/bin/setsid /usr/share/bigsister/bin/bstrapd >/dev/null 2>&1
+                       [ "$RETVAL" -eq 0 ] && ok || ( fail ; exit $RETVAL )
                fi
                touch /var/lock/subsys/bigsister
        else
                msg_already_running "Big Sister"
-               exit 1
        fi
        ;;
   stop)
@@ -91,19 +95,18 @@ case "$1" in
                rm -f /var/lock/subsys/bigsister
        else
                msg_not_running "Big Sister"
-               exit 1
        fi
        ;;
-  status
+  status)
        ;;
-  restart|reload)
+  restart|force-reload)
        $0 stop
        $0 start
+       exit $?
        ;;
   *)
-       msg_usage "$0 {start|stop|restart|reload|status}"
-       exit 1
-       ;;
+       msg_usage "$0 {start|stop|restart|force-reload|status}"
+       exit 3
 esac
 
-exit 0
+exit $RETVAL