diff options
author | shattered <shattered@pkgsrc.org> | 2012-05-07 12:55:23 +0000 |
---|---|---|
committer | shattered <shattered@pkgsrc.org> | 2012-05-07 12:55:23 +0000 |
commit | 5446e53571fe7310daa09f9e200f4e8f51ae35b2 (patch) | |
tree | af92ddaaf65f52058cc729009794e55cc718e00b /sysutils/apcupsd | |
parent | cd7dabbba2c5e5b0378999c56f621159b7efb2bd (diff) | |
download | pkgsrc-5446e53571fe7310daa09f9e200f4e8f51ae35b2.tar.gz |
Proofread apccontrol's messages. Raise syslog severity for 'emergency'
message to 'crit'.
Diffstat (limited to 'sysutils/apcupsd')
-rw-r--r-- | sysutils/apcupsd/Makefile | 4 | ||||
-rw-r--r-- | sysutils/apcupsd/distinfo | 4 | ||||
-rw-r--r-- | sysutils/apcupsd/patches/patch-ad | 28 |
3 files changed, 18 insertions, 18 deletions
diff --git a/sysutils/apcupsd/Makefile b/sysutils/apcupsd/Makefile index 04f5c1cbcde..2e210a81dae 100644 --- a/sysutils/apcupsd/Makefile +++ b/sysutils/apcupsd/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.67 2012/02/18 21:10:48 bouyer Exp $ +# $NetBSD: Makefile,v 1.68 2012/05/07 12:55:23 shattered Exp $ DISTNAME= apcupsd-3.14.9 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=apcupsd/} diff --git a/sysutils/apcupsd/distinfo b/sysutils/apcupsd/distinfo index 49960b1ebb0..bed358a0d7f 100644 --- a/sysutils/apcupsd/distinfo +++ b/sysutils/apcupsd/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.18 2012/02/19 18:21:58 bouyer Exp $ +$NetBSD: distinfo,v 1.19 2012/05/07 12:55:23 shattered Exp $ SHA1 (apcupsd-3.14.9.tar.gz) = 1e9e8a054f17c554c047ec1d7b363d35553058bc RMD160 (apcupsd-3.14.9.tar.gz) = be1a33b85c790fc3bc62bab370a62d014dbf0a57 Size (apcupsd-3.14.9.tar.gz) = 1334762 bytes SHA1 (patch-ab) = 3db85accf1b05c8723dd7625278dfac02909dc34 SHA1 (patch-ac) = 98e8853dd030e09d5a487e57a277ff1269baa517 -SHA1 (patch-ad) = 48818f95966f5c9f742e333614b0ab5387886e62 +SHA1 (patch-ad) = 2877fd13513c96f4489953b539012b03c16b0223 SHA1 (patch-ae) = 9deb5f88617ea4fa81308567f4e65851c05e3f86 SHA1 (patch-af) = 0e230b543aa72c6d5799b2223e52f2d932255e4f SHA1 (patch-ag) = c160cf80182edd0e42323dd24eddff7ae91c0e13 diff --git a/sysutils/apcupsd/patches/patch-ad b/sysutils/apcupsd/patches/patch-ad index b4b414d917d..2a986cf4771 100644 --- a/sysutils/apcupsd/patches/patch-ad +++ b/sysutils/apcupsd/patches/patch-ad @@ -1,7 +1,7 @@ -$NetBSD: patch-ad,v 1.4 2006/11/15 21:46:25 bouyer Exp $ +$NetBSD: patch-ad,v 1.5 2012/05/07 12:55:23 shattered Exp $ ---- /dev/null 2006-11-15 17:26:11.000000000 +0100 -+++ platforms/netbsd/apccontrol.in 2006-11-15 17:42:37.000000000 +0100 +--- platforms/netbsd/apccontrol.in.orig 2012-04-21 20:53:17.000000000 +0000 ++++ platforms/netbsd/apccontrol.in @@ -0,0 +1,147 @@ +#!@SCRIPTSHELL@ +# @@ -58,15 +58,15 @@ $NetBSD: patch-ad,v 1.4 2006/11/15 21:46:25 bouyer Exp $ + ;; + commfailure) + printf "Communications with UPS lost." | wall -+ /usr/bin/logger -p user.info -t apccontrol "Warning serial port communications with UPS lost." ++ /usr/bin/logger -p user.info -t apccontrol "Warning, serial port communications with UPS lost." + ;; + commok) -+ printf "Communciations with UPS restored." | wall -+ /usr/bin/logger -p user.info -t apccontrol "Communciations with UPS restored." ++ printf "Communications with UPS restored." | wall ++ /usr/bin/logger -p user.info -t apccontrol "Communications with UPS restored." + ;; + powerout) + printf "Warning power loss detected." | wall -+ /usr/bin/logger -p user.info -t apccontrol "Warning power loss detected." ++ /usr/bin/logger -p user.info -t apccontrol "Warning, power loss detected." + ;; + onbattery) + printf "Power failure. Running on UPS batteries." | wall @@ -84,20 +84,20 @@ $NetBSD: patch-ad,v 1.4 2006/11/15 21:46:25 bouyer Exp $ + ;; + failing) + printf "UPS battery power exhaused. Doing shutdown.\n" | wall -+ /usr/bin/logger -p user.info -t apccontrol "UPS battery power exhaused. Doing shutdown.\n" ++ /usr/bin/logger -p user.info -t apccontrol "UPS battery power exhaused. Doing shutdown." + ;; + timeout) + printf "UPS battery runtime limit exceeded. Doing shutdown.\n" | wall -+ /usr/bin/logger -p user.info -t apccontrol "UPS battery runtime limit exceeded. Doing shutdown.\n" ++ /usr/bin/logger -p user.info -t apccontrol "UPS battery runtime limit exceeded. Doing shutdown." + ;; + loadlimit) + printf "UPS battery discharge limit reached. Doing shutdown.\n" | wall -+ /usr/bin/logger -p user.info -t apccontrol "UPS battery discharge limit reached. Doing shutdown.\n" ++ /usr/bin/logger -p user.info -t apccontrol "UPS battery discharge limit reached. Doing shutdown." + ;; + runlimit) + printf "UPS battery runtime percent reached. Doing shutdown.\n" \ + | wall -+ /usr/bin/logger -p user.info -t apccontrol "UPS battery runtime percent reached. Doing shutdown.\n" ++ /usr/bin/logger -p user.info -t apccontrol "UPS battery runtime percent reached. Doing shutdown." + ;; + doreboot) + printf "Beginning Reboot Sequence" | wall @@ -108,18 +108,18 @@ $NetBSD: patch-ad,v 1.4 2006/11/15 21:46:25 bouyer Exp $ + ${SHUTDOWN} -h now "apcupsd initiated shutdown" + ;; + annoyme) -+ printf "Power problems please logoff." | wall ++ printf "Power problems, please logoff." | wall + ;; + emergency) + printf "Emergency Shutdown. Possible UPS battery failure." \ + | wall -+ /usr/bin/logger -p user.info -t apccontrol "Emergency Shutdown. Possible UPS battery failure." ++ /usr/bin/logger -p user.crit -t apccontrol "Emergency Shutdown. Possible UPS battery failure." + ${SHUTDOWN} -h now "apcupsd emergency shutdown" + ;; + changeme) + printf "Emergency! UPS batteries have failed\nChange them NOW" \ + | wall -+ /usr/bin/logger -p user.info -t apccontrol "Emergency! UPS batteries have failed\nChange them NOW" ++ /usr/bin/logger -p user.info -t apccontrol "Emergency! UPS batteries have failed. Change them NOW." + ;; + remotedown) + printf "Remote Shutdown.\nBeginning Shutdown Sequence." | wall |