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/ath79 | |
| 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/ath79')
| -rw-r--r-- | target/linux/ath79/base-files/lib/upgrade/platform.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/ath79/base-files/lib/upgrade/platform.sh b/target/linux/ath79/base-files/lib/upgrade/platform.sh index c2fe08154d..a7a63e27da 100644 --- a/target/linux/ath79/base-files/lib/upgrade/platform.sh +++ b/target/linux/ath79/base-files/lib/upgrade/platform.sh @@ -14,7 +14,7 @@ redboot_fis_do_upgrade() { if [ "$magic" = "4349" ]; then local kern_length=0x$(dd if="$sysup_file" bs=2 skip=1 count=4 2>/dev/null) - [ -f "$CONF_TAR" -a "$SAVE_CONFIG" -eq 1 ] && append="-j $CONF_TAR" + [ -f "$CONF_TAR" -a "$UPGRADE_OPT_UPGRADE_OPT_UPGRADE_OPT_SAVE_CONFIG" -eq 1 ] && append="-j $CONF_TAR" dd if="$sysup_file" bs=64k skip=1 2>/dev/null | \ mtd -r $append -F$kern_part:$kern_length:0x80060000,rootfs write - $kern_part:rootfs @@ -22,7 +22,7 @@ redboot_fis_do_upgrade() { local board_dir=$(tar tf $sysup_file | grep -m 1 '^sysupgrade-.*/$') local kern_length=$(tar xf $sysup_file ${board_dir}kernel -O | wc -c) - [ -f "$CONF_TAR" -a "$SAVE_CONFIG" -eq 1 ] && append="-j $CONF_TAR" + [ -f "$CONF_TAR" -a "$UPGRADE_OPT_UPGRADE_OPT_UPGRADE_OPT_SAVE_CONFIG" -eq 1 ] && append="-j $CONF_TAR" tar xf $sysup_file ${board_dir}kernel ${board_dir}root -O | \ mtd -r $append -F$kern_part:$kern_length:0x80060000,rootfs write - $kern_part:rootfs |