hal: Branch 'master'

[David Zeuthen]

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

New commits:
diff-tree 753d45da8df992a3d8126c022f56ee807b4690d4 (from 87a6750f28d820628f74ad1cb39b3c94fa6ff9bd)
Author: Martin Pitt <martin at piware.de>
Date:   Wed Apr 18 15:25:38 2007 -0400

    allow 'utf8' mount option for NTFS
    
    this tiny patch allows NTFS users to supply the 'utf8' mount option.
    Yay unicode! :) It applies to 0.5.9 stable and git head.

diff --git a/fdi/policy/10osvendor/20-storage-methods.fdi b/fdi/policy/10osvendor/20-storage-methods.fdi
index 79904f2..b2b190f 100644
--- a/fdi/policy/10osvendor/20-storage-methods.fdi
+++ b/fdi/policy/10osvendor/20-storage-methods.fdi
@@ -186,6 +186,7 @@
 	  <append key="volume.mount.valid_options" type="strlist">gid=</append>
 	  <append key="volume.mount.valid_options" type="strlist">umask=</append>
 	  <append key="volume.mount.valid_options" type="strlist">locale=</append>
+	  <append key="volume.mount.valid_options" type="strlist">utf8</append>
 	</match>
 	<match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" string="FreeBSD">
 	  <append key="volume.mount.valid_options" type="strlist">-u=</append>