packages: nut/nut.init - fixed starting via start-stop-daemon (with RC_LOGG...

[gotar]

Author: gotar                        Date: Mon Apr 26 14:53:35 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fixed starting via start-stop-daemon (with RC_LOGGING="no"), full path,
- don't use daemon for reload since start-stop-daemon --start in use,
- no upsdrvctl reload command, stop and start instead (maybe remove it?),
- use upsd -c stop instead of killproc, no upsdrvctl status command

---- Files affected:
packages/nut:
   nut.init (1.14 -> 1.15) 

---- Diffs:

================================================================
Index: packages/nut/nut.init
diff -u packages/nut/nut.init:1.14 packages/nut/nut.init:1.15
--- packages/nut/nut.init:1.14	Wed May 18 15:34:28 2005
+++ packages/nut/nut.init	Mon Apr 26 16:53:30 2010
@@ -45,7 +45,7 @@
 		RETVAL=$?
 		if [ $RETVAL -eq 0 ]; then
 			msg_starting "UPS network daemon"
-			daemon "upsd $OPTIONS"
+			daemon /usr/sbin/upsd "$OPTIONS"
 			RETVAL=$?
 			touch /var/lock/subsys/ups
 		fi
@@ -56,7 +56,7 @@
   stop)
 	if [ -f /var/lock/subsys/ups ]; then
 		msg_stopping "UPS daemon"
-		killproc upsd
+		/usr/sbin/upsd -c stop
 		run_cmd "Stopping UPS drivers" /lib/nut/upsdrvctl stop
 		rm -f /var/lock/subsys/ups
 	else
@@ -71,10 +71,11 @@
   reload|force-reload)
 	if [ -f /var/lock/subsys/ups ]; then
 		show "Reloading UPS drivers"
-		daemon /lib/nut/upsdrvctl reload
+		/lib/nut/upsdrvctl stop
+		/lib/nut/upsdrvctl start
 		[ $? -ne 0 ] && RETVAL=7
 		msg_reloading "UPS network daemon"
-		daemon upsd -c reload
+		/usr/sbin/upsd -c reload
 		[ $? -ne 0 ] && RETVAL=7
 	else
 		msg_not_running "UPS daemon" >&2
@@ -82,15 +83,14 @@
 	fi
 	;;
   powerdown)
-  	show "Switching the power off" ; busy
+	show "Switching the power off"; busy
 	/lib/nut/upsdrvctl shutdown
 	sleep 60
 	fail
-  	;;
+	;;
   status)
 	status upsd
 	RETVAL=$?
-	/lib/nut/upsdrvctl status
 	;;
   *)
 	msg_usage "$0 {start|stop|restart|reload|force-reload|status|powerdown}"
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nut/nut.init?r1=1.14&r2=1.15&f=u