Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-systemd

Conflicts:
	packages/sysutils/udisks/init.d/31_mount-disks
This commit is contained in:
Stephan Raue 2013-08-08 02:23:30 +02:00
commit 1bcebb86d3

View File

@ -21,7 +21,7 @@
# automount internal disks
for DEVICE in `find /sys/class/block/sd*/removable`; do
for DEVICE in `find /sys/class/block/sd*/removable > /dev/null 2>&1`; 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