From b41e77c0392c27c083480d2a7e76edc2e6f80396 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Wed, 25 Jan 2012 03:05:21 +0100
Subject: [PATCH] Revert "udisks: automount internally partitions via udev"

This reverts commit 74d4582b055c9e536a6638c081d5d9774293bda9.
---
 .../31_mount-disks}                           | 37 ++++++++++++++-----
 1 file changed, 27 insertions(+), 10 deletions(-)
 rename packages/sysutils/udisks/{udev.d/97-automount.rules => init.d/31_mount-disks} (57%)

diff --git a/packages/sysutils/udisks/udev.d/97-automount.rules b/packages/sysutils/udisks/init.d/31_mount-disks
similarity index 57%
rename from packages/sysutils/udisks/udev.d/97-automount.rules
rename to packages/sysutils/udisks/init.d/31_mount-disks
index f78b00f905..a02d14aebd 100644
--- a/packages/sysutils/udisks/udev.d/97-automount.rules
+++ b/packages/sysutils/udisks/init.d/31_mount-disks
@@ -1,6 +1,6 @@
 ################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#      Copyright (C) 2009-2010 OpenELEC.tv
+#      http://www.openelec.tv
 #
 #  This Program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -18,13 +18,30 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-ACTION!="add|change", GOTO="end"
-SUBSYSTEM!="block", GOTO="end"
+#
+# automount internal disks
+#
+# runlevels: openelec, textmode
 
-# mount the partition on add/change, if its a filesystem and on a ata drive
-  KERNEL=="sd[a-z][0-9]*", \
-  ENV{ID_BUS}=="ata", \
-  ENV{ID_FS_USAGE}=="filesystem", \
-  RUN+="/usr/bin/udisks --mount /dev/%k"
+(
+  progress "automount internal disks"
 
-LABEL="end"
+  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
+    fi
+
+  done
+)&