hal: Branch 'master'

[Richard Hughes]

 fdi/policy/10osvendor/20-storage-methods.fdi |   38 ++++++++++++++++++++++++++-
 1 files changed, 37 insertions(+), 1 deletion(-)

New commits:
diff-tree de7c9383d96776143ac49536260b80ab82c3890f (from fb82cfd3c981c3b583cb978e131083f8a48642e5)
Author: Richard Hughes <richard at hughsie.com>
Date:   Sat Jul 21 10:43:15 2007 +0100

    add recovery partitions by other vendors
    
    After my recent blog post, I've got a long list of vendors
    recovery partitions. Add to the existing HP entry and add
    the other vendors. Trivial addition.

diff --git a/fdi/policy/10osvendor/20-storage-methods.fdi b/fdi/policy/10osvendor/20-storage-methods.fdi
index 22c45be..223d799 100644
--- a/fdi/policy/10osvendor/20-storage-methods.fdi
+++ b/fdi/policy/10osvendor/20-storage-methods.fdi
@@ -93,7 +93,22 @@
           <merge key="volume.ignore" type="bool">true</merge>
 	</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">
@@ -101,6 +116,27 @@
 	</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 -->
+      <match key="volume.fstype" string="vfat">
+	<match key="volume.label" string="DellUtility">
+	  <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">
+	  <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">