Contents of /trunk/hal/patches/hal-0.5.10-don-t-Eject-on-dm-devices.patch
Parent Directory | Revision Log
Revision 597 -
(show annotations)
(download)
Mon May 19 19:05:19 2008 UTC (16 years, 4 months ago) by niro
File size: 2174 byte(s)
Mon May 19 19:05:19 2008 UTC (16 years, 4 months ago) by niro
File size: 2174 byte(s)
-gentoo patches
1 | From 828795ddd5d23a4e5030d191c11e713c4bd6906a Mon Sep 17 00:00:00 2001 |
2 | From: Danny Kukawka <danny.kukawka@web.de> |
3 | Date: Thu, 6 Dec 2007 18:34:00 +0100 |
4 | Subject: [PATCH] don't Eject() on dm-devices |
5 | |
6 | Maybe this is Linux specific, but currently we have the Eject() |
7 | methode also on dm-devices, but this fail because AFAIK dm-devices |
8 | don't support eject (it is a ioctl which is not allowed on dm). |
9 | |
10 | This adds the Eject() methode only if volume.linux.is_device_mapper=false. |
11 | --- |
12 | fdi/policy/10osvendor/20-storage-methods.fdi | 10 ++++++---- |
13 | 1 files changed, 6 insertions(+), 4 deletions(-) |
14 | |
15 | diff --git a/fdi/policy/10osvendor/20-storage-methods.fdi b/fdi/policy/10osvendor/20-storage-methods.fdi |
16 | index 3304eaf..9a0cbf5 100644 |
17 | --- a/fdi/policy/10osvendor/20-storage-methods.fdi |
18 | +++ b/fdi/policy/10osvendor/20-storage-methods.fdi |
19 | @@ -167,10 +167,12 @@ |
20 | <append key="org.freedesktop.Hal.Device.Volume.method_argnames" type="strlist">extra_options</append> |
21 | <append key="org.freedesktop.Hal.Device.Volume.method_execpaths" type="strlist">hal-storage-unmount</append> |
22 | |
23 | - <append key="org.freedesktop.Hal.Device.Volume.method_names" type="strlist">Eject</append> |
24 | - <append key="org.freedesktop.Hal.Device.Volume.method_signatures" type="strlist">as</append> |
25 | - <append key="org.freedesktop.Hal.Device.Volume.method_argnames" type="strlist">extra_options</append> |
26 | - <append key="org.freedesktop.Hal.Device.Volume.method_execpaths" type="strlist">hal-storage-eject</append> |
27 | + <match key="volume.linux.is_device_mapper" bool="false"> |
28 | + <append key="org.freedesktop.Hal.Device.Volume.method_names" type="strlist">Eject</append> |
29 | + <append key="org.freedesktop.Hal.Device.Volume.method_signatures" type="strlist">as</append> |
30 | + <append key="org.freedesktop.Hal.Device.Volume.method_argnames" type="strlist">extra_options</append> |
31 | + <append key="org.freedesktop.Hal.Device.Volume.method_execpaths" type="strlist">hal-storage-eject</append> |
32 | + </match> |
33 | |
34 | <!-- allow these mount options for all file systems --> |
35 | <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" string="Linux"> |
36 | -- |
37 | 1.5.3.7 |
38 |