hal/fdi/policy/10osvendor 20-storage-methods.fdi,1.16,1.17

[David Zeuthen]

Update of /cvs/hal/hal/fdi/policy/10osvendor
In directory gabe:/tmp/cvs-serv23886/fdi/policy/10osvendor

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

        * tools/hal-system-storage-eject: only allow the user who mounted
        the volume to unmount it (also allow uid 0). Use properties stored
        on hal to figure out mount location.

        * fdi/policy/10osvendor/20-storage-methods.fdi: Don't advertise flush
        as a valid option as it is not upstream (SUSE guys: you need to patch
        hal yourself until this is in an upstream kernel version that a hal
        release can depend on)



Index: 20-storage-methods.fdi
===================================================================
RCS file: /cvs/hal/hal/fdi/policy/10osvendor/20-storage-methods.fdi,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- 20-storage-methods.fdi	10 Feb 2006 02:40:01 -0000	1.16
+++ 20-storage-methods.fdi	10 Feb 2006 03:41:54 -0000	1.17
@@ -52,7 +52,6 @@
         <append key="volume.mount.valid_options" type="strlist">noexec</append>
         <append key="volume.mount.valid_options" type="strlist">quiet</append>
         <!-- As this is removable media give some leeway -->
-	<append key="volume.mount.valid_options" type="strlist">flush</append>
 	<append key="volume.mount.valid_options" type="strlist">utf8</append>
 	<append key="volume.mount.valid_options" type="strlist">shortname=</append>
 	<append key="volume.mount.valid_options" type="strlist">codepage=</append>
@@ -118,7 +117,6 @@
 
       <!-- allow these mount options for vfat -->
       <match key="volume.fstype" string="vfat">
-	<append key="volume.mount.valid_options" type="strlist">flush</append>
 	<append key="volume.mount.valid_options" type="strlist">utf8</append>
 	<append key="volume.mount.valid_options" type="strlist">shortname=</append>
 	<append key="volume.mount.valid_options" type="strlist">codepage=</append>