← Back to branch summary

~ubuntu-branches/ubuntu/lucid/devicekit-disks/lucid

« back to all changes in this revision

Viewing changes to debian/patches/git-fix-ata-smart-detection.patch

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2009-08-07 10:36:18 UTC
  • Revision ID: james.westby@ubuntu.com-20090807103618-bxy7z0b2s3euyk7u
Tags: 005-0ubuntu6
* Add git-fix-ata-smart-detection.patch: Recent udev started using ata_id
  instead of scsi_id.
* Rebuild against libatasmart4, bump build dependency.
* Add 0002-port-to-libatasmart-0.14-API.patch to build with current
  libatasmart.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/git-fix-ata-smart-detection.patch
 
1
From f7e0e966c86197c7734b05dbdfe2a0386e41b658 Mon Sep 17 00:00:00 2001
 
2
From: David Zeuthen <davidz@redhat.com>
 
3
Date: Wed, 22 Jul 2009 14:53:54 +0000
 
4
Subject: Fix up ATA SMART detection
 
5
 
 
6
Recent udev started using ata_id instead of scsi_id.
 
7
 
 
8
Also migrate from SYSFS to ATTR/ATTRS.
 
9
---
 
10
diff --git a/data/95-devkit-disks.rules b/data/95-devkit-disks.rules
 
11
index 7058897..584810a 100644
 
12
--- a/src/95-devkit-disks.rules
 
13
+++ b/src/95-devkit-disks.rules
 
14
@@ -13,7 +13,7 @@ KERNEL=="mtd*|nbd*|gnbd*|btibm*", GOTO="probe_parttable_end"
 
15
 
 
16
 # never access non-cdrom removable ide devices, the drivers are causing event loops on open()
 
17
 KERNEL=="hd*[!0-9]", ATTR{removable}=="1", SUBSYSTEMS=="ide", ATTRS{media}=="disk|floppy", GOTO="probe_parttable_end"
 
18
-KERNEL=="hd*[0-9]", ATTRS{removable}=="1", GOTO="probe_parttable_end"
 
19
+KERNEL=="hd*[0-9]", ATTR{removable}=="1", GOTO="probe_parttable_end"
 
20
 
 
21
 # don't scan for partition tables on empty discs
 
22
 KERNEL=="sr*", ENV{ID_CDROM_MEDIA}!="?*", GOTO="probe_parttable_end"
 
23
@@ -68,7 +68,14 @@ LABEL="md_end"
 
24
 
 
25
 # Check if a disk is ATA SMART capable
 
26
 #
 
27
+
 
28
+# USB ATA enclosures with a SAT layer
 
29
 KERNEL=="sd*[!0-9]", ATTR{removable}=="0", ENV{ID_BUS}=="usb", ENV{DEVTYPE}=="disk", IMPORT{program}="devkit-disks-probe-ata-smart $tempnode"
 
30
+
 
31
+# ATA disks driven by libata
 
32
+KERNEL=="sd*[!0-9]", ATTR{removable}=="0", ENV{ID_BUS}=="ata", ENV{DEVTYPE}=="disk", IMPORT{program}="devkit-disks-probe-ata-smart $tempnode"
 
33
+
 
34
+# ATA disks connected via SAS (not driven by libata)
 
35
 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"
 
36
 
 
37
 ##############################################################################################################
 
38
@@ -76,19 +83,19 @@ KERNEL=="sd*[!0-9]", ATTR{removable}=="0", ENV{ID_BUS}=="scsi", ENV{DEVTYPE}=="d
 
39
 # Example rule for tagging a device with a specific media type. Where and
 
40
 # how to store this database needs some thought.
 
41
 #
 
42
-SYSFS{idVendor}=="050d", SYSFS{idProduct}=="0248", ENV{ID_INSTANCE}=="0:0", ENV{ID_DRIVE_FLASH_CF}="1"
 
43
-SYSFS{idVendor}=="050d", SYSFS{idProduct}=="0248", ENV{ID_INSTANCE}=="0:1", ENV{ID_DRIVE_FLASH_MS}="1"
 
44
-SYSFS{idVendor}=="050d", SYSFS{idProduct}=="0248", ENV{ID_INSTANCE}=="0:2", ENV{ID_DRIVE_FLASH_SM}="1"
 
45
-SYSFS{idVendor}=="050d", SYSFS{idProduct}=="0248", ENV{ID_INSTANCE}=="0:3", ENV{ID_DRIVE_FLASH_SD}="1"
 
46
+ATTRS{idVendor}=="050d", ATTRS{idProduct}=="0248", ENV{ID_INSTANCE}=="0:0", ENV{ID_DRIVE_FLASH_CF}="1"
 
47
+ATTRS{idVendor}=="050d", ATTRS{idProduct}=="0248", ENV{ID_INSTANCE}=="0:1", ENV{ID_DRIVE_FLASH_MS}="1"
 
48
+ATTRS{idVendor}=="050d", ATTRS{idProduct}=="0248", ENV{ID_INSTANCE}=="0:2", ENV{ID_DRIVE_FLASH_SM}="1"
 
49
+ATTRS{idVendor}=="050d", ATTRS{idProduct}=="0248", ENV{ID_INSTANCE}=="0:3", ENV{ID_DRIVE_FLASH_SD}="1"
 
50
 
 
51
-SYSFS{idVendor}=="05e3", SYSFS{idProduct}=="070e", ENV{ID_INSTANCE}=="0:0", ENV{ID_DRIVE_FLASH_CF}="1"
 
52
-SYSFS{idVendor}=="05e3", SYSFS{idProduct}=="070e", ENV{ID_INSTANCE}=="0:1", ENV{ID_DRIVE_FLASH_SM}="1"
 
53
-SYSFS{idVendor}=="05e3", SYSFS{idProduct}=="070e", ENV{ID_INSTANCE}=="0:2", ENV{ID_DRIVE_FLASH_SD}="1"
 
54
-SYSFS{idVendor}=="05e3", SYSFS{idProduct}=="070e", ENV{ID_INSTANCE}=="0:3", ENV{ID_DRIVE_FLASH_MS}="1"
 
55
+ATTRS{idVendor}=="05e3", ATTRS{idProduct}=="070e", ENV{ID_INSTANCE}=="0:0", ENV{ID_DRIVE_FLASH_CF}="1"
 
56
+ATTRS{idVendor}=="05e3", ATTRS{idProduct}=="070e", ENV{ID_INSTANCE}=="0:1", ENV{ID_DRIVE_FLASH_SM}="1"
 
57
+ATTRS{idVendor}=="05e3", ATTRS{idProduct}=="070e", ENV{ID_INSTANCE}=="0:2", ENV{ID_DRIVE_FLASH_SD}="1"
 
58
+ATTRS{idVendor}=="05e3", ATTRS{idProduct}=="070e", ENV{ID_INSTANCE}=="0:3", ENV{ID_DRIVE_FLASH_MS}="1"
 
59
 
 
60
 # Apple iPod Video
 
61
 #
 
62
-SYSFS{idVendor}=="05ac", SYSFS{idProduct}=="1209", ENV{DKD_PRESENTATION_ICON_NAME}="multimedia-player-ipod-white"
 
63
+ATTRS{idVendor}=="05ac", ATTRS{idProduct}=="1209", ENV{DKD_PRESENTATION_ICON_NAME}="multimedia-player-ipod-white"
 
64
 
 
65
 ##############################################################################################################
 
66
 
 
67
@@ -98,7 +105,7 @@ KERNEL=="fd*", ENV{ID_DRIVE_FLOPPY}="1"
 
68
 
 
69
 # USB floppy drives
 
70
 #
 
71
-SYSFS{bInterfaceClass}=="08", SYSFS{bInterfaceSubClass}=="04", ENV{ID_DRIVE_FLOPPY}="1"
 
72
+ATTRS{bInterfaceClass}=="08", ATTRS{bInterfaceSubClass}=="04", ENV{ID_DRIVE_FLOPPY}="1"
 
73
 
 
74
 # ATA Zip drives
 
75
 #
 
76
--
 
77
cgit v0.8.2