From f47a4a58c5f96d00d557f42b068503d89952ec06 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Tue, 23 Sep 2008 11:05:54 +0000 Subject: fix sysupgrade support for brcm-2.4 and brcm47xx make mtd refresh based config append optional (leave enabled on x86) SVN-Revision: 12657 --- package/base-files/files/lib/upgrade/common.sh | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'package') diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh index 59ac7a7..7fc31e8 100644 --- a/package/base-files/files/lib/upgrade/common.sh +++ b/package/base-files/files/lib/upgrade/common.sh @@ -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 -- cgit v1.1