hal: Branch 'origin' - 2 commits

[Danny Kukawka]

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

New commits:
diff-tree a903da8418a7dcbf7d258b9f234cca45ba5b3af5 (from parents)
Merge: 101d60a740084cf0a953847023a0feb0dc6a2c5b 05ef6245531ff9d930788fd5fd4af5b7e957bb4e
Author: Joe Marcus Clarke <marcus at FreeBSD.org>
Date:   Thu Jan 4 14:42:22 2007 -0500

    Merge branch 'master' of ssh://marcus@git.freedesktop.org/git/hal

diff-tree 101d60a740084cf0a953847023a0feb0dc6a2c5b (from 5a809031ebb898497b1003af1d8e6c739f565c1d)
Author: Joe Marcus Clarke <marcus at FreeBSD.org>
Date:   Thu Jan 4 14:41:58 2007 -0500

    flesh out mount options for FreeBSD
    
    Complete the list of supported mount options for the various file
    system types for FreeBSD.

diff --git a/fdi/policy/10osvendor/20-storage-methods.fdi b/fdi/policy/10osvendor/20-storage-methods.fdi
index 44850d4..41fe3d3 100644
--- a/fdi/policy/10osvendor/20-storage-methods.fdi
+++ b/fdi/policy/10osvendor/20-storage-methods.fdi
@@ -70,6 +70,7 @@
 	<match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" string="FreeBSD">
 	  <append key="volume.mount.valid_options" type="strlist">ro</append>
 	  <append key="volume.mount.valid_options" type="strlist">noexec</append>
+	  <append key="volume.mount.valid_options" type="strlist">noatime</append>
 	</match>
       </match>
     </match>
@@ -142,6 +143,7 @@
       <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" string="FreeBSD">
         <append key="volume.mount.valid_options" type="strlist">ro</append>
 	<append key="volume.mount.valid_options" type="strlist">noexec</append>
+	<append key="volume.mount.valid_options" type="strlist">noatime</append>
       </match>
 
       <!-- allow these mount options for vfat -->
@@ -161,6 +163,11 @@
 	  <append key="volume.mount.valid_options" type="strlist">shortnames</append>
 	  <append key="volume.mount.valid_options" type="strlist">nowin95</append>
 	  <append key="volume.mount.valid_options" type="strlist">-u=</append>
+	  <append key="volume.mount.valid_options" type="strlist">-g=</append>
+	  <append key="volume.mount.valid_options" type="strlist">-m=</append>
+	  <append key="volume.mount.valid_options" type="strlist">-M=</append>
+	  <append key="volume.mount.valid_options" type="strlist">-L=</append>
+	  <append key="volume.mount.valid_options" type="strlist">-D=</append>
 	</match>
       </match>
 
@@ -188,6 +195,10 @@
 	  <append key="volume.mount.valid_options" type="strlist">-u=</append>
 	  <append key="volume.mount.valid_options" type="strlist">-g=</append>
 	  <append key="volume.mount.valid_options" type="strlist">-m=</append>
+	  <append key="volume.mount.valid_options" type="strlist">-a</append>
+	  <append key="volume.mount.valid_options" type="strlist">-i</append>
+	  <append key="volume.mount.valid_options" type="strlist">-C=</append>
+	  <append key="volume.mount.valid_options" type="strlist">-W=</append>
 	</match>
       </match>
 
@@ -202,6 +213,10 @@
 	  <append key="volume.mount.valid_options" type="strlist">uid=</append>
 	  <append key="volume.mount.valid_options" type="strlist">umask=</append>
 	</match>
+	<match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" string="FreeBSD">
+	  <append key="volume.mount.valid_options" type="strlist">-C=</append>
+	  <append key="volume.mount.valid_options" type="strlist">-v</append>
+	</match>
       </match>
 
       <!-- iso9660 -->
@@ -218,6 +233,9 @@
 	  <append key="volume.mount.valid_options" type="strlist">nojoliet</append>
 	  <append key="volume.mount.valid_options" type="strlist">norrip</append>
 	  <append key="volume.mount.valid_options" type="strlist">nostrictjoliet</append>
+	  <append key="volume.mount.valid_options" type="strlist">-s=</append>
+	  <append key="volume.mount.valid_options" type="strlist">-C=</append>
+	  <append key="volume.mount.valid_options" type="strlist">-v</append>
 	</match>
       </match>