$NetBSD: patch-ah,v 1.1 2008/11/24 01:23:12 jmcneill Exp $

--- fdi/policy/10osvendor/20-storage-methods.fdi.orig	2008-11-23 18:24:46.000000000 -0500
+++ fdi/policy/10osvendor/20-storage-methods.fdi	2008-11-23 18:30:14.000000000 -0500
@@ -73,6 +73,11 @@
 	  <append key="volume.mount.valid_options" type="strlist">noexec</append>
 	  <append key="volume.mount.valid_options" type="strlist">noatime</append>
 	</match>
+	<match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" string="NetBSD">
+	  <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>
 
@@ -182,6 +187,13 @@
 	<append key="org.freedesktop.Hal.Device.Volume.method_execpaths" type="strlist">hal-storage-eject</append>
       </match>
 
+      <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" string="NetBSD">
+        <append key="org.freedesktop.Hal.Device.Volume.method_names" type="strlist">Eject</append>
+	<append key="org.freedesktop.Hal.Device.Volume.method_signatures" type="strlist">as</append>
+	<append key="org.freedesktop.Hal.Device.Volume.method_argnames" type="strlist">extra_options</append>
+	<append key="org.freedesktop.Hal.Device.Volume.method_execpaths" type="strlist">hal-storage-eject</append>
+      </match>
+
       <!-- allow these mount options for all file systems -->
       <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" string="Linux">
         <append key="volume.mount.valid_options" type="strlist">ro</append>
@@ -199,6 +211,11 @@
 	<append key="volume.mount.valid_options" type="strlist">noexec</append>
 	<append key="volume.mount.valid_options" type="strlist">noatime</append>
       </match>
+      <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" string="NetBSD">
+        <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 -->
       <match key="volume.fstype" string="vfat">
@@ -225,6 +242,15 @@
 	  <append key="volume.mount.valid_options" type="strlist">-D=</append>
 	  <append key="volume.mount.valid_options" type="strlist">large</append>
 	</match>
+	<match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" string="NetBSD">
+	  <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">-9</append>
+	  <append key="volume.mount.valid_options" type="strlist">-l</append>
+	  <append key="volume.mount.valid_options" type="strlist">-s</append>
+	</match>
       </match>
 
 
@@ -258,6 +284,13 @@
 	  <append key="volume.mount.valid_options" type="strlist">-C=</append>
 	  <append key="volume.mount.valid_options" type="strlist">-W=</append>
 	</match>
+	<match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" string="NetBSD">
+	  <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>
+	</match>
       </match>
 
       <!-- allow these mount options for ext3 -->
@@ -290,6 +323,10 @@
 	  <append key="volume.mount.valid_options" type="strlist">-C=</append>
 	  <append key="volume.mount.valid_options" type="strlist">-v</append>
 	</match>
+	<match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" string="NetBSD">
+	  <append key="volume.mount.valid_options" type="strlist">-u=</append>
+	  <append key="volume.mount.valid_options" type="strlist">-g=</append>
+	</match>
       </match>
 
       <!-- iso9660 -->
@@ -310,6 +347,14 @@
 	  <append key="volume.mount.valid_options" type="strlist">-C=</append>
 	  <append key="volume.mount.valid_options" type="strlist">-v</append>
 	</match>
+	<match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" string="NetBSD">
+	  <append key="volume.mount.valid_options" type="strlist">extatt</append>
+	  <append key="volume.mount.valid_options" type="strlist">gens</append>
+	  <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">nomaplcase</append>
+	  <append key="volume.mount.valid_options" type="strlist">rcaseins</append>
+	</match>
       </match>
 
       <!-- allow these unmount options -->