packages: nut/nut.init, nut/nut.spec - rel 3 - reworked ups daemon startup ...

[baggins]

Author: baggins                      Date: Fri Jul 15 10:21:58 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 3
- reworked ups daemon startup - start daemon always, even if some ups drivers
  did not start, without leaving half-started services in background

---- Files affected:
packages/nut:
   nut.init (1.15 -> 1.16) , nut.spec (1.166 -> 1.167) 

---- Diffs:

================================================================
Index: packages/nut/nut.init
diff -u packages/nut/nut.init:1.15 packages/nut/nut.init:1.16
--- packages/nut/nut.init:1.15	Mon Apr 26 16:53:30 2010
+++ packages/nut/nut.init	Fri Jul 15 12:21:53 2011
@@ -42,12 +42,13 @@
 	if [ ! -f /var/lock/subsys/ups ]; then
 		show "Starting UPS drivers"
 		daemon /lib/nut/upsdrvctl start
+		RETVALDRV=$?
+		msg_starting "UPS network daemon"
+		daemon /usr/sbin/upsd "$OPTIONS"
 		RETVAL=$?
 		if [ $RETVAL -eq 0 ]; then
-			msg_starting "UPS network daemon"
-			daemon /usr/sbin/upsd "$OPTIONS"
-			RETVAL=$?
 			touch /var/lock/subsys/ups
+			RETVAL=$RETVALDRV
 		fi
 	else
 		msg_already_running "UPS drivers and network daemon"

================================================================
Index: packages/nut/nut.spec
diff -u packages/nut/nut.spec:1.166 packages/nut/nut.spec:1.167
--- packages/nut/nut.spec:1.166	Sun Apr 10 22:47:01 2011
+++ packages/nut/nut.spec	Fri Jul 15 12:21:53 2011
@@ -14,7 +14,7 @@
 Summary(pl.UTF-8):	Sieciowe narzędzie do UPS-ów
 Name:		nut
 Version:	2.6.0
-Release:	2
+Release:	3
 License:	GPL
 Group:		Applications/System
 Source0:	http://www.networkupstools.org/source/2.6/%{name}-%{version}.tar.gz
@@ -467,6 +467,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.167  2011/07/15 10:21:53  baggins
+- rel 3
+- reworked ups daemon startup - start daemon always, even if some ups drivers
+  did not start, without leaving half-started services in background
+
 Revision 1.166  2011/04/10 20:47:01  wiget
 - fix pkgconfig file (ssl.patch)
 - drop libtool file
================================================================

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