hal: Branch 'master'

[David Zeuthen]

 fdi/policy/10osvendor/20-storage-methods.fdi |   43 +++++++++++----------------
 1 files changed, 19 insertions(+), 24 deletions(-)

New commits:
diff-tree a785b60d84d1799aed04462e1d1517e4a4c8a446 (from 69353b9c50d4da892f5bdd1cd75aa587870baada)
Author: David Zeuthen <davidz at redhat.com>
Date:   Wed Jan 10 15:59:14 2007 -0500

    fix up how volume.ignore is set so it also applies to hotpluggable drives
    
    This was inspired by Martin Pitt's message here
    
     http://lists.freedesktop.org/archives/hal/2007-January/006927.html

diff --git a/fdi/policy/10osvendor/20-storage-methods.fdi b/fdi/policy/10osvendor/20-storage-methods.fdi
index c52ea99..7ab8658 100644
--- a/fdi/policy/10osvendor/20-storage-methods.fdi
+++ b/fdi/policy/10osvendor/20-storage-methods.fdi
@@ -83,33 +83,28 @@
       <!-- 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.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>
-
-        <!-- EFI firmware partitions -->
-        <match key="volume.fstype" string="vfat">
-	  <match key="volume.label" string="EFI">
-	    <merge key="volume.ignore" type="bool">true</merge>
-	  </match>
-        </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>
 
+      <!-- EFI firmware partitions -->
+      <match key="volume.fstype" string="vfat">
+	<match key="volume.label" string="EFI">
+	  <merge key="volume.ignore" type="bool">true</merge>
+	</match>
+      </match>
 
       <append key="info.interfaces" type="strlist">org.freedesktop.Hal.Device.Volume</append>