hal/fdi/policy/10osvendor 20-storage-methods.fdi,1.10,1.11

[David Zeuthen]

Update of /cvs/hal/hal/fdi/policy/10osvendor
In directory gabe:/tmp/cvs-serv8387/fdi/policy/10osvendor

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

        * fdi/policy/10osvendor/20-storage-methods.fdi: Add HP_RECOVERY to
        list of volumes to ignore



Index: 20-storage-methods.fdi
===================================================================
RCS file: /cvs/hal/hal/fdi/policy/10osvendor/20-storage-methods.fdi,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- 20-storage-methods.fdi	21 Jan 2006 03:09:45 -0000	1.10
+++ 20-storage-methods.fdi	21 Jan 2006 22:08:22 -0000	1.11
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?> <!-- -*- SGML -*- --> 
 
 <deviceinfo version="0.2">
   <device>
@@ -17,18 +17,30 @@
 
     <match key="volume.fsusage" string="filesystem">
 
-      <!-- Here follow volumes we specifically want to ignore - it is the
-	   responsibility of software higher in the stack (e.g. gnome-vfs) and
-	   mount programs (e.g. Mount() on HAL) to respect volume.ignore -->
-
-      <!-- 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 -->
+      <!-- Here follow volumes we specifically want to ignore - it is the -->
+      <!-- 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="volume.fstype" string="hfs">
-	<match key="volume.label" string="bootstrap">
-	  <merge key="volume.ignore" type="bool">true</merge>
-	</match>
+      <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> 
       </match>