mvebu: fix sysupgrade

[openwrt/openwrt.git] / target / linux / mvebu / base-files / lib / upgrade / linksys.sh

diff --git a/target/linux/mvebu/base-files/lib/upgrade/linksys.sh b/target/linux/mvebu/base-files/lib/upgrade/linksys.sh
index f37831ba75c75b9d8e38ceaafc99ed9c73dad6aa..63d1cd14a4deed407b217a518ae25a752f62969e 100644 (file)
--- a/target/linux/mvebu/base-files/lib/upgrade/linksys.sh
+++ b/target/linux/mvebu/base-files/lib/upgrade/linksys.sh
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2014 OpenWrt.org
+# Copyright (C) 2014-2015 OpenWrt.org
 #
 
 linksys_get_target_firmware() {
@@ -19,6 +19,9 @@ linksys_get_target_firmware() {
                fw_setenv bootcmd "run nandboot"
        fi
 
+       # re-enable recovery so we get back if the new firmware is broken
+       fw_setenv auto_recovery yes
+
        echo "$target_firmware"
 }
 
@@ -70,14 +73,7 @@ platform_do_upgrade_linksys() {
        }
 }
 
-linksys_preupgrade() {
-       export RAMFS_COPY_BIN="${RAMFS_COPY_BIN} /usr/sbin/fw_printenv /usr/sbin/fw_setenv"
-       export RAMFS_COPY_BIN="${RAMFS_COPY_BIN} /bin/mkdir /bin/touch"
-       export RAMFS_COPY_DATA="${RAMFS_COPY_DATA} /etc/fw_env.config /var/lock/fw_printenv.lock"
-
-       [ -f /tmp/sysupgrade.tgz ] && {
-               cp /tmp/sysupgrade.tgz /tmp/syscfg/sysupgrade.tgz
-       }
+platform_copy_config_linksys() {
+       cp -f /tmp/sysupgrade.tgz /tmp/syscfg/sysupgrade.tgz
+       sync
 }
-
-append sysupgrade_pre_upgrade linksys_preupgrade