rpms/DeviceKit-disks/devel avoid-ata-smart-check-for-removable-disks.patch, NONE, 1.1 DeviceKit-disks.spec, 1.25, 1.26

[David Zeuthen]

Author: davidz

Update of /cvs/pkgs/rpms/DeviceKit-disks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30748

Modified Files:
	DeviceKit-disks.spec 
Added Files:
	avoid-ata-smart-check-for-removable-disks.patch 
Log Message:
* Tue May 19 2009 David Zeuthen <davidz at redhat.com> - 004-3%{?dist}
- Avoid checking whether device is ATA SMART capable if the device reports
  removable media (#494932)



avoid-ata-smart-check-for-removable-disks.patch:

--- NEW FILE avoid-ata-smart-check-for-removable-disks.patch ---
>From 458200bcc1e2b30940251d9b4c6c45a3b3757b54 Mon Sep 17 00:00:00 2001
From: David Zeuthen <davidz at redhat.com>
Date: Tue, 19 May 2009 21:43:25 +0000
Subject: Only check for ATA SMART if the device reports non-removable media

---
diff --git a/src/95-devkit-disks.rules b/src/95-devkit-disks.rules
index fb8b745..03647f3 100644
--- a/src/95-devkit-disks.rules
+++ b/src/95-devkit-disks.rules
@@ -60,8 +60,8 @@ ENV{ID_FS_TYPE}=="linux_raid_member", IMPORT{program}="/sbin/mdadm --examine --e
 # ata_id and usb_id
 #
 
-KERNEL=="sd*[!0-9]", ENV{ID_BUS}=="usb", ENV{DEVTYPE}=="disk", IMPORT{program}="devkit-disks-probe-ata-smart $tempnode"
-KERNEL=="sd*[!0-9]", ENV{ID_BUS}=="scsi", ENV{DEVTYPE}=="disk", ENV{ID_VENDOR}=="ATA", IMPORT{program}="devkit-disks-probe-ata-smart $tempnode"
+KERNEL=="sd*[!0-9]", ATTR{removable}=="0", ENV{ID_BUS}=="usb", ENV{DEVTYPE}=="disk", IMPORT{program}="devkit-disks-probe-ata-smart $tempnode"
+KERNEL=="sd*[!0-9]", ATTR{removable}=="0", ENV{ID_BUS}=="scsi", ENV{DEVTYPE}=="disk", ENV{ID_VENDOR}=="ATA", IMPORT{program}="devkit-disks-probe-ata-smart $tempnode"
 
 ##############################################################################################################
 
--
cgit v0.8.2


Index: DeviceKit-disks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-disks/devel/DeviceKit-disks.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- DeviceKit-disks.spec	1 May 2009 22:16:01 -0000	1.25
+++ DeviceKit-disks.spec	19 May 2009 21:53:35 -0000	1.26
@@ -12,7 +12,7 @@
 Summary: Disk Management Service
 Name: DeviceKit-disks
 Version: 004
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://gitweb.freedesktop.org/?p=users/david/DeviceKit-disks.git;a=summary
@@ -59,6 +59,8 @@ Requires: ntfsprogs
 # for /proc/self/mountinfo, only available in 2.6.26 or higher
 Conflicts: kernel < 2.6.26
 
+Patch0: avoid-ata-smart-check-for-removable-disks.patch
+
 %description
 DeviceKit-disks provides a daemon, D-Bus API and command line tools
 for managing disks and storage devices.
@@ -75,6 +77,7 @@ D-Bus interface definitions for DeviceKi
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure
@@ -132,6 +135,10 @@ rm -rf $RPM_BUILD_ROOT
 
 # Note: please don't forget the %{?dist} in the changelog. Thanks
 %changelog
+* Tue May 19 2009 David Zeuthen <davidz at redhat.com> - 004-3%{?dist}
+- Avoid checking whether device is ATA SMART capable if the device reports
+  removable media (#494932)
+
 * Fri May 01 2009 David Zeuthen <davidz at redhat.com> - 004-2%{?dist}
 - Rebuild