diff options
| author | Michael Hanson <hansonorders@verison.net> | 2010-03-25 17:42:02 (GMT) |
|---|---|---|
| committer | Michael Hanson <hansonorders@verison.net> | 2010-03-25 17:42:02 (GMT) |
| commit | 10b4773ed5a39f59be3b9d9de0ddd7a53381df99 (patch) | |
| tree | 35b791b36bed16947225eba4a1a313777053acda /abs/extra-testing/community/network-ups-tools/finish.upsd | |
| parent | 517e1b135728c7e5674335e3ae1d9539044cd53a (diff) | |
| download | linhes_pkgbuild-10b4773ed5a39f59be3b9d9de0ddd7a53381df99.zip linhes_pkgbuild-10b4773ed5a39f59be3b9d9de0ddd7a53381df99.tar.gz linhes_pkgbuild-10b4773ed5a39f59be3b9d9de0ddd7a53381df99.tar.bz2 | |
network-ups-tools: Revert recent changes because they did not work as expected
re-instated looper in the run file
Diffstat (limited to 'abs/extra-testing/community/network-ups-tools/finish.upsd')
| -rw-r--r-- | abs/extra-testing/community/network-ups-tools/finish.upsd | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/abs/extra-testing/community/network-ups-tools/finish.upsd b/abs/extra-testing/community/network-ups-tools/finish.upsd index 4596ff1..8eb335b 100644 --- a/abs/extra-testing/community/network-ups-tools/finish.upsd +++ b/abs/extra-testing/community/network-ups-tools/finish.upsd @@ -3,8 +3,14 @@ . /etc/rc.conf . /etc/rc.d/functions -svwaitdown -t 3 -k /var/service/upsdrvctl /var/service/upsmon || exit 1 - PID=`pidof -o %PPID /usr/sbin/upsd` - stat_runit "Stopping UPSd Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null + stat_runit "Stopping UPSd Daemon" + /usr/bin/upsdrvctl stop &> /dev/null + /usr/sbin/upsmon -c stop &> /dev/null + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon upsd + stat_done + fi |