hal/fdi/90defaultpolicy storage-policy.fdi,1.9,1.9.2.1

[David Zeuthen]

Update of /cvs/hal/hal/fdi/90defaultpolicy
In directory gabe:/tmp/cvs-serv19436/fdi/90defaultpolicy

Modified Files:
      Tag: hal-0_4-stable-branch
	storage-policy.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: storage-policy.fdi
===================================================================
RCS file: /cvs/hal/hal/fdi/90defaultpolicy/storage-policy.fdi,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -d -r1.9 -r1.9.2.1
--- storage-policy.fdi	1 Nov 2004 22:57:21 -0000	1.9
+++ storage-policy.fdi	22 Nov 2004 21:53:50 -0000	1.9.2.1
@@ -47,7 +47,6 @@
       <match key="storage.drive_type" string="cdrom">
 	<merge key="storage.policy.mount_filesystem" type="string">auto</merge>
 	<merge key="storage.policy.desired_mount_point" type="string">cdrom</merge>
-	<merge key="storage.policy.mount_option.ro" type="bool">true</merge>
 	<match key="storage.cdrom.cdr" bool="true">
 	  <merge key="storage.policy.desired_mount_point" type="string">cdrecorder</merge>
 	</match>
@@ -73,6 +72,7 @@
 	  <merge key="storage.policy.mount_option.fscontext=system_u:object_r:removable_t" type="bool">true</merge>
 	</match>
       </match>
+
       <!-- floppy drives -->
       <match key="storage.drive_type" string="floppy">
 	<merge key="storage.policy.mount_filesystem" type="string">auto</merge>
@@ -81,6 +81,24 @@
 	  <merge key="storage.policy.mount_option.fscontext=system_u:object_r:removable_t" type="bool">true</merge>
 	</match>
       </match>
+
+      <!-- zip drives -->
+      <match key="storage.drive_type" string="zip">
+	<merge key="storage.policy.mount_filesystem" type="string">auto</merge>
+	<merge key="storage.policy.desired_mount_point" type="string">zip</merge>
+	<match key="/org/freedesktop/Hal/devices/computer:linux.is_selinux_enabled" bool="true">
+	  <merge key="storage.policy.mount_option.fscontext=system_u:object_r:removable_t" type="bool">true</merge>
+	</match>
+      </match>
+
+      <!-- jaz drives -->
+      <match key="storage.drive_type" string="jaz">
+	<merge key="storage.policy.mount_filesystem" type="string">auto</merge>
+	<merge key="storage.policy.desired_mount_point" type="string">jaz</merge>
+	<match key="/org/freedesktop/Hal/devices/computer:linux.is_selinux_enabled" bool="true">
+	  <merge key="storage.policy.mount_option.fscontext=system_u:object_r:removable_t" type="bool">true</merge>
+	</match>
+      </match>
     </match>
 
     <!-- Normal volumes; use volume label, uuid or drive_type -->
@@ -96,6 +114,11 @@
 	       idedisk, scsidisk etc. -->
 	  <merge key="volume.policy.desired_mount_point" type="copy_property">@block.storage_device:storage.bus</merge>
 	  <append key="volume.policy.desired_mount_point" type="string">disk</append>
+
+         <!-- zip drives -->
+         <match key="storage.drive_type" string="zip">
+ 	   <merge key="storage.policy.desired_mount_point" type="string">zip</merge>
+         </match>
 	  
           <!-- Best: If available use filesystem label -->
           <match key="volume.label" empty="false">