hal: Branch 'master'

[Danny Kukawka]

 fdi/policy/10osvendor/20-storage-methods.fdi |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit 5610b603840dfb264db039756c8d541106df2305
Author: Georges Discry <murmex at gathex.net>
Date:   Wed Mar 12 12:59:30 2008 +0100

    add ufstype= as allowed mount option for UFS
    
    Added ufstype= as allowed mount option for UFS (this option is
    mandatory to mount UFS filesystems under linux)

diff --git a/fdi/policy/10osvendor/20-storage-methods.fdi b/fdi/policy/10osvendor/20-storage-methods.fdi
index 4e839d9..5f913ba 100644
--- a/fdi/policy/10osvendor/20-storage-methods.fdi
+++ b/fdi/policy/10osvendor/20-storage-methods.fdi
@@ -272,6 +272,13 @@
 	<append key="volume.mount.valid_options" type="strlist">user_xattr</append>
       </match>
 
+      <!-- allow these mount options for ufs -->
+      <match key="volume.fstype" string="ufs">
+	<match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" string="Linux">
+	  <append key="volume.mount.valid_options" type="strlist">ufstype=</append>
+	</match>
+      </match>
+
       <!-- udf -->
       <match key="volume.fstype" string="udf">
 	<match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" string="Linux">