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

This commit is contained in:
Stephan Raue 2013-03-22 22:27:14 +01:00
commit 15505f80ca

View File

@ -488,9 +488,10 @@
check_update() {
progress "Checking for updates"
# if [ -f "/flash/MACH_KERNEL" ]; then
# IMAGE_KERNEL="MACH_KERNEL"
# fi
# check for ATV1 mach-o-kernel
if [ -f "/flash/com.apple.Boot.plist" -a -f "/flash/boot.efi" ]; then
UPDATE_KERNEL="MACH_KERNEL"
fi
if [ -f "$UPDATE_DIR/$UPDATE_KERNEL" -a -f "$UPDATE_DIR/$UPDATE_SYSTEM" ] ; then
if [ -f "$UPDATE_DIR/.nocheck" ] ; then
@ -542,19 +543,14 @@
update_bootloader
REBOOT="1"
else
/bin/busybox rm "$UPDATE_DIR/$UPDATE_KERNEL"
/bin/busybox rm "$UPDATE_DIR/$UPDATE_SYSTEM"
/bin/busybox rm -rf $UPDATE_DIR/[0-9a-zA-Z]* &>/dev/null
echo "md5 check failed. normal startup in 30s..."
/bin/busybox sync
/bin/busybox usleep 30000000
fi
/bin/busybox rm "$UPDATE_DIR/${UPDATE_KERNEL}.md5" &>/dev/null
/bin/busybox rm "$UPDATE_DIR/${UPDATE_SYSTEM}.md5" &>/dev/null
/bin/busybox rm -rf $UPDATE_DIR/[0-9a-zA-Z]* &>/dev/null
else
/bin/busybox rm "$UPDATE_DIR/$UPDATE_KERNEL"
/bin/busybox rm "$UPDATE_DIR/$UPDATE_SYSTEM"
/bin/busybox rm "$UPDATE_DIR/${UPDATE_KERNEL}.md5" &>/dev/null
/bin/busybox rm "$UPDATE_DIR/${UPDATE_SYSTEM}.md5" &>/dev/null
/bin/busybox rm -rf $UPDATE_DIR/[0-9a-zA-Z]* &>/dev/null
echo "size check failed. normal startup in 30s..."
/bin/busybox sync
/bin/busybox usleep 30000000