hal/fdi/policy/10osvendor 20-storage-methods.fdi,1.19,1.20

[David Zeuthen]

Update of /cvs/hal/hal/fdi/policy/10osvendor
In directory kemper:/tmp/cvs-serv16017/fdi/policy/10osvendor

Modified Files:
	20-storage-methods.fdi 
Log Message:
2006-03-06  David Zeuthen  <davidz at redhat.com>

        * tools/hal-storage-mount.c: New file

        * tools/Makefile.am: Add rules for hal-storage-mount

        * fdi/policy/10osvendor/20-storage-methods.fdi: Use new C program
        hal-storage-mount instead of hal-system-storage-mount (shell
        script). Don't require ignored firmware partitions to be internal,
        otherwise 'bootstrap' would show up when attaching my Powerbook G4
        in target disk mode. Allow a bunch of uid= options for other file
        systems than vfat as storage-[fixed|removable]-mount-change-uid
        policies will refuse to mount.



Index: 20-storage-methods.fdi
===================================================================
RCS file: /cvs/hal/hal/fdi/policy/10osvendor/20-storage-methods.fdi,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- 20-storage-methods.fdi	22 Feb 2006 14:15:33 -0000	1.19
+++ 20-storage-methods.fdi	6 Mar 2006 22:34:29 -0000	1.20
@@ -33,7 +33,7 @@
 
         <append key="org.freedesktop.Hal.Device.Volume.method_names" type="strlist">Mount</append>
         <append key="org.freedesktop.Hal.Device.Volume.method_signatures" type="strlist">ssas</append>
-        <append key="org.freedesktop.Hal.Device.Volume.method_execpaths" type="strlist">hal-system-storage-mount</append>
+        <append key="org.freedesktop.Hal.Device.Volume.method_execpaths" type="strlist">hal-storage-mount</append>
 
         <append key="org.freedesktop.Hal.Device.Volume.method_names" type="strlist">Unmount</append>
         <append key="org.freedesktop.Hal.Device.Volume.method_signatures" type="strlist">as</append>
@@ -69,26 +69,25 @@
       <!-- responsibility of software higher in the stack (e.g. gnome-vfs) -->
       <!-- amd mount programs (e.g. Mount() on HAL) to respect volume.ignore -->
       <merge key="volume.ignore" type="bool">false</merge>
-      <match key="@block.storage_device:storage.hotpluggable" bool="false">
-        <match key="@block.storage_device:storage.removable" bool="false">
 
-          <!-- Should always ignore Apple Bootstrap partitions (it would be -->
-	  <!-- a security hole to mount it) - TODO: should use the bootable -->
-  	  <!-- flag from the Mac partition table instead -->
-          <match key="volume.fstype" string="hfs">
-	    <match key="volume.label" string="bootstrap">
-    	      <merge key="volume.ignore" type="bool">true</merge>
-	    </match>
-          </match>
-
-          <!-- HP ships desktops with a recovery partition -->
-          <match key="volume.fstype" string="vfat">
-	    <match key="volume.label" string="HP_RECOVERY">
-	      <merge key="volume.ignore" type="bool">true</merge>
-	    </match>
-          </match>
+      <match key="@block.storage_device:storage.removable" bool="false">
 
-        </match> 
+        <!-- Should always ignore Apple Bootstrap partitions (it would be -->
+	<!-- a security hole to mount it) - TODO: should use the bootable -->
+  	<!-- flag from the Mac partition table instead -->
+        <match key="volume.fstype" string="hfs">
+	  <match key="volume.label" string="bootstrap">
+    	    <merge key="volume.ignore" type="bool">true</merge>
+	  </match>
+        </match>
+	
+        <!-- HP ships desktops with a recovery partition -->
+        <match key="volume.fstype" string="vfat">
+	  <match key="volume.label" string="HP_RECOVERY">
+	    <merge key="volume.ignore" type="bool">true</merge>
+	  </match>
+        </match>
+	
       </match>
 
 
@@ -96,7 +95,7 @@
 
       <append key="org.freedesktop.Hal.Device.Volume.method_names" type="strlist">Mount</append>
       <append key="org.freedesktop.Hal.Device.Volume.method_signatures" type="strlist">ssas</append>
-      <append key="org.freedesktop.Hal.Device.Volume.method_execpaths" type="strlist">hal-system-storage-mount</append>
+      <append key="org.freedesktop.Hal.Device.Volume.method_execpaths" type="strlist">hal-storage-mount</append>
 
       <append key="org.freedesktop.Hal.Device.Volume.method_names" type="strlist">Unmount</append>
       <append key="org.freedesktop.Hal.Device.Volume.method_signatures" type="strlist">as</append>
@@ -127,6 +126,24 @@
 	<append key="volume.mount.valid_options" type="strlist">uid=</append>
       </match>
 
+
+      <!-- allow these mount options for hfs -->
+      <match key="volume.fstype" string="hfs">
+	<append key="volume.mount.valid_options" type="strlist">uid=</append>
+	<append key="volume.mount.valid_options" type="strlist">force</append>
+      </match>
+
+      <!-- allow these mount options for hfsplus -->
+      <match key="volume.fstype" string="hfsplus">
+	<append key="volume.mount.valid_options" type="strlist">uid=</append>
+	<append key="volume.mount.valid_options" type="strlist">force</append>
+      </match>
+
+      <!-- allow these mount options for ntfs -->
+      <match key="volume.fstype" string="ntfs">
+	<append key="volume.mount.valid_options" type="strlist">uid=</append>
+      </match>
+
       <!-- allow these mount options for ext3 -->
       <match key="volume.fstype" string="ext3">
 	<append key="volume.mount.valid_options" type="strlist">data=</append>