Merge r16867 to 8.09

[openwrt/svn-archive/archive.git] / target / linux / x86 / base-files / lib / upgrade / platform.sh

diff --git a/target/linux/x86/base-files/lib/upgrade/platform.sh b/target/linux/x86/base-files/lib/upgrade/platform.sh
index f4c8334f3663c280c09c51e859e736ab3495eec1..0f79a00cb831babe0a2546362019d4977c89e7e3 100644 (file)
--- a/target/linux/x86/base-files/lib/upgrade/platform.sh
+++ b/target/linux/x86/base-files/lib/upgrade/platform.sh
@@ -1,3 +1,5 @@
+USE_REFRESH=1
+
 platform_check_image() {
        [ "$ARGC" -gt 1 ] && return 1
 
@@ -11,15 +13,15 @@ platform_check_image() {
 }
 
 platform_do_upgrade() {
-       get_image "$1" > /dev/hda
        sync
+       get_image "$1" > /dev/hda
 }
 
 x86_prepare_ext2() {
        # if we're running from ext2, we need to make sure that we have a mtd 
        # partition that points to the active rootfs partition.
        # however this only matters if we actually need to preserve the config files
-       [ "$SAVE_CONFIG" -eq 1 ] && return 0
+       [ "$SAVE_CONFIG" -eq 1 ] || return 0
        grep rootfs /proc/mtd >/dev/null || {
                echo /dev/hda2,65536,rootfs > /sys/module/block2mtd/parameters/block2mtd
        }