diff --git a/MAC/APL/APLCommon/src/swlevel b/MAC/APL/APLCommon/src/swlevel index 1770d82c84eecd857ddf917f5fff61066123b5b1..b48e5395b910ec0e815162edfe504661918d5d57 100755 --- a/MAC/APL/APLCommon/src/swlevel +++ b/MAC/APL/APLCommon/src/swlevel @@ -238,7 +238,7 @@ start_prog() fi # Check if program is already running - /sbin/pidof -x ${prog} 1>/dev/null 2>&1 + pidof -x ${prog} 1>/dev/null 2>&1 if [ $? -ne 0 ]; then curdate=`date +%Y%m%dT%H%M%S` # PVSS needs special treatment @@ -269,7 +269,7 @@ start_prog() fi if [ "$prog" = "TBBDriver" ]; then # Check if RSPDriver is already running; if not, do not start either! - /sbin/pidof RSPDriver 1>/dev/null 2>&1 + pidof RSPDriver 1>/dev/null 2>&1 if [ $? -ne 0 ]; then echo "RSPDriver not running, so not starting TBBDriver either" exit @@ -292,7 +292,7 @@ start_prog() $BINDIR/$prog 1>>$LOGDIR/$prog.stdout.${curdate} 2>&1 & fi fi - usleep 250000 + sleep 0.25 ps -ef | grep -v grep | egrep '[0-9][0-9] [a-zA-Z0-9/_.]*/'${prog} fi } @@ -321,7 +321,7 @@ stop_prog() fi # get processlist - /sbin/pidof -x ${prog} 1>/dev/null 2>&1 + pidof -x ${prog} 1>/dev/null 2>&1 if [ $? -ne 0 ]; then return fi @@ -348,41 +348,41 @@ stop_prog() fi # first try normal kill - for pid in `/sbin/pidof -x ${prog}` + for pid in `pidof -x ${prog}` do echo "Softly killing ${prog}(${pid})" $asroot kill $pid 1>/dev/null 2>&1 - usleep 500000 + sleep 0.25 done # when normal kill did not work, kill is with -9 - for pid in `/sbin/pidof -x ${prog}` + for pid in `pidof -x ${prog}` do echo "Hard killing ${prog}(${pid})" $asroot kill -9 $pid 1>/dev/null 2>&1 - usleep 500000 + sleep 0.25 done # if user0 or lofarsys, try normal kill as root - for pid in `/sbin/pidof -x ${prog}` + for pid in `pidof -x ${prog}` do if [ "$user" == "user0" -o "$user" == "lofarsys" ]; then sudo kill $pid 1>/dev/null 2>&1 - usleep 50000 + sleep 0.25 fi done # if user0 or lofarsys, try hard kill as root - for pid in `/sbin/pidof -x ${prog}` + for pid in `pidof -x ${prog}` do if [ "$user" == "user0" -o "$user" == "lofarsys" ]; then sudo kill -9 $pid 1>/dev/null 2>&1 - usleep 50000 + sleep 0.25 fi done # if still alive, write a message - for pid in `/sbin/pidof -x ${prog}` + for pid in `pidof -x ${prog}` do echo -n "Could not kill ${prog}(${pid}); " if [ "$user" == "user0" -o "$user" == "lofarsys" ]; then @@ -442,9 +442,9 @@ status_prog() # find out the processID of the possibly (running) process obsid=() pid_user=() - /sbin/pidof -x ${prog} 1>/dev/null 2>&1 + pidof -x ${prog} 1>/dev/null 2>&1 if [ $? -eq 0 ]; then - pid=( `/sbin/pidof -x ${prog}` ) + pid=( `pidof -x ${prog}` ) i=0 for apid in ${pid[@]} do @@ -522,7 +522,7 @@ goto_level() # set rcumode to 0 (power save) when entering level 1 if [ ${newlevel} -le 1 ]; then if [ ${curlevel} -ge 2 ]; then - /sbin/pidof RSPDriver 1>/dev/null 2>&1 + pidof RSPDriver 1>/dev/null 2>&1 if [ $? -eq 0 ]; then status=`( rspctl --version | grep "0.0" ) >& /dev/null; echo $?` if [ $status == 1 ]; then