hal/fdi/20freedesktop Makefile.am, 1.5, 1.5.2.1 ide-drives.fdi, NONE, 1.1.2.1 usb-zip-drives.fdi, NONE, 1.1.2.1

[David Zeuthen]

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

Modified Files:
      Tag: hal-0_4-stable-branch
	Makefile.am 
Added Files:
      Tag: hal-0_4-stable-branch
	ide-drives.fdi usb-zip-drives.fdi 
Log Message:
2004-11-22  David Zeuthen  <david at fubar.dk>

	* hald/linux/volume_id/volume_id.c (volume_id_probe): Add some
	logging of what size we call volume_id_probe with

	* hald/linux/block_class_device.c (force_unmount): Only attempt to
	'umount -l' if some hal policy piece are performing policy on the
	device

2004-11-22  David Zeuthen  <davidz at redhat.com>

	* libhal-storage/libhal-storage.c (hal_drive_from_udi): Detect Zip
	and Jaz drives
	(hal_drive_policy_compute_display_name): Fix an ugly bug where
	CD-ROM drives were being named "CD-R" instead of "CD-ROM"

	* libhal-storage/libhal-storage.h: Add enums for Zip and Jaz drives

	* hald/linux/platform_bus_device.c (platform_device_in_gdl): New
	function. Actually check the /etc/mtab for whether the floppy is
	mounted

	* hald/linux/common.h: Add prototype for 
	etc_mtab_process_all_block_devices

	* hald/linux/block_class_device.c (block_class_visit): Never add
	child real childs (e.g. /dev/hdd4) if storage.no_partitions_hint is
	set (for IDE Zip Drives)
	(detect_media): Actually set child to what we find in the TDL
	(mtab_handle_storage): Match on device file before attempting to
	match on major/minor
	(mtab_handle_volume): -do-

	* hald/device_info.c (handle_match): Add the contains and 
	contains_ncase matching operators.

	* fdi/90defaultpolicy/storage-policy.fdi: Add some policy pieces for
	IDE Zip, Jaz and USB Zip drives

	* fdi/20freedesktop/usb-zip-drives.fdi: New file to identify USB
	Zip Drives

	* fdi/20freedesktop/ide-drives.fdi: New file to identify strange IDE
	drives such as Zip and Jaz drives; note that rewriting the device
	file from e.g. /dev/hdd to /dev/hdd4  is actually sane enough to
	do given the abstraction that hal exports :-)

2004-11-16  David Zeuthen  <davidz at redhat.com>

	* fdi/90defaultpolicy/storage-policy.fdi: Remove the "ro" option for
	optical drives as it prevents mounting rw DVD-RAM media (RH bug #139600)

	* hald/linux/volume_id/volume_id.h (VOLUME_ID_PARTITIONS_MAX): Increase
	to 256 (RH bug #139227)

	* hald/linux/volume_id/volume_id.c (probe_msdos_part_table): Fix a
	typo ("to many partitions" -> "too many partitions"
	(volume_id_probe): Do not probe for msdos_part_table since that doesn't
	make sense (../block_class_device.c does that instead)



Index: Makefile.am
===================================================================
RCS file: /cvs/hal/hal/fdi/20freedesktop/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -d -r1.5 -r1.5.2.1
--- Makefile.am	13 Oct 2004 13:50:07 -0000	1.5
+++ Makefile.am	22 Nov 2004 21:53:49 -0000	1.5.2.1
@@ -7,6 +7,9 @@
 	6in1-card-reader.fdi		\
 	lexar-media-cf-reader.fdi	\
 	lucent-pcmcia-wireless.fdi	\
-	jetflash-mp3-player.fdi
+	jetflash-mp3-player.fdi         \
+        ide-drives.fdi                  \
+        usb-zip-drives.fdi
+
 
 

--- NEW FILE: ide-drives.fdi ---
<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- --> 

<deviceinfo version="0.2">
  <device>
    <!-- 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>
    </match>

  <device>
</deviceinfo>

--- NEW FILE: usb-zip-drives.fdi ---
<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- --> 

<deviceinfo version="0.2">
  <device>

    <!-- 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>
    </match>

  <device>
</deviceinfo>