hal: Branch 'master'

[Danny Kukawka]

 fdi/policy/10osvendor/20-storage-methods.fdi |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 48cf6988c6448a3ddf0d62fd13d83c6188a2fa55
Author: Pacho Ramos <pacho at condmat1.ciencias.uniovi.es>
Date:   Wed Oct 1 12:19:41 2008 +0200

    prevent hal from automounting Dell recovery partition
    
    This patch prevent hal from automounting Dell recovery partition (and
    any ntfs partition with label "RECOVERY")

diff --git a/fdi/policy/10osvendor/20-storage-methods.fdi b/fdi/policy/10osvendor/20-storage-methods.fdi
index efc69cd..b3dde40 100644
--- a/fdi/policy/10osvendor/20-storage-methods.fdi
+++ b/fdi/policy/10osvendor/20-storage-methods.fdi
@@ -132,6 +132,12 @@
 	</match>
       </match>
 
+      <match key="volume.fstype" string="ntfs">
+        <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">