From 3aed2dd3c060911576914912e49fffe7583f00c8 Mon Sep 17 00:00:00 2001
From: Tomas Smetana <tsmetana@fedoraproject.org>
Date: Nov 29 2007 08:34:11 +0000
Subject: - init script update, fix a typo


---

diff --git a/nut.spec b/nut.spec
index 78367fe..537c6f1 100644
--- a/nut.spec
+++ b/nut.spec
@@ -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 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/libupsclient.pc
 
 %changelog
+* Thu Nov 29 2007 Tomas Smetana <tsmetana@redhat.com> 2.2.0-6.1
+- init script update, fix a typo
+
 * Wed Nov 28 2007 Tomas Smetana <tsmetana@redhat.com> 2.2.0-6
 - fix forgotten bug in init script
 - do not hardcode the uucp group in udev patch
diff --git a/ups.init b/ups.init
index a934574..72a8851 100644
--- a/ups.init
+++ b/ups.init
@@ -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 @@ start() {
 		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 @@ case "$1" in
 
 	status)
 		if [ "$SERVER" = "yes" ]; then
-			status upsdrvctl
 			status upsd
 		fi
 		status upsmon