[Apcupsd-commits] apcupsd/platforms/freebsd apccontrol.in,1.7,1.8

[Adam K. <ad...@us...>]

Update of /cvsroot/apcupsd/apcupsd/platforms/freebsd
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv21654/platforms/freebsd

Modified Files:
	apccontrol.in 
Log Message:
Merge 3.14.1-3.14.2+ changes from Branch-3_14.


Index: apccontrol.in
===================================================================
RCS file: /cvsroot/apcupsd/apcupsd/platforms/freebsd/apccontrol.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- apccontrol.in	26 Nov 2006 14:55:33 -0000	1.7
+++ apccontrol.in	30 Sep 2007 19:49:42 -0000	1.8
@@ -58,15 +58,14 @@
 		printf "Communciations with UPS restored." | wall
 	;;
 	powerout)
-		printf "Warning power loss detected." | wall
 	;;
 	onbattery)
 		printf "Power failure. Running on UPS batteries." | wall
 	;;
 	offbattery)
+		printf "Power has returned..." | wall
 	;;
 	mainsback)
-		printf "Power has returned..." | wall
 		if [ -f @PWRFAILDIR@/powerfail ] ; then
 		   printf "Continuing with shutdown."  | wall
 		fi
@@ -106,17 +105,6 @@
 	remotedown)
 		printf "Remote Shutdown.\nBeginning Shutdown Sequence." | wall
 	;;
-	restartme)
-		echo -n "Restarting APCUPSD Power Management: "
-		THEPID=`cat ${APCPID}`
-		kill ${THEPID}
-		rm -f ${APCPID}
-		rm -f @PWRFAILDIR@/powerfail
-		rm -f @nologdir@/nologin
-		sleep 5
-		`${APCUPSD} --kill-on-powerfail`
-		echo "apcupsd"
-	;;
 	startselftest)
 	;;
 	endselftest)