diff options
| author | James Meyer <james.meyer@operamail.com> | 2010-03-26 02:22:35 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2010-03-26 02:22:35 (GMT) |
| commit | 8c2744ed3742d8aaf6639e5c4ec3b6e7f75c7a6a (patch) | |
| tree | 6304a4abdc3aea91e6d9aef46ba5ee7dd61c1e56 /abs/extra-testing/community/network-ups-tools/finish.upsd | |
| parent | 32703c5df89f76df235f2ef2d2a561274fc32c44 (diff) | |
| parent | 43e339db3b03991725137cc1538215c26d5c9b64 (diff) | |
| download | linhes_pkgbuild-8c2744ed3742d8aaf6639e5c4ec3b6e7f75c7a6a.zip linhes_pkgbuild-8c2744ed3742d8aaf6639e5c4ec3b6e7f75c7a6a.tar.gz linhes_pkgbuild-8c2744ed3742d8aaf6639e5c4ec3b6e7f75c7a6a.tar.bz2 | |
Merge branch 'HEAD' of ssh://jams@knoppmyth.net/mount/repository/LinHES-PKGBUILD
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 |