hal: Branch 'master'

[David Zeuthen]

 fdi/preprobe/10osvendor/20-broken-usb-sticks.fdi |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 889df6e1e1ba33280685158a80872962d6337e0d
Author: David Zeuthen <davidz at redhat.com>
Date:   Sun Feb 24 23:14:53 2008 -0500

    avoid showing fake cdrom drive on SanDisk Cruzer
    
    This is for my 8GB Sandisk Cruzer Micro.

diff --git a/fdi/preprobe/10osvendor/20-broken-usb-sticks.fdi b/fdi/preprobe/10osvendor/20-broken-usb-sticks.fdi
index 29700b5..19b2bfc 100644
--- a/fdi/preprobe/10osvendor/20-broken-usb-sticks.fdi
+++ b/fdi/preprobe/10osvendor/20-broken-usb-sticks.fdi
@@ -9,6 +9,9 @@
       <match key="storage.drive_type" string="cdrom">
 	<match key="storage.lun" int="1">
           <match key="storage.vendor" string="SanDisk">
+            <match key="storage.model" string="Cruzer">
+	      <merge key="info.ignore" type="bool">true</merge>
+	    </match>
             <match key="storage.model" string="U3 Cruzer Micro">
 	      <merge key="info.ignore" type="bool">true</merge>
 	    </match>