hal/fdi/20freedesktop ide-drives.fdi, 1.1.2.3, 1.1.2.4 usb-zip-drives.fdi, 1.1.2.2, 1.1.2.3

[David Zeuthen]

Update of /cvs/hal/hal/fdi/20freedesktop
In directory gabe:/tmp/cvs-serv21841/fdi/20freedesktop

Modified Files:
      Tag: hal-0_4-stable-branch
	ide-drives.fdi usb-zip-drives.fdi 
Log Message:
2004-12-31  David Zeuthen  <davidz at redhat.com>

	* hald/linux/block_class_device.c (etc_mtab_process_line): Several
	characters in mountpoints in /etc/mtab are encoded in octal form
	(space, tab, newline etc). Current hal uses that directly which
	confuses several other tools in the stack. Attached patch puts it
	back in plain text again. Patch from Sjoerd Simons <sjoerd at luon.net>.


2004-12-15  David Zeuthen  <davidz at redhat.com>

	* fdi/20freedesktop/usb-zip-drives.fdi: Only match on actual
	harddisks to avoid wrong detection of e.g. "Iomega ZipCD 650 USB CDRW"
	drives (Red Hat bug #143834)

	* fdi/20freedesktop/ide-drives.fdi: ditto



Index: ide-drives.fdi
===================================================================
RCS file: /cvs/hal/hal/fdi/20freedesktop/ide-drives.fdi,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -d -r1.1.2.3 -r1.1.2.4
--- ide-drives.fdi	6 Dec 2004 15:37:58 -0000	1.1.2.3
+++ ide-drives.fdi	31 Dec 2004 12:01:52 -0000	1.1.2.4
@@ -19,33 +19,35 @@
     
     <!-- Handle weird IDE drives (Jaz and Zip) by matching on the IDE model -->
     <match key="storage.bus" string="ide">
-      <!-- IOMEGA Zip Drive -->
-      <match key="storage.model" contains_ncase="ZIP">
-        <merge key="storage.drive_type" type="string">zip</merge>
-        <merge key="storage.no_partitions_hint" type="bool">true</merge>
-        <merge key="storage.requires_eject" type="bool">true</merge>
-        <!-- treat as floppy and data at partition 4; adjust device file -->
-	<append key="block.device" type="string">4</append>
-      </match>
-
-      <!-- IOMEGA CLIK! Drive -->
-      <match key="storage.model" contains_ncase="CLIK">
-        <merge key="storage.drive_type" type="string">zip</merge>
-        <merge key="storage.no_partitions_hint" type="bool">true</merge>
-        <merge key="storage.requires_eject" type="bool">true</merge>
-        <!-- treat as floppy and data at partition 4; adjust device file -->
-	<append key="block.device" type="string">4</append>
-      </match>
-
-      <!-- Jaz -->
-      <match key="storage.model" contains_ncase="JAZ">
-        <merge key="storage.drive_type" type="string">jaz</merge>
-        <merge key="storage.no_partitions_hint" type="bool">true</merge>
-        <merge key="storage.requires_eject" type="bool">true</merge>
-        <!-- treat as floppy and data at partition 4; adjust device file -->
-	<append key="block.device" type="string">4</append>
+      <match key="storage.drive_type" string="disk">
+	<!-- IOMEGA Zip Drive -->
+	<match key="storage.model" contains_ncase="ZIP">
+          <merge key="storage.drive_type" type="string">zip</merge>
+          <merge key="storage.no_partitions_hint" type="bool">true</merge>
+          <merge key="storage.requires_eject" type="bool">true</merge>
+          <!-- treat as floppy and data at partition 4; adjust device file -->
+	  <append key="block.device" type="string">4</append>
+	</match>
+	
+	<!-- IOMEGA CLIK! Drive -->
+	<match key="storage.model" contains_ncase="CLIK">
+          <merge key="storage.drive_type" type="string">zip</merge>
+          <merge key="storage.no_partitions_hint" type="bool">true</merge>
+          <merge key="storage.requires_eject" type="bool">true</merge>
+          <!-- treat as floppy and data at partition 4; adjust device file -->
+	  <append key="block.device" type="string">4</append>
+	</match>
+	
+	<!-- Jaz -->
+	<match key="storage.model" contains_ncase="JAZ">
+          <merge key="storage.drive_type" type="string">jaz</merge>
+          <merge key="storage.no_partitions_hint" type="bool">true</merge>
+          <merge key="storage.requires_eject" type="bool">true</merge>
+          <!-- treat as floppy and data at partition 4; adjust device file -->
+	  <append key="block.device" type="string">4</append>
+	</match>
       </match>
     </match>
-
-  </device>
+      
+    </device>
 </deviceinfo>

Index: usb-zip-drives.fdi
===================================================================
RCS file: /cvs/hal/hal/fdi/20freedesktop/usb-zip-drives.fdi,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- usb-zip-drives.fdi	1 Dec 2004 04:28:57 -0000	1.1.2.2
+++ usb-zip-drives.fdi	31 Dec 2004 12:01:52 -0000	1.1.2.3
@@ -5,11 +5,13 @@
 
     <!-- USB Zip Drives -->
     <match key="storage.bus" string="usb">
-      <match key="storage.vendor" string="IOMEGA">
-        <match key="storage.model" contains_ncase="ZIP">
-          <merge key="storage.drive_type" type="string">zip</merge>
-          <merge key="storage.requires_eject" type="bool">true</merge>
-        </match>
+      <match key="storage.drive_type" string="disk">
+	<match key="storage.vendor" string="IOMEGA">
+          <match key="storage.model" contains_ncase="ZIP">
+            <merge key="storage.drive_type" type="string">zip</merge>
+            <merge key="storage.requires_eject" type="bool">true</merge>
+          </match>
+	</match>
       </match>
     </match>