diff options
author | Martin Szulecki | 2009-09-12 12:40:29 +0200 |
---|---|---|
committer | Martin Szulecki | 2009-09-12 12:40:29 +0200 |
commit | 2f4f9909f926267389778a01622b6454634f0013 (patch) | |
tree | c6d7104a3181a158b63a22b0b3c17fc79d2dcba1 /fdi | |
parent | cf902d602c41efb6e2521a93b536fbad1cfb2e63 (diff) | |
download | ifuse-2f4f9909f926267389778a01622b6454634f0013.tar.gz ifuse-2f4f9909f926267389778a01622b6454634f0013.tar.bz2 |
Remove obsolete HAL fdi rules
Automounting using this fdi never worked for everyone successfully.
As HAL is deprecated, this automount is clearly a hack and the next
round of distro releases won't support this way of mounting anymore,
it makes sense to remove it anyways.
Diffstat (limited to 'fdi')
-rw-r--r-- | fdi/30-ifuse.fdi | 46 | ||||
-rw-r--r-- | fdi/Makefile.am | 4 |
2 files changed, 0 insertions, 50 deletions
diff --git a/fdi/30-ifuse.fdi b/fdi/30-ifuse.fdi deleted file mode 100644 index 5a47d15..0000000 --- a/fdi/30-ifuse.fdi +++ /dev/null @@ -1,46 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<deviceinfo version="0.2"> - <device> - <match key="info.subsystem" string="usb_device"> - <match key="usb_device.vendor_id" int="0x5ac"> - <match key="usb_device.product_id" compare_ge="0x1290"> - <match key="usb_device.product_id" compare_le="0x1294"> - <append key="info.capabilities" type="strlist">block</append> - <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> - <!-- 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">linux.device_file</append> - <merge key="block.storage_device" type="copy_property">info.udi</merge> - </match> - </match> - </match> - </match> - <match key="info.subsystem" string="usb"> - <match key="usb.vendor_id" int="0x5ac"> - <match key="usb.product_id" compare_ge="0x1290"> - <match key="usb.product_id" compare_le="0x1294"> - <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="copy_property">@info.parent:usb_device.product</append> - <append key="volume.uuid" type="copy_property">@info.parent:usb_device.serial</append> - </match> - </match> - </match> - </match> - </match> - </device> -</deviceinfo> diff --git a/fdi/Makefile.am b/fdi/Makefile.am deleted file mode 100644 index adfa88c..0000000 --- a/fdi/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -freedesktopfdidir=$(prefix)/share/hal/fdi/information/20thirdparty -freedesktopfdi_DATA=30-ifuse.fdi - -EXTRA_DIST=$(freedesktopfdi_DATA) |