rpms/nut/EL-5 nut.spec,1.49,1.50 ups.init,1.9,1.10

[Tomas Smetana (tsmetana)]

Author: tsmetana

Update of /cvs/pkgs/rpms/nut/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19331

Modified Files:
	nut.spec ups.init 
Log Message:
* Thu Nov 29 2007 Tomas Smetana <tsmetana at redhat.com> 2.2.0-5.1
- update init script



Index: nut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nut/EL-5/nut.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- nut.spec	28 Nov 2007 09:21:04 -0000	1.49
+++ nut.spec	29 Nov 2007 08:13:44 -0000	1.50
@@ -9,7 +9,7 @@
 Summary: Network UPS Tools
 Name: nut
 Version: 2.2.0
-Release: 5%{?dist}
+Release: 5.1%{?dist}
 Group: Applications/System
 License: GPLv2+
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -297,6 +297,9 @@
 %{_libdir}/pkgconfig/libupsclient.pc
 
 %changelog
+* Thu Nov 29 2007 Tomas Smetana <tsmetana at redhat.com> 2.2.0-5.1
+- update init script
+
 * Tue Nov 27 2007 Tomas Smetana <tsmetana at redhat.com> 2.2.0-5
 - fix udev rules
 - fix init script


Index: ups.init
===================================================================
RCS file: /cvs/pkgs/rpms/nut/EL-5/ups.init,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ups.init	28 Nov 2007 09:21:04 -0000	1.9
+++ ups.init	29 Nov 2007 08:13:44 -0000	1.10
@@ -39,7 +39,7 @@
 		echo
 
 		echo -n $"Starting UPS monitor (master): "
-		daemon /usr/sbin/upsmon > dev/null 2>&1 && success || failure
+		daemon /usr/sbin/upsmon > /dev/null 2>&1 && success || failure
 		if [ "$RETVAL" = 0 ]; then
 			RETVAL=$?
 		fi
@@ -116,15 +116,6 @@
 
 	status)
 		if [ "$SERVER" = "yes" ]; then
-			if [ "$MODEL" = "upsdrvctl" ]; then
-				# show status of each configured driver
-				for MYMODEL in $(egrep '^[[:space:]]*driver' /etc/ups/ups.conf \
-						| sed 's/.*=[[:space:]]*//'); do 
-					status $MYMODEL
-				done
-			else
-				status $MODEL
-			fi
 			status upsd
 		fi
 		status upsmon