rpms/hddtemp/devel hddtemp.init, 1.4, 1.5 hddtemp.spec, 1.28, 1.29 hddtemp.sysconfig, 1.2, 1.3

[Ville Skyttä]

Author: scop

Update of /cvs/pkgs/rpms/hddtemp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20751

Modified Files:
	hddtemp.init hddtemp.spec hddtemp.sysconfig 
Log Message:
* Thu Aug 20 2009 Ville Skyttä <ville.skytta at iki.fi> - 0.3-0.19.beta15
- Try to start daemon for all disks if none are specified in sysconfig.
- Update URLs.



Index: hddtemp.init
===================================================================
RCS file: /cvs/pkgs/rpms/hddtemp/devel/hddtemp.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- hddtemp.init	4 Sep 2007 21:23:29 -0000	1.4
+++ hddtemp.init	20 Aug 2009 14:16:23 -0000	1.5
@@ -33,6 +33,13 @@ lockfile=__LOCKDIR__/subsys/$prog
 
 start() {
     if [[ "$HDDTEMP_OPTIONS" != */dev/* ]] ; then
+        # Try all disks
+        for disk in /dev/hd[a-z] /dev/sd[a-z] ; do
+            [ -b "$disk" ] && HDDTEMP_OPTIONS="$HDDTEMP_OPTIONS $disk"
+        done
+    fi
+    if [[ "$HDDTEMP_OPTIONS" != */dev/* ]] ; then
+        # Still no disks, bail out
         action $"Unconfigured: $prog, see __ETCDIR__/sysconfig/hddtemp: " /bin/false
         retval=6
     else


Index: hddtemp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hddtemp/devel/hddtemp.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- hddtemp.spec	25 Jul 2009 02:03:57 -0000	1.28
+++ hddtemp.spec	20 Aug 2009 14:16:23 -0000	1.29
@@ -2,14 +2,14 @@
 
 Name:           hddtemp
 Version:        0.3
-Release:        0.18.%{beta}%{?dist}
+Release:        0.19.%{beta}%{?dist}
 Summary:        Hard disk temperature tool
 
 Group:          Applications/System
 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
+URL:            http://savannah.nongnu.org/projects/hddtemp/
+Source0:        http://download.savannah.nongnu.org/releases/hddtemp/%{name}-%{version}-%{beta}.tar.bz2
+Source1:        http://download.savannah.nongnu.org/releases/hddtemp/hddtemp.db
 Source2:        %{name}.init
 Source3:        %{name}.sysconfig
 Source4:        %{name}.pam
@@ -93,50 +93,54 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 20 2009 Ville Skyttä <ville.skytta at iki.fi> - 0.3-0.19.beta15
+- Try to start daemon for all disks if none are specified in sysconfig.
+- Update URLs.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3-0.18.beta15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3-0.17.beta15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Wed Oct  1 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.3-0.16.beta15
+* Wed Oct  1 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.3-0.16.beta15
 - Sync with Debian's 0.3-beta15-45 for a fix for undesired spin-ups with
   most current drives (#464912).
 
-* Sat Feb  9 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.3-0.15.beta15
+* Sat Feb  9 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.3-0.15.beta15
 - Sync with Debian's 0.3-beta15-38.
 - Update drive database to 2007-09-14.
 - Trim pre-2006 changelog entries.
 
-* Wed Sep  5 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.3-0.14.beta15
+* 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
+* 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
+* 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
+* Tue Jan  9 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.3-0.11.beta15
 - SATA sense fix (#221100, Jens Axboe).
 
-* Sun Dec 31 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.3-0.10.beta15
+* Sun Dec 31 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.3-0.10.beta15
 - Apply patches from Debian containing bunch of hddtemp.db updates and
   guess mode improvements for drives not in the database.
 
-* Wed Aug 30 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.3-0.9.beta15
+* Wed Aug 30 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.3-0.9.beta15
 - Rebuild.
 
-* Wed May  3 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.3-0.8.beta15
+* Wed May  3 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.3-0.8.beta15
 - 0.3-beta15, drive database 2006-04-26.
 - Specfile cleanups.
 
-* Wed Feb  8 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.3-0.8.beta14
+* Wed Feb  8 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.3-0.8.beta14
 - Update drive database to 2006-02-07.
 
-* Wed Jan 18 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.3-0.7.beta14
+* Wed Jan 18 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.3-0.7.beta14
 - Update drive database to 2006-01-18.
 - Init script is not a config file.
 - Mark console.perms snippet as noreplace.


Index: hddtemp.sysconfig
===================================================================
RCS file: /cvs/pkgs/rpms/hddtemp/devel/hddtemp.sysconfig,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- hddtemp.sysconfig	4 Dec 2004 22:43:31 -0000	1.2
+++ hddtemp.sysconfig	20 Aug 2009 14:16:23 -0000	1.3
@@ -1,4 +1,5 @@
 #
-# hddtemp(8) daemon options.  Add at least the disk(s) you want to monitor here.
+# hddtemp(8) daemon options.  If no disks are specified here, the init script
+# will try to autodetect and start monitoring all of them.
 #
 HDDTEMP_OPTIONS="-l 127.0.0.1"