diff options
| author | Rafał Miłecki <rafal@milecki.pl> | 2019-09-05 08:40:29 +0200 |
|---|---|---|
| committer | Rafał Miłecki <rafal@milecki.pl> | 2019-09-06 11:36:26 +0200 |
| commit | 9b9412d55cca640d77d099b31d03fcb3a95bd31b (patch) | |
| tree | 401b96df29a9c64be880fa0a11c085c7462ab712 /target/linux/ipq40xx/base-files/lib/upgrade | |
| parent | af7c186eadb704f79bcdc1f97bf3edf6ea88ff5c (diff) | |
| download | upstream-9b9412d55cca640d77d099b31d03fcb3a95bd31b.tar.gz upstream-9b9412d55cca640d77d099b31d03fcb3a95bd31b.tar.bz2 upstream-9b9412d55cca640d77d099b31d03fcb3a95bd31b.zip | |
treewide: replace remaining (not working now) $SAVE_CONFIG uses
This var has been replaced by the $UPGRADE_OPT_UPGRADE_OPT_SAVE_CONFIG
Fixes: f25d164aca80 ("base-files: pass "save_config" option to the "sysupgrade" method")
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
(cherry picked from commit 5797fe84a3b508483f7d82e177157c1bf2f342d9)
Diffstat (limited to 'target/linux/ipq40xx/base-files/lib/upgrade')
| -rw-r--r-- | target/linux/ipq40xx/base-files/lib/upgrade/openmesh.sh | 2 | ||||
| -rw-r--r-- | target/linux/ipq40xx/base-files/lib/upgrade/platform.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/ipq40xx/base-files/lib/upgrade/openmesh.sh b/target/linux/ipq40xx/base-files/lib/upgrade/openmesh.sh index f4bc7e7565..0d93f289a3 100644 --- a/target/linux/ipq40xx/base-files/lib/upgrade/openmesh.sh +++ b/target/linux/ipq40xx/base-files/lib/upgrade/openmesh.sh @@ -74,7 +74,7 @@ platform_do_upgrade_openmesh() { # # take care of restoring a saved config - [ "$SAVE_CONFIG" -eq 1 ] && restore_backup="${MTD_CONFIG_ARGS} -j ${CONF_TAR}" + [ "$UPGRADE_OPT_SAVE_CONFIG" -eq 1 ] && restore_backup="${MTD_CONFIG_ARGS} -j ${CONF_TAR}" mtd -q erase inactive tar xf $tar_file ${board_dir}/root -O | mtd -n -p $kernel_length $restore_backup write - $PART_NAME diff --git a/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh b/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh index e62d16c449..fffef2c89e 100644 --- a/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh @@ -37,7 +37,7 @@ zyxel_do_upgrade() { tar Oxf $tar_file ${board_dir}/kernel | mtd write - kernel - if [ "$SAVE_CONFIG" -eq 1 ]; then + if [ "$UPGRADE_OPT_SAVE_CONFIG" -eq 1 ]; then tar Oxf $tar_file ${board_dir}/root | mtd -j "$CONF_TAR" write - rootfs else tar Oxf $tar_file ${board_dir}/root | mtd write - rootfs |