[backfire] backport r27776

[openwrt-10.03/.git] / package / base-files / files / lib / upgrade / common.sh

diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh
index 970016e7baac276d3eb595370bc0336941d697a2..11e1b2cdfaa4d49c35a2d7ee7989f703fd62f67e 100644 (file)
--- a/package/base-files/files/lib/upgrade/common.sh
+++ b/package/base-files/files/lib/upgrade/common.sh
@@ -130,6 +130,10 @@ get_magic_word() {
        get_image "$@" | dd bs=2 count=1 2>/dev/null | hexdump -v -n 2 -e '1/1 "%02x"'
 }
 
+get_magic_long() {
+       get_image "$@" | dd bs=4 count=1 2>/dev/null | hexdump -v -n 4 -e '1/1 "%02x"'
+}
+
 refresh_mtd_partitions() {
        mtd refresh rootfs
 }
@@ -178,7 +182,7 @@ do_upgrade() {
        [ -n "$DELAY" ] && sleep "$DELAY"
        ask_bool 1 "Reboot" && {
                v "Rebooting system..."
-               reboot
+               reboot -f
                sleep 5
                echo b 2>/dev/null >/proc/sysrq-trigger
        }