hal: Branch 'hal-0_5_9-branch'

[David Zeuthen]

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

New commits:
diff-tree 259028b386cfe760bd799d757588e19e17eab6fb (from b39bdd8c990ecf68948c1f3eeaaf54bdd6bc0d99)
Author: Frederic Crozat <fcrozat at mandriva.com>
Date:   Thu May 3 00:13:08 2007 -0400

    allow acl, user_xattr on ext2
    
    Even if ext2 is quite old, there is no reason to not allow acl and
    user_xattr on this kind of file system.

diff --git a/fdi/policy/10osvendor/20-storage-methods.fdi b/fdi/policy/10osvendor/20-storage-methods.fdi
index 3abf52b..a54660b 100644
--- a/fdi/policy/10osvendor/20-storage-methods.fdi
+++ b/fdi/policy/10osvendor/20-storage-methods.fdi
@@ -207,6 +207,12 @@
 	<append key="volume.mount.valid_options" type="strlist">data=</append>
       </match>
 
+      <!-- allow these mount options for ext2 -->
+      <match key="volume.fstype" string="ext2">
+	<append key="volume.mount.valid_options" type="strlist">acl</append>
+	<append key="volume.mount.valid_options" type="strlist">user_xattr</append>
+      </match>
+
       <!-- udf -->
       <match key="volume.fstype" string="udf">
 	<match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" string="Linux">