X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=blobdiff_plain;f=package%2Fbase-files%2Ffiles%2Flib%2Fupgrade%2Fcommon.sh;fp=package%2Fbase-files%2Ffiles%2Flib%2Fupgrade%2Fcommon.sh;h=2c392496a0981763ebfa31dadbef00dbd3ff16d4;hp=d0ae8fef5b8443df82a6845da5615e99a5bfc1ff;hb=032f0de1f98b9bb82aac1393631b5b9e45a90e4f;hpb=890ab345530489253aae76977d2f1ee0294a2610 diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh index d0ae8fef5..2c392496a 100644 --- a/package/base-files/files/lib/upgrade/common.sh +++ b/package/base-files/files/lib/upgrade/common.sh @@ -142,12 +142,12 @@ jffs2_copy_config() { } default_do_upgrade() { + sync 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() { @@ -157,7 +157,7 @@ do_upgrade() { else default_do_upgrade "$ARGV" fi - + [ "$SAVE_CONFIG" -eq 1 -a -n "$USE_REFRESH" ] && { v "Refreshing partitions" if type 'platform_refresh_partitions' >/dev/null 2>/dev/null; then @@ -175,7 +175,8 @@ do_upgrade() { [ -n "$DELAY" ] && sleep "$DELAY" ask_bool 1 "Reboot" && { v "Rebooting system..." - echo b 2>/dev/null >/proc/sysrq-trigger reboot + sleep 5 + echo b 2>/dev/null >/proc/sysrq-trigger } }