rpms/smartmontools/devel smartd-conf.py, 1.3, 1.4 smartmontools.spec, 1.10, 1.11

[fedora-cvs-commits at redhat.com]

Author: tmraz

Update of /cvs/dist/rpms/smartmontools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17787

Modified Files:
	smartd-conf.py smartmontools.spec 
Log Message:
* Fri Nov 25 2005 Tomas Mraz <tmraz at redhat.com> 1:5.33-3
- add libata disks with -d ata if the libata version
  is new enough otherwise do not add them (#145859, #174095)



Index: smartd-conf.py
===================================================================
RCS file: /cvs/dist/rpms/smartmontools/devel/smartd-conf.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- smartd-conf.py	3 Nov 2005 17:06:22 -0000	1.3
+++ smartd-conf.py	25 Nov 2005 15:16:35 -0000	1.4
@@ -34,10 +34,24 @@
 # A very silent check.  Only report SMART health status if it fails
 # But send an email in this case"""
 
+def getfile(fname):
+    try:
+	fh = open(fname)
+        line = fh.read().rstrip()
+	fh.close()
+    except IOError:
+	line = ''
+    return line
+
 for drive in drives:
-    fh=open("/sys/block/%s/removable" % drive.device)
-    if fh.read(1) == '0':
-        print "/dev/%s -H -m root at localhost" % drive.device
+    if getfile("/sys/block/%s/removable" % drive.device) == '0':
+	driver = ''
+	comment = ''
+	if getfile("/sys/block/%s/device/vendor" % drive.device) == 'ATA':
+	    driver = '-d ata '
+	    if float(getfile("/sys/module/libata/version")) < 1.20:
+		comment = "# not yet supported in this kernel version "
+	print "%s/dev/%s %s-H -m root at localhost" % (comment, drive.device, driver)
 
 print """
 # First two SCSI disks.  This will monitor everything that smartd can


Index: smartmontools.spec
===================================================================
RCS file: /cvs/dist/rpms/smartmontools/devel/smartmontools.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- smartmontools.spec	3 Nov 2005 17:06:22 -0000	1.10
+++ smartmontools.spec	25 Nov 2005 15:16:35 -0000	1.11
@@ -1,7 +1,7 @@
 Summary:	Tools for monitoring SMART capable hard disks
 Name:		smartmontools
 Version:	5.33
-Release: 	2
+Release: 	3
 Epoch:		1
 Group:		System Environment/Base
 License:	GPL
@@ -69,6 +69,10 @@
 
 
 %changelog
+* Fri Nov 25 2005 Tomas Mraz <tmraz at redhat.com> 1:5.33-3
+- add libata disks with -d ata if the libata version
+  is new enough otherwise do not add them (#145859, #174095)
+
 * Thu Nov  3 2005 Tomas Mraz <tmraz at redhat.com> 1:5.33-2
 - Spec file cleanup by Robert Scheck <redhat at linuxnetz.de> (#170959)
 - manual release numbering