hal/fdi/policy/10osvendor 20-storage-methods.fdi,1.21,1.22

[David Zeuthen]

Update of /cvs/hal/hal/fdi/policy/10osvendor
In directory kemper:/tmp/cvs-serv20023/fdi/policy/10osvendor

Modified Files:
	20-storage-methods.fdi 
Log Message:
2006-06-20  David Zeuthen  <davidz at redhat.com>

        * tools/hal-storage-mount.c (bailout_if_in_fstab): Handle LABEL=
        and UUID= in this function.
        (handle_mount): Also allow uid= on iso9660 and udf like we do for
        vfat.

        * fdi/policy/10osvendor/20-storage-methods.fdi: Ignore EFI
        firmware partition.

        * tools/hal-system-storage-cleanup-mountpoints: Fix OS-specific
        script invocation



Index: 20-storage-methods.fdi
===================================================================
RCS file: /cvs/hal/hal/fdi/policy/10osvendor/20-storage-methods.fdi,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- 20-storage-methods.fdi	6 Jun 2006 23:56:09 -0000	1.21
+++ 20-storage-methods.fdi	21 Jun 2006 00:44:03 -0000	1.22
@@ -92,6 +92,13 @@
 	    <merge key="volume.ignore" type="bool">true</merge>
 	  </match>
         </match>
+
+        <!-- EFI firmware partitions -->
+        <match key="volume.fstype" string="vfat">
+	  <match key="volume.label" string="EFI">
+	    <merge key="volume.ignore" type="bool">true</merge>
+	  </match>
+        </match>
 	
       </match>
 
@@ -150,6 +157,8 @@
       <!-- allow these mount options for ntfs -->
       <match key="volume.fstype" string="ntfs">
 	<append key="volume.mount.valid_options" type="strlist">uid=</append>
+	<append key="volume.mount.valid_options" type="strlist">gid=</append>
+	<append key="volume.mount.valid_options" type="strlist">umask=</append>
       </match>
 
       <!-- allow these mount options for ext3 -->