rpms/nut/devel nut.spec,1.52,1.53 ups.init,1.10,1.11

[Tomas Smetana (tsmetana)]

Author: tsmetana

Update of /cvs/pkgs/rpms/nut/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20617

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



Index: nut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nut/devel/nut.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- nut.spec	28 Nov 2007 11:36:01 -0000	1.52
+++ nut.spec	29 Nov 2007 08:34:11 -0000	1.53
@@ -9,7 +9,7 @@
 Summary: Network UPS Tools
 Name: nut
 Version: 2.2.0
-Release: 6%{?dist}
+Release: 6.1%{?dist}
 Group: Applications/System
 License: GPLv2+
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -301,6 +301,9 @@
 %{_libdir}/pkgconfig/libupsclient.pc
 
 %changelog
+* Thu Nov 29 2007 Tomas Smetana <tsmetana at redhat.com> 2.2.0-6.1
+- init script update, fix a typo
+
 * Wed Nov 28 2007 Tomas Smetana <tsmetana at redhat.com> 2.2.0-6
 - fix forgotten bug in init script
 - do not hardcode the uucp group in udev patch


Index: ups.init
===================================================================
RCS file: /cvs/pkgs/rpms/nut/devel/ups.init,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ups.init	28 Nov 2007 11:22:50 -0000	1.10
+++ ups.init	29 Nov 2007 08:34:11 -0000	1.11
@@ -1,11 +1,22 @@
 #! /bin/bash
 #
+# ups: Starts the Network UPS Tools
+#
 # chkconfig: - 26 74
 # description: Network UPS Tools is a collection of programs which provide a common \
-# interface for monitoring and administering UPS hardware.
-
+#		interface for monitoring and administering UPS hardware.
 # processname: upsd
 # config: /etc/ups/
+# config: /etc/sysconfig/ups
+#
+### BEGIN INIT INFO
+# Provides: ups
+# Required-Start: $syslog $network $named
+# Default-Stop: 0 1 6
+# Short-Description: Starts the Network UPS tools
+# Description: Network UPS Tools is a collection of programs which provide a common \
+#		interface for monitoring and administering UPS hardware. 
+### END INIT INFO
 
 # Source function library.
 if [ -f /etc/init.d/functions ]; then
@@ -39,7 +50,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,7 +127,6 @@
 
 	status)
 		if [ "$SERVER" = "yes" ]; then
-			status upsdrvctl
 			status upsd
 		fi
 		status upsmon