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

[Kay Sievers]

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

Modified Files:
	20-storage-methods.fdi 
Log Message:
2006-01-11  Kay Sievers  <kay.sievers at vrfy.org>

        Don't trust any user input, replace all suspicious chars with '_'.

        * fdi/policy/10osvendor/20-storage-methods.fdi: add
        volume.unmount.valid_options
        * tools/hal-system-storage-eject:
        * tools/hal-system-storage-mount:
        * tools/hal-system-storage-unmount: allow "lazy" to be passed


Index: 20-storage-methods.fdi
===================================================================
RCS file: /cvs/hal/hal/fdi/policy/10osvendor/20-storage-methods.fdi,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- 20-storage-methods.fdi	8 Jan 2006 22:27:03 -0000	1.5
+++ 20-storage-methods.fdi	11 Jan 2006 17:00:21 -0000	1.6
@@ -13,11 +13,11 @@
       <append key="org.freedesktop.Hal.Device.Volume.method_execpaths" type="strlist">hal-system-storage-mount</append>
 
       <append key="org.freedesktop.Hal.Device.Volume.method_names" type="strlist">Unmount</append>
-      <append key="org.freedesktop.Hal.Device.Volume.method_signatures" type="strlist"></append>
+      <append key="org.freedesktop.Hal.Device.Volume.method_signatures" type="strlist">as</append>
       <append key="org.freedesktop.Hal.Device.Volume.method_execpaths" type="strlist">hal-system-storage-unmount</append>
 
       <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_signatures" type="strlist">as</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 -->
@@ -55,6 +55,9 @@
 	<append key="volume.mount.valid_options" type="strlist">iocharset=</append>
       </match>
 
+      <!-- allow these unmount options -->
+      <append key="volume.unmount.valid_options" type="strlist">lazy</append>
+
     </match>
   </device>
 </deviceinfo>