From 9bcf835a1b32849ed335a0e35bd8e09e9f0af155 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Wed, 7 Aug 2013 10:39:57 +0200
Subject: [PATCH] udisks: rework automounter script

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 .../sysutils/udisks/init.d/31_mount-disks     | 22 +++++--------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/packages/sysutils/udisks/init.d/31_mount-disks b/packages/sysutils/udisks/init.d/31_mount-disks
index 70ee7a72a4..4824c39236 100644
--- a/packages/sysutils/udisks/init.d/31_mount-disks
+++ b/packages/sysutils/udisks/init.d/31_mount-disks
@@ -28,22 +28,12 @@
 
   wait_for_dbus
 
-  drive_dump () {
-    udisks --dump | tr -d ' ' | grep 'device-file:' | cut -d ':' -f2
-  }
-
-  show_info () {
-    udisks --show-info $2 | grep "$1:" | tr -d ' ' | cut -d ":" -f2
-  }
-
-  for DEVICE in `drive_dump`; do
-    REMOVABLE="`show_info "removable" $DEVICE`"
-    MOUNTED="`show_info "is mounted" $DEVICE`"
-    USAGE="`show_info "usage" $DEVICE`"
-
-    if [ "$REMOVABLE" = "0" -a "$MOUNTED" = "0" -a "$USAGE" = "filesystem" ]; then
-      udisks --mount "$DEVICE" >/dev/null
+  for DEVICE in `find /sys/class/block/sd*/removable`; do
+    if [ "$(cat $DEVICE)" = "0" ]; then
+      DISK=$(echo "$DEVICE" | sed -e "s,/sys/class/block,/dev," -e "s,/removable,,")
+      for PART in $(ls "$DISK"[0-9]*);do
+        udisks --mount "$PART" >/dev/null
+      done
     fi
-
   done
 )&