hal: Branch 'master'

[Danny Kukawka]

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

New commits:
commit 88074a784f1b74b9c894be569c5f8762cadc9d16
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Mon Aug 25 15:33:26 2008 +0200

    allow acl and user_xattr as mount options for reiserfs
    
    Allow acl and user_xattr as mount options for reiserfs.

diff --git a/fdi/policy/10osvendor/20-storage-methods.fdi b/fdi/policy/10osvendor/20-storage-methods.fdi
index e8a8c60..efc69cd 100644
--- a/fdi/policy/10osvendor/20-storage-methods.fdi
+++ b/fdi/policy/10osvendor/20-storage-methods.fdi
@@ -273,6 +273,12 @@
 	<append key="volume.mount.valid_options" type="strlist">user_xattr</append>
       </match>
 
+      <!-- allow these mount options for reiserfs -->
+      <match key="volume.fstype" string="reiserfs">
+	<append key="volume.mount.valid_options" type="strlist">acl</append>
+	<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">