/bin/sleep is missing in the list of ramfs commands. the platform_check_image function call is hardcode instead of useing the previously defined variable
finally there are a few cosmetic fixes Signed-off-by: Roberto Riggio <[email protected]> -- Index: package/base-files/files/lib/upgrade/common.sh =================================================================== --- package/base-files/files/lib/upgrade/common.sh (revisione 13715) +++ package/base-files/files/lib/upgrade/common.sh (copia locale) @@ -45,7 +45,7 @@ } run_ramfs() { # <command> [...] - 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 /bin/busybox /bin/ash /bin/sh /bin/mount /bin/sleep /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 @@ -146,7 +146,7 @@ else default_do_upgrade "$ARGV" fi - + v "System upgraded" [ "$SAVE_CONFIG" -eq 1 -a -n "$USE_REFRESH" ] && { v "Refreshing partitions" if type 'platform_refresh_partitions' >/dev/null 2>/dev/null; then @@ -160,6 +160,9 @@ jffs2_copy_config fi } - [ -n "$DELAY" ] && sleep "$DELAY" + [ -n "$DELAY" ] && { + v "Waiting $DELAY seconds before rebooting..." + sleep "$DELAY" + } ask_bool 1 "Reboot" && reboot } Index: package/base-files/files/sbin/sysupgrade =================================================================== --- package/base-files/files/sbin/sysupgrade (revisione 13715) +++ package/base-files/files/sbin/sysupgrade (copia locale) @@ -76,7 +76,7 @@ tar c${TAR_V}zf "$CONF_TAR" -T "$CONFFILES" 2>/dev/null } -type platform_check_image >/dev/null 2>/dev/null || { +type $sysupgrade_image_check >/dev/null 2>/dev/null || { echo "Firmware upgrade is not implemented for this platform." exit 1 } @@ -89,7 +89,7 @@ done if [ -n "$CONF_IMAGE" ]; then - case "$(get_magic_word "$CONF_IMAGE")" in + case $(get_magic_word "$CONF_IMAGE") in # .gz files 1f8b) ;; *) _______________________________________________ openwrt-devel mailing list [email protected] http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
