Revert r12510. Remove -rpath-link form TARGET_LDFLAGS as it breaks some

[openwrt.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 7584b77..59ac7a7 100644 (file)
--- a/package/base-files/files/lib/upgrade/common.sh
+++ b/package/base-files/files/lib/upgrade/common.sh
@@ -113,7 +113,7 @@ get_image() {
 }
 
 get_magic_word() {
 }
 
 get_magic_word() {

-       get_image "$1" | dd bs=2 count=1 2>/dev/null | hexdump | awk '$2 { print $2 }'
+       get_image "$1" | dd bs=2 count=1 2>/dev/null | hexdump -C | awk '$2 { print $2 $3 }'

 }
 
 refresh_mtd_partitions() {
 }
 
 refresh_mtd_partitions() {


@@ -147,5 +147,6 @@ do_upgrade() {
                        jffs2_copy_config
                fi
        }
                        jffs2_copy_config
                fi
        }

+       [ -n "$DELAY" ] && sleep "$DELAY"

        ask_bool 1 "Reboot" && reboot
 }
        ask_bool 1 "Reboot" && reboot
 }