hal: Branch 'master'

[Danny Kukawka]

 fdi/policy/10osvendor/20-storage-methods.fdi |   64 ++++++---------------------
 1 file changed, 15 insertions(+), 49 deletions(-)

New commits:
commit fba24a693867984e832fd2eb8a182b715e66a289
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Mon Oct 13 12:12:34 2008 +0200

    unify set volume.ignore for recovery partitions
    
    Unifyed handling/matching of recovery partitions to set volume.ignore
    to true. This should also fix fd.o#18027.

diff --git a/fdi/policy/10osvendor/20-storage-methods.fdi b/fdi/policy/10osvendor/20-storage-methods.fdi
index 0c9e58b..9a2223f 100644
--- a/fdi/policy/10osvendor/20-storage-methods.fdi
+++ b/fdi/policy/10osvendor/20-storage-methods.fdi
@@ -93,69 +93,35 @@
 	</match>
       </match>
 
-      <!-- Lenovo and IBM ship with a various recovery partitions -->
-      <match key="volume.fstype" string="vfat">
-	<match key="volume.label" string="SERVICEV001">
-	  <merge key="volume.ignore" type="bool">true</merge>
-	</match>
-	<match key="volume.label" string="IBM_SERVICE">
-	  <merge key="volume.ignore" type="bool">true</merge>
-	</match>
-      </match>
-      <match key="volume.fstype" string="ntfs">
-	<match key="volume.label" string="SERVICEV002">
-	  <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>
-
-      <!-- Sony ships laptops with a recovery partition -->
-      <match key="volume.fstype" string="ntfs">
-	<match key="volume.label" string="Recovery Partition">
-	  <merge key="volume.ignore" type="bool">true</merge>
-	</match>
-      </match>
-
-      <!-- DELL ships some laptops with a visible recovery partition -->
+      <!-- EFI firmware partitions -->
       <match key="volume.fstype" string="vfat">
-	<match key="volume.label" string="DellUtility">
-	  <merge key="volume.ignore" type="bool">true</merge>
-	</match>
-	<match key="volume.label" string="DellRestore">
+	<match key="volume.label" string="EFI">
 	  <merge key="volume.ignore" type="bool">true</merge>
 	</match>
       </match>
 
-      <match key="volume.fstype" string="ntfs">
+      <match key="volume.fstype" string_outof="ntfs;vfat">
         <match key="volume.label" string="RECOVERY">
           <merge key="volume.ignore" type="bool">true</merge>
         </match>
-      </match>  
-
-      <!-- ASUS ships some desktop with a recovery partition -->
-      <match key="volume.fstype" string="vfat">
-	<match key="volume.label" string="RECOVERY">
+        <!-- ASUS ships some desktop with a recovery partition -->
+	<match key="volume.label" string="PQSERVICE">
 	  <merge key="volume.ignore" type="bool">true</merge>
 	</match>
-	<match key="volume.label" string="PQSERVICE">
+        <!-- HP ships desktops with a recovery partition -->
+	<match key="volume.label" string="HP_RECOVERY">
 	  <merge key="volume.ignore" type="bool">true</merge>
 	</match>
-      </match>
-      <match key="volume.fstype" string="ntfs">
-	<match key="volume.label" string="PQSERVICE">
+        <!-- Sony ships laptops with a recovery partition -->
+	<match key="volume.label" string="Recovery Partition">
 	  <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">
+        <!-- DELL ships some laptops with a visible recovery partition -->
+	<match key="volume.label" string_outof="DellUtility;DellRestore">
+	  <merge key="volume.ignore" type="bool">true</merge>
+	</match>
+        <!-- Lenovo and IBM ship with a various recovery partitions -->
+	<match key="volume.label" string_outof="IBM_SERVICE;SERVICEV001;SERVICEV002">
 	  <merge key="volume.ignore" type="bool">true</merge>
 	</match>
       </match>