hal: Branch 'master'

[David Zeuthen]

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

New commits:
diff-tree a372bf79e16a5c6c00d0e262745dc935de364ca2 (from 812a2e90f4e7c632829228ddf6460281fad2b964)
Author: Martin Pitt <martin at piware.de>
Date:   Tue Jan 9 16:35:15 2007 -0500

    allow 'locale=' NTFS mount option for Linux
    
    https://launchpad.net/bugs/78370 reported that the locale= option is
    necessary for mounting NTFS partitions with ntfs-3g and ntfs-fuse.

diff --git a/fdi/policy/10osvendor/20-storage-methods.fdi b/fdi/policy/10osvendor/20-storage-methods.fdi
index 41fe3d3..c52ea99 100644
--- a/fdi/policy/10osvendor/20-storage-methods.fdi
+++ b/fdi/policy/10osvendor/20-storage-methods.fdi
@@ -190,6 +190,7 @@
 	  <append key="volume.mount.valid_options" type="strlist">uid=</append>
 	  <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>
 	</match>
 	<match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" string="FreeBSD">
 	  <append key="volume.mount.valid_options" type="strlist">-u=</append>