# HG changeset patch
# User Rohit Joshi <jozee@slitaz.org>
# Date 1268917403 0
# Node ID 9d9303eaffe7b268c90c42b37bd432e2f44cede4
# Parent  c66ad3e8adfb32b9d92f352fca27f39f4d2adaf2
hal: rm bashism,update hal-functions path;add missing ntfs-3g hal policy

diff -r c66ad3e8adfb -r 9d9303eaffe7 hal/receipt
--- a/hal/receipt	Thu Mar 18 10:41:03 2010 +0000
+++ b/hal/receipt	Thu Mar 18 13:03:23 2010 +0000
@@ -74,6 +74,13 @@
 	rm $fs/usr/share/hal/fdi/policy/10osvendor/10-imac-backlight.fdi
 	rm $fs/usr/share/hal/fdi/policy/10osvendor/15-storage-luks.fdi
 	rm $fs/usr/share/hal/fdi/policy/10osvendor/30-wol.fdi
+	
+	# change bash to sh in hal scripts
+	sed -i 's:/bin/bash:/bin/sh:' $fs/usr/lib/hal/scripts/hal* 
+	sed -i 's:/bin/bash:/bin/sh:' $fs/usr/lib/hal/scripts/linux/hal* 
+	# use full-path
+	sed -i 's:hal-functions:/usr/lib/hal/scripts/hal-functions:' $fs/usr/lib/hal/scripts/hal* 
+	sed -i 's:hal-functions:/usr/lib/hal/scripts/hal-functions:' $fs/usr/lib/hal/scripts/linux/hal* 
 }
 
 pre_install()
diff -r c66ad3e8adfb -r 9d9303eaffe7 hal/stuff/policy/10osvendor/30-ntfs-write.fdi
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/hal/stuff/policy/10osvendor/30-ntfs-write.fdi	Thu Mar 18 13:03:23 2010 +0000
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deviceinfo version="0.2">
+  <device>
+   	<match key="volume.fstype" string="ntfs">
+        <append key="volume.fstype.alternative" type="copy_property">volume.fstype</append>
+        <merge key="volume.mount.ntfs.valid_options" type="copy_property">volume.mount.valid_options</merge>
+        <merge key="volume.unmount.ntfs.valid_options" type="copy_property">volume.unmount.valid_options</merge>
+        <merge key="volume.fstype" type="string">ntfs-3g</merge>
+       	<merge key="volume.mount.valid_options" type="strlist">ro</merge>
+        <append key="volume.mount.valid_options" type="strlist">atime</append>
+        <append key="volume.mount.valid_options" type="strlist">noatime</append>
+       	<append key="volume.mount.valid_options" type="strlist">relatime</append>
+       	<append key="volume.mount.valid_options" type="strlist">fake_rw</append>
+       	<append key="volume.mount.valid_options" type="strlist">no_def_opts</append>
+       	<append key="volume.mount.valid_options" type="strlist">default_permissions</append>
+       	<append key="volume.mount.valid_options" type="strlist">umask=</append>
+       	<append key="volume.mount.valid_options" type="strlist">fmask=</append>
+       	<append key="volume.mount.valid_options" type="strlist">dmask=</append>
+       	<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">show_sys_files</append>
+       	<append key="volume.mount.valid_options" type="strlist">silent</append>
+       	<append key="volume.mount.valid_options" type="strlist">force</append>
+       	<append key="volume.mount.valid_options" type="strlist">remove_hiberfile</append>
+       	<append key="volume.mount.valid_options" type="strlist">locale=</append>
+       	<append key="volume.mount.valid_options" type="strlist">streams_interface=</append>
+       	<append key="volume.mount.valid_options" type="strlist">debug</append>
+       	<append key="volume.mount.valid_options" type="strlist">no_detatch</append>
+       	<append key="volume.mount.valid_options" type="strlist">sync</append>
+       	<append key="volume.mount.valid_options" type="strlist">dirsync</append>
+       	<append key="volume.mount.valid_options" type="strlist">nodiratime</append>
+       	<append key="volume.mount.valid_options" type="strlist">noexec</append>
+        <append key="volume.mount.valid_options" type="strlist">quiet</append>
+       	<append key="volume.mount.valid_options" type="strlist">remount</append>
+       	<append key="volume.mount.valid_options" type="strlist">exec</append>
+       	<append key="volume.mount.valid_options" type="strlist">recover</append>
+       	<append key="volume.mount.valid_options" type="strlist">norecover</append>
+       	<merge key="volume.unmount.valid_options" type="strlist">lazy</merge>
+       	<merge key="volume.policy.mount_filesystem" type="string">ntfs-3g</merge>
+	</match>
+  </device>
+</deviceinfo>