Make automounting actually work. [#3 state:resolved]

3 files changed, 0 insertions, 80 deletions

diff --git a/data/30-ifuse.fdi b/data/30-ifuse.fdi
deleted file mode 100644
index 51ea028..0000000
--- a/data/30-ifuse.fdi
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<deviceinfo version="0.2">
-  <device>
-      <match key="usb_device.vendor_id" int="0x5ac">
-        <match key="usb.product_id" compare_ge="0x1290">
-          <match key="usb.product_id" compare_le="0x1293">
-	    <append key="info.capabilities" type="strlist">block</append>
-	    <append key="info.capabilities" type="strlist">storage</append>
-	    <merge key="info.callouts.add" type="strlist">hal-iphone-setup</merge>
-	    <merge key="info.category" type="string">storage</merge>
-	    <merge key="storage.bus" type="string">usb</merge>
-	    <merge key="storage.drive_type" type="string">disk</merge>
-	    <merge key="storage.removable" type="bool">true</merge>
-	    <merge key="storage.removable.media_available" type="bool">true</merge>
-	    <merge key="storage.requires_eject" type="bool">false</merge>
-	    <merge key="storage.hotpluggable" type="bool">false</merge>
-	    <merge key="storage.media_check_enabled" type="bool">false</merge>
-	    <merge key="storage.automount_enabled_hint" type="bool">true</merge>
-	    <merge key="storage.no_partitions_hint" type="bool">true</merge>
-	    <merge key="storage.model" type="string">iPhone</merge>
-	    <merge key="storage.vendor" type="string">Apple Computer, Inc.</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>
-          </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="0x1293">
-	    <match key="usb.interface.number" int="0x1">
-              <remove key="info.capabilities" type="strlist">camera</remove>
-              <append key="info.capabilities" type="strlist">block</append>
-              <append key="info.capabilities" type="strlist">volume</append>
-              <merge key="info.category" type="string">volume</merge>
-              <merge key="info.callouts.add" type="strlist">hal-iphone-setup</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="block.is_volume" type="bool">true</merge>
-              <merge key="block.no_partitions" type="bool">true</merge>
-              <merge key="block.have_scanned" type="bool">false</merge>
-              <append key="volume.fstype" type="string">fuse.ifuse</append>
-	      <merge key="volume.mount.valid_options" type="strlist">allow_other</merge>
-	      <append key="volume.fsusage" type="string">filesystem</append>
-              <append key="volume.label" type="string">iPhone</append>
-              <append key="volume.uuid" type="string"></append>
-	    </match>
-          </match>
-        </match>
-      </match>
-    </match>
-  </device>
-</deviceinfo>
diff --git a/data/Makefile.am b/data/Makefile.am
deleted file mode 100644
index f9302c4..0000000
--- a/data/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-freedesktopfdidir = $(prefix)/share/hal/fdi/information/20thirdparty/
-freedesktopfdi_DATA = 30-ifuse.fdi
-
-bin_SCRIPTS = hal-iphone-setup
diff --git a/data/hal-iphone-setup b/data/hal-iphone-setup
deleted file mode 100755
index a6cffe6..0000000
--- a/data/hal-iphone-setup
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-#
-# borrowed from Fedora and modified to apply device major and minor nodes to the iPhone
-#
-
-hal_set () {
-    if [ -n "$2" ]; then
-	/usr/bin/hal-set-property --udi "$UDI" --key block.$1 --int "$2"
-    else
-	/usr/bin/hal-set-property --udi "$UDI" --key block.$1 --remove
-    fi
-}
-
-DEVICE_NODE=`hal-get-property --udi "$UDI" --key block.device`
-
-echo $DEVICE_NODE
-
-MAJOR=`stat $DEVICE_NODE --format="%t"`
-MINOR=`stat $DEVICE_NODE --format="%T"`
-
-hal_set major 0x$MAJOR
-hal_set minor 0x$MINOR