Merge branch 'openelec-next' of git://github.com/OpenELEC/OpenELEC.tv into openelec-pvr

This commit is contained in:
Stephan Raue 2011-05-25 12:47:04 +02:00
commit 1eb80e1e7a

View File

@ -126,18 +126,17 @@ NFS_OVERLAY="192.168.1.1:/var/lib/overlay"
ERR_ENV=1
MOUNT_OPTIONS="-o $3 $1 $2"
if [ -z "$4" ]; then
if [ -n "$4" ]; then
MOUNT_OPTIONS="-t $4 $MOUNT_OPTIONS"
fi
progress "mount filesystem $1 ..."
$IONICE /bin/busybox mount $mount_opts > /dev/null 2>&1
$IONICE /bin/busybox mount $MOUNT_OPTIONS > /dev/null 2>&1
[ "$?" -eq "0" ] && ERR_ENV=0 && break
/bin/busybox usleep 1000000
done
[ "$ERR_ENV" -ne "0" ] && error "INIT_4" "Could not mount $1" && debug_shell
}
update() {