diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2008-01-06 13:40:51 -0500 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2008-01-06 13:40:51 -0500 |
| commit | c1db8be156e8ad06cd18267c81922c07cc71a348 (patch) | |
| tree | d49cc1828b3fab8a5dca6545057a4718658ad867 /fdi | |
| parent | 9bcdfd451640df870d5ff6b2ca2ef200067cb16b (diff) | |
properly add the Eject method to Volumes on FreeBSD
FreeBSD doesn't have a volume.linux.is_device_mapper property, so Eject was
not being added as a Volume method on FreeBSD. Only check for
volume.linux.is_device_mapper if we are on Linux. On FreeBSD, add Eject
no matter what.
Diffstat (limited to 'fdi')
| -rw-r--r-- | fdi/policy/10osvendor/20-storage-methods.fdi | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/fdi/policy/10osvendor/20-storage-methods.fdi b/fdi/policy/10osvendor/20-storage-methods.fdi index 9a0cbf56..e1b77cef 100644 --- a/fdi/policy/10osvendor/20-storage-methods.fdi +++ b/fdi/policy/10osvendor/20-storage-methods.fdi @@ -167,11 +167,20 @@ <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> - <match key="volume.linux.is_device_mapper" bool="false"> + <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" string="Linux"> + <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> + </match> + + <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" string="FreeBSD"> <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> + <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 --> |