Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv

This commit is contained in:
Stephan Raue 2013-08-22 04:43:22 +02:00
commit 99d550712b
3 changed files with 7 additions and 9 deletions

View File

@ -25,9 +25,5 @@
( (
progress "Starting D-BUS" progress "Starting D-BUS"
while true; do dbus-daemon --system &>/dev/null
dbus-daemon --system --nofork &>/dev/null )
rm /var/run/dbus/pid &>/dev/null
usleep 500000
done
)&

View File

@ -22,7 +22,7 @@
wait_for_dbus () { wait_for_dbus () {
while [ ! -e /var/run/dbus/system_bus_socket ]; do while [ ! -e /var/run/dbus/system_bus_socket ]; do
usleep 200000 usleep 1000000
done done
} }

View File

@ -29,11 +29,13 @@
wait_for_dbus wait_for_dbus
for DEVICE in `ls /sys/class/block/sd*/removable 2>/dev/null`; do for DEVICE in `ls /sys/class/block/sd*/removable 2>/dev/null`; do
progress "automount : DEVICE $DEVICE"
if [ "$(cat $DEVICE)" = "0" ]; then if [ "$(cat $DEVICE)" = "0" ]; then
DISK=$(echo "$DEVICE" | sed -e "s,/sys/class/block,/dev," -e "s,/removable,,") DISK=$(echo "$DEVICE" | sed -e "s,/sys/class/block,/dev," -e "s,/removable,,")
for PART in $(ls "$DISK"[0-9]*);do for PART in $(ls "$DISK"[0-9]*);do
udisks --mount "$PART" >/dev/null progress "automount : PART $PART"
udisks --mount "$PART" 2>&1 | logger -s -t automount
done done
fi fi
done done &>/dev/null
)& )&