hal/fdi/policy/10osvendor 20-storage-methods.fdi,1.4,1.5

[David Zeuthen]

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

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

        * fdi/policy/10osvendor/20-storage-methods.fdi: Populate the new
        property volume.mount.valid_options

        * tools/hal-system-storage-mount: Don't add any options at all (we
        used to add e.g. quiet,shortname=winnt,uid=$UID for vfat and others)
        as this is now the responsibility of the client (e.g. gnome-mount).

        Use the white-list from the new property volume.mount.valid_options
        and perform special handling for the entry "uid=".

        * tools/hal-system-storage-eject: Also attempt to remove directory
        on eject



Index: 20-storage-methods.fdi
===================================================================
RCS file: /cvs/hal/hal/fdi/policy/10osvendor/20-storage-methods.fdi,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- 20-storage-methods.fdi	20 Dec 2005 19:19:12 -0000	1.4
+++ 20-storage-methods.fdi	8 Jan 2006 22:27:03 -0000	1.5
@@ -19,6 +19,42 @@
       <append key="org.freedesktop.Hal.Device.Volume.method_names" type="strlist">Eject</append>
       <append key="org.freedesktop.Hal.Device.Volume.method_signatures" type="strlist"></append>
       <append key="org.freedesktop.Hal.Device.Volume.method_execpaths" type="strlist">hal-system-storage-eject</append>
+
+      <!-- allow these mount options for all file systems -->
+      <append key="volume.mount.valid_options" type="strlist">ro</append>
+      <append key="volume.mount.valid_options" type="strlist">sync</append>
+      <append key="volume.mount.valid_options" type="strlist">dirsync</append>
+      <append key="volume.mount.valid_options" type="strlist">noatime</append>
+      <append key="volume.mount.valid_options" type="strlist">nodiratime</append>
+      <append key="volume.mount.valid_options" type="strlist">noexec</append>
+      <append key="volume.mount.valid_options" type="strlist">quiet</append>
+
+      <append key="volume.mount.valid_other_fs" type="strlist">subfs</append>
+
+      <!-- allow these mount options for vfat -->
+      <match key="volume.fstype" string="vfat">
+	<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>
+	<append key="volume.mount.valid_options" type="strlist">iocharset=</append>
+	<append key="volume.mount.valid_options" type="strlist">umask=</append>
+	<append key="volume.mount.valid_options" type="strlist">uid=</append>
+      </match>
+
+      <!-- udf -->
+      <match key="volume.fstype" string="udf">
+	<append key="volume.mount.valid_options" type="strlist">uid=</append>
+	<append key="volume.mount.valid_options" type="strlist">umask=</append>
+      </match>
+
+      <!-- iso9660 -->
+      <match key="volume.fstype" string="iso9660">
+	<append key="volume.mount.valid_options" type="strlist">utf8</append>
+	<append key="volume.mount.valid_options" type="strlist">uid=</append>
+	<append key="volume.mount.valid_options" type="strlist">mode=</append>
+	<append key="volume.mount.valid_options" type="strlist">iocharset=</append>
+      </match>
+
     </match>
   </device>
 </deviceinfo>