hal/fdi/90defaultpolicy storage-policy.fdi,1.9.2.2,1.9.2.3

[David Zeuthen]

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

Modified Files:
      Tag: hal-0_4-stable-branch
	storage-policy.fdi 
Log Message:
2005-02-26  David Zeuthen  <davidz at redhat.com>

	* fdi/90defaultpolicy/storage-policy.fdi: Apply patch from Daniel
	Serpell <daniel.serpell at aplik.cl> that I got via Sjoerd Simons
	<sjoerd at luon.net> : The FDI rule that detects USB ZIP drive and
	names the mountpoint is incorrectly write, so partitioned ZIP's
	are named generically. The attached patch fixes the test (lookup
	in the parent of the partition).



Index: storage-policy.fdi
===================================================================
RCS file: /cvs/hal/hal/fdi/90defaultpolicy/storage-policy.fdi,v
retrieving revision 1.9.2.2
retrieving revision 1.9.2.3
diff -u -d -r1.9.2.2 -r1.9.2.3
--- storage-policy.fdi	20 Jan 2005 17:03:54 -0000	1.9.2.2
+++ storage-policy.fdi	27 Feb 2005 00:34:01 -0000	1.9.2.3
@@ -116,8 +116,8 @@
 	  <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 key="@block.storage_device:storage.drive_type" string="zip">
+ 	   <merge key="volume.policy.desired_mount_point" type="string">zip</merge>
          </match>
 	  
           <!-- Best: If available use filesystem label -->