hal: Branch 'master'

[Danny Kukawka]

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

New commits:
commit 441f0cea7f184f4d804f35fc662989d0c9dca100
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Thu Dec 6 18:34:00 2007 +0100

    don't Eject() on dm-devices
    
    Maybe this is Linux specific, but currently we have the Eject()
    methode also on dm-devices, but this fail because AFAIK dm-devices
    don't support eject (it is a ioctl which is not allowed on dm).
    
    This adds the Eject() methode only if volume.linux.is_device_mapper=false.

diff --git a/fdi/policy/10osvendor/20-storage-methods.fdi b/fdi/policy/10osvendor/20-storage-methods.fdi
index 3304eaf..9a0cbf5 100644
--- a/fdi/policy/10osvendor/20-storage-methods.fdi
+++ b/fdi/policy/10osvendor/20-storage-methods.fdi
@@ -167,10 +167,12 @@
       <append key="org.freedesktop.Hal.Device.Volume.method_argnames" type="strlist">extra_options</append>
       <append key="org.freedesktop.Hal.Device.Volume.method_execpaths" type="strlist">hal-storage-unmount</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_argnames" type="strlist">extra_options</append>
-      <append key="org.freedesktop.Hal.Device.Volume.method_execpaths" type="strlist">hal-storage-eject</append>
+      <match key="volume.linux.is_device_mapper" bool="false">
+        <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_argnames" type="strlist">extra_options</append>
+        <append key="org.freedesktop.Hal.Device.Volume.method_execpaths" type="strlist">hal-storage-eject</append>
+      </match>
 
       <!-- allow these mount options for all file systems -->
       <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" string="Linux">