rpms/hddtemp/EL-5 hddtemp.init,1.2,1.3 hddtemp.spec,1.20,1.21

[Ville Skytta (scop)]

Author: scop

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

Modified Files:
	hddtemp.init hddtemp.spec 
Log Message:
Sync with devel


Index: hddtemp.init
===================================================================
RCS file: /cvs/pkgs/rpms/hddtemp/EL-5/hddtemp.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hddtemp.init	4 Dec 2004 22:43:31 -0000	1.2
+++ hddtemp.init	5 Sep 2007 05:58:37 -0000	1.3
@@ -1,37 +1,46 @@
-#!/bin/sh
+#!/bin/bash
 #
 # hddtemp       This shell script takes care of starting and stopping hddtemp.
 #
-# chkconfig:    - 90 10
+# chkconfig:    - 80 20
 # description:  hddtemp provides information about hard drives' temperature
 # processname:  hddtemp
 # config:       __ETCDIR__/sysconfig/hddtemp
 
+### BEGIN INIT INFO
+# Provides: hddtemp
+# Required-Start: $network
+# Required-Stop: $network
+# Should-Start: $syslog
+# Should-Stop: $syslog
+# Short-Description: Hard drive temperature monitor daemon
+# Description: Provides information about hard drives' temperatures.
+### END INIT INFO
+
 . __ETCDIR__/sysconfig/hddtemp
 
 # Source function library.
 . __INITDIR__/functions
 
-# Source networking configuration.
-. __ETCDIR__/sysconfig/network
-
-# Check that networking is up.
-[ "$NETWORKING" = "no" ] && exit 0
-
 # Backwards compatibility.
 [ -z "$HDDTEMP_OPTIONS" -a -n "$HDDTEMPARGS" ] && \
   HDDTEMP_OPTIONS="$HDDTEMPARGS"
 HDDTEMP_OPTIONS="$HDDTEMP_OPTIONS $HDDTEMP_DAEMON_OPTIONS"
 
-exec="__SBINDIR__/hddtemp"
-prog=$(basename $exec)
+exec=__SBINDIR__/hddtemp
+prog=${exec##*/}
 lockfile=__LOCKDIR__/subsys/$prog
 
 start() {
-    echo -n $"Starting hard disk temperature monitor daemon ($prog): "
-    daemon $exec -d $HDDTEMP_OPTIONS
-    retval=$?
-    echo
+    if [[ "$HDDTEMP_OPTIONS" != */dev/* ]] ; then
+        action $"Unconfigured: $prog, see __ETCDIR__/sysconfig/hddtemp: " /bin/false
+        retval=6
+    else
+        echo -n $"Starting hard disk temperature monitor daemon ($prog): "
+        daemon $exec -d $HDDTEMP_OPTIONS
+        retval=$?
+        echo
+    fi
     [ $retval -eq 0 ] && touch $lockfile
     return $retval
 }
@@ -55,16 +64,22 @@
     start|stop|restart)
         $1
         ;;
-    reload|force-reload)
+    force-reload)
         restart
         ;;
     status)
         status $prog
         ;;
     try-restart|condrestart)
-        [ ! -f $lockfile ] || restart
+        if status $prog >/dev/null ; then
+            restart
+        fi
+        ;;
+    reload)
+        action $"Service $prog does not support the reload action: " /bin/false
+        exit 3
         ;;
     *)
-        echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}"
+        echo $"Usage: $0 {start|stop|status|restart|try-restart|force-reload}"
         exit 2
 esac


Index: hddtemp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hddtemp/EL-5/hddtemp.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- hddtemp.spec	21 Mar 2007 19:09:04 -0000	1.20
+++ hddtemp.spec	5 Sep 2007 05:58:37 -0000	1.21
@@ -2,11 +2,11 @@
 
 Name:           hddtemp
 Version:        0.3
-Release:        0.11.%{beta}%{?dist}
+Release:        0.14.%{beta}%{?dist}
 Summary:        Hard disk temperature tool
 
 Group:          Applications/System
-License:        GPL
+License:        GPLv2+
 URL:            http://www.guzu.net/linux/hddtemp.php
 Source0:        http://www.guzu.net/files/%{name}-%{version}-%{beta}.tar.bz2
 Source1:        http://www.guzu.net/linux/hddtemp.db
@@ -90,11 +90,22 @@
 %{_initrddir}/hddtemp
 %{_bindir}/hddtemp
 %{_sbindir}/hddtemp
-%config /usr/share/misc/hddtemp.db
+%config(noreplace) /usr/share/misc/hddtemp.db
 %{_mandir}/man8/hddtemp.8*
 
 
 %changelog
+* Wed Sep  5 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.3-0.14.beta15
+- Adjust server chkconfig start/stop priorities to start before gkrellmd,
+  other cosmetic init script tweaks.
+- Mark hddtemp.db as %%config(noreplace).
+
+* Mon Aug  6 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.3-0.13.beta15
+- License: GPLv2+
+
+* Tue Jul 10 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.3-0.12.beta15
+- Improve init script LSB compliance.
+
 * Tue Jan  9 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.3-0.11.beta15
 - SATA sense fix (#221100, Jens Axboe).