X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/6c1223e18923b55896f7ab30bec5374343ba04ef..dbb9afa67c7f76c2d76de323f37d1e9a64473494:/package/base-files/files/lib/upgrade/common.sh?ds=sidebyside diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh index 6cc09e1a4..cf8977a5f 100644 --- a/package/base-files/files/lib/upgrade/common.sh +++ b/package/base-files/files/lib/upgrade/common.sh @@ -45,7 +45,7 @@ pivot() { # } run_ramfs() { # [...] - install_bin /bin/busybox /bin/ash /bin/sh /bin/mount /bin/umount /sbin/pivot_root /usr/bin/wget /sbin/reboot /bin/sync /bin/dd /bin/grep /bin/cp /bin/mv /bin/tar /usr/bin/md5sum "/usr/bin/[" /bin/vi + install_bin /bin/busybox /bin/ash /bin/sh /bin/mount /bin/umount /sbin/pivot_root /usr/bin/wget /sbin/reboot /bin/sync /bin/dd /bin/grep /bin/cp /bin/mv /bin/tar /usr/bin/md5sum "/usr/bin/[" /bin/vi /bin/ls /bin/cat /usr/bin/awk /usr/bin/hexdump install_bin /sbin/mtd for file in $RAMFS_COPY_BIN; do install_bin $file @@ -113,7 +113,7 @@ get_image() { } 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() { @@ -130,11 +130,24 @@ jffs2_copy_config() { fi } +default_do_upgrade() { + if [ "$SAVE_CONFIG" -eq 1 -a -z "$USE_REFRESH" ]; then + get_image "$1" | mtd -j "$CONF_TAR" write - "${PART_NAME:-image}" + else + get_image "$1" | mtd write - "${PART_NAME:-image}" + fi + sync +} + do_upgrade() { v "Performing system upgrade..." - platform_do_upgrade "$ARGV" + if type 'platform_do_upgrade' >/dev/null 2>/dev/null; then + platform_do_upgrade "$ARGV" + else + default_do_upgrade "$ARGV" + fi - [ "$SAVE_CONFIG" -eq 1 ] && { + [ "$SAVE_CONFIG" -eq 1 -a -n "$USE_REFRESH" ] && { v "Refreshing partitions" if type 'platform_refresh_partitions' >/dev/null 2>/dev/null; then platform_refresh_partitions @@ -147,5 +160,6 @@ do_upgrade() { jffs2_copy_config fi } + [ -n "$DELAY" ] && sleep "$DELAY" ask_bool 1 "Reboot" && reboot }