hal: Branch 'master'

[Danny Kukawka]

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

New commits:
commit a0d82b80f775faf666aa699f354338098286ff20
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Thu Oct 9 13:54:26 2008 +0200

    Revert "allow 'locale=' NTFS mount option for Linux"
    
    This reverts commit a372bf79e16a5c6c00d0e262745dc935de364ca2.
    
    The ntfs-3g or ntfs-fuse package has to install their own fdi
    file to allow locale as mount option if needed. Otherwise HAL
    would allow invalid mount options for plain kernel ntfs.

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