- drop obsolete and outdated manual inclusion of rpm macros

[packages/bigsister.git] / bigsister.init

diff --git a/bigsister.init b/bigsister.init
index 8fc0f85a3989840cbd93a0721b9f379761a0ac86..b5397203671f07e6232ac1613754cec3c2b53d7b 100644 (file)
--- a/bigsister.init
+++ b/bigsister.init
@@ -10,14 +10,14 @@
 
 # Get network config
 . /etc/sysconfig/network
-
+# fix the problem, making sure that bigsister only see english messages
+LANG=C LC_MESSAGES=C export LANG LC_MESSAGES
 # Get service config
 [ -f /etc/sysconfig/bigsister ] && . /etc/sysconfig/bigsister
 
 # Check that networking is up.
 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
@@ -37,7 +37,7 @@ case "$1" in
                        uxmonprefix="su - bs -s /bin/sh"
                fi
                umask 022
-               if [ -f /usr/share/bigsister/bin/bsmon -a -f /etc/bigsister/adm/bsmon.cfg ]; then
+               if [ -f /usr/share/bigsister/bin/bsmon ]; then
                        msg_starting "Big Sister bsmon"
                        $uxmonprefix -c "/usr/bin/setsid /usr/share/bigsister/bin/bsmon" > /dev/null 2>&1
                        RETVAL=$?
@@ -49,15 +49,29 @@ case "$1" in
                        RETVAL=$?
                        [ "$RETVAL" -eq 0 ] && ok || ( fail ; exit $RETVAL )
                fi
+               for f in /etc/bigsister/uxmon-asroot* ; do
+                       set `basename $f`
+                       case $1 in
+                       *bak|*%|*~|*.rpmsave|*.rpmorig|*.rpmnew)
+                               continue
+                               ;;
+                       *)
+                               msg_starting "Big Sister uxmon $1"
+                               /bin/sh -c "/usr/bin/setsid /usr/share/bigsister/uxmon/uxmon -r /usr/share/bigsister/uxmon/uxmon-rules.pl -b /usr/share/bigsister -c /etc/bigsister/uxmon-asroot" >/dev/null 2>&1
+                               RETVAL=$?
+                               [ "$RETVAL" -eq 0 ] && ok || ( fail ; exit $RETVAL )
+                               ;;
+                       esac
+               done
                for f in /etc/bigsister/uxmon-net* ; do
                        set `basename $f`
                        case $1 in
-                         *bak|*%|*~|*.rpmsave|*.rpmorig|*.rpmnew)
+                       *bak|*%|*~|*.rpmsave|*.rpmorig|*.rpmnew)
                                continue
                                ;;
-                         *)
-                               msg_starting "Big Sister uxmon $1"
-                               $uxmonprefix -c "/usr/bin/setsid /usr/share/bigsister/uxmon/uxmon -r /usr/share/bigsister/uxmon/uxmon-rules.pl -b /usr/share/bigsister -c /etc/bigsister/uxmon-net" >/dev/null 2>&1
+                       *)
+                               msg_starting "Big Sister uxmon $1"
+                               su - bs -s /bin/sh -c "/usr/bin/setsid /usr/share/bigsister/uxmon/uxmon -r /usr/share/bigsister/uxmon/uxmon-rules.pl -b /usr/share/bigsister -c /etc/bigsister/uxmon-net" >/dev/null 2>&1
                                RETVAL=$?
                                [ "$RETVAL" -eq 0 ] && ok || ( fail ; exit $RETVAL )
                                ;;
@@ -78,7 +92,9 @@ case "$1" in
        if [ -f /var/lock/subsys/bigsister ]; then
                msg_stopping "Big Sister uxmon"
                killproc uxmon
-               msg_stopping "Big Sister bsmon if running"
+               msg_stopping "Big Sister uxmon"
+               killproc uxmon
+               msg_stopping "Big Sister bsmon if running"
                killproc bsmon
                msg_stopping "Big Sister bbd if running"
                killproc bbd
@@ -86,11 +102,10 @@ case "$1" in
                killproc bb_event_generator
                msg_stopping "Big Sister bstrapd if running"
                killproc bstrapd
-       rm -f /var/lock/subsys/bigsister 
-        else
-                msg_not_running "Big Sister"
-        fi
-       
+               rm -f /var/lock/subsys/bigsister
+       else
+               msg_not_running "Big Sister"
+       fi
        ;;
   status)
        ;;