hal/fdi/policy/10osvendor 20-storage-methods.fdi,1.11,1.12

[David Zeuthen]

Update of /cvs/hal/hal/fdi/policy/10osvendor
In directory gabe:/tmp/cvs-serv26937/fdi/policy/10osvendor

Modified Files:
	20-storage-methods.fdi 
Log Message:
2006-01-24  David Zeuthen  <davidz at redhat.com>

        * fdi/policy/10osvendor/20-storage-methods.fdi: For providing eject
        on audio discs, also match on the cdrom drive instead of a cd_rom
        disc. Also put Eject on blank discs.



Index: 20-storage-methods.fdi
===================================================================
RCS file: /cvs/hal/hal/fdi/policy/10osvendor/20-storage-methods.fdi,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- 20-storage-methods.fdi	21 Jan 2006 22:08:22 -0000	1.11
+++ 20-storage-methods.fdi	24 Jan 2006 06:32:36 -0000	1.12
@@ -6,13 +6,19 @@
       <append key="info.callouts.add" type="strlist">hal-system-storage-cleanup-mountpoints</append>
     </match>
     
-    <match key="volume.disc.type" string="cd_rom">
+    <match key="@block.storage_device:storage.drive_type" string="cdrom">
       <match key="volume.disc.has_audio" bool="true">
         <append key="info.interfaces" type="strlist">org.freedesktop.Hal.Device.Volume</append>
         <append key="org.freedesktop.Hal.Device.Volume.method_names" type="strlist">Eject</append>
         <append key="org.freedesktop.Hal.Device.Volume.method_signatures" type="strlist">as</append>
         <append key="org.freedesktop.Hal.Device.Volume.method_execpaths" type="strlist">hal-system-storage-eject</append>
       </match>
+      <match key="volume.disc.is_blank" bool="true">
+        <append key="info.interfaces" type="strlist">org.freedesktop.Hal.Device.Volume</append>
+        <append key="org.freedesktop.Hal.Device.Volume.method_names" type="strlist">Eject</append>
+        <append key="org.freedesktop.Hal.Device.Volume.method_signatures" type="strlist">as</append>
+        <append key="org.freedesktop.Hal.Device.Volume.method_execpaths" type="strlist">hal-system-storage-eject</append>
+      </match>
     </match>
 
     <match key="volume.fsusage" string="filesystem">