summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Martin Szulecki2009-05-22 12:21:47 +0200
committerGravatar Matt Colyer2009-05-23 17:26:31 -0700
commit44a707314c6fa4aa6da626889c4f264c44ad0b7d (patch)
treefab3c34c5a9f773a8f12456a84941026b57ca99d
parent4ca7c7265fd9df3d60ba9cb2455004c63832acac (diff)
downloadifuse-44a707314c6fa4aa6da626889c4f264c44ad0b7d.tar.gz
ifuse-44a707314c6fa4aa6da626889c4f264c44ad0b7d.tar.bz2
Minor fix for HAL fdi to properly merge keys and add required missing ones
Signed-off-by: Matt Colyer <matt@colyer.name>
-rw-r--r--fdi/30-ifuse.fdi19
1 files changed, 12 insertions, 7 deletions
diff --git a/fdi/30-ifuse.fdi b/fdi/30-ifuse.fdi
index a801720..4301e72 100644
--- a/fdi/30-ifuse.fdi
+++ b/fdi/30-ifuse.fdi
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<deviceinfo version="0.2">
<device>
<match key="info.subsystem" string="usb_device">
@@ -9,12 +9,15 @@
<append key="info.capabilities" type="strlist">storage</append>
<merge key="storage.hotpluggable" type="bool">false</merge>
<merge key="storage.removable" type="bool">true</merge>
+ <merge key="storage.requires_eject" type="bool">false</merge>
<merge key="storage.automount_enabled_hint" type="bool">true</merge>
- <merge key="storage.model" type="string">iPhone</merge>
- <merge key="storage.vendor" type="string">Apple Computer, Inc.</merge>
+ <!-- This also applies to the iPhone as it has the same filesystem structure -->
+ <merge key="storage.model" type="string">iPod</merge>
+ <merge key="storage.vendor" type="copy_property">usb_device.vendor</merge>
+ <merge key="storage.serial" type="copy_property">usb_device.serial</merge>
<merge key="storage.orginating_device" type="copy_property">/org/freedesktop/Hal/devices/computer</merge>
- <append key="block.device" type="copy_property">@info.udi:linux.device_file</append>
- <merge key="block.storage_device" type="copy_property">@info.parent:info.udi</merge>
+ <append key="block.device" type="copy_property">linux.device_file</append>
+ <merge key="block.storage_device" type="copy_property">info.udi</merge>
</match>
</match>
</match>
@@ -26,12 +29,14 @@
<match key="usb.interface.number" int="0x1">
<append key="info.capabilities" type="strlist">block</append>
<append key="info.capabilities" type="strlist">volume</append>
+ <merge key="info.category" type="string">volume</merge>
<append key="block.device" type="copy_property">@info.parent:linux.device_file</append>
<merge key="block.storage_device" type="copy_property">@info.parent:info.udi</merge>
+ <merge key="volume.mount.valid_options" type="strlist">allow_other</merge>
<append key="volume.fstype" type="string">fuse.ifuse</append>
<append key="volume.fsusage" type="string">filesystem</append>
- <append key="volume.label" type="string">iPhone</append>
- <append key="volume.uuid" type="string"></append>
+ <append key="volume.label" type="copy_property">@info.parent:usb_device.product</append>
+ <append key="volume.uuid" type="copy_property">@info.parent:usb_device.serial</append>
</match>
</match>
</match>