diff options
| author | Rafał Miłecki <rafal@milecki.pl> | 2019-09-05 23:33:19 +0200 |
|---|---|---|
| committer | Rafał Miłecki <rafal@milecki.pl> | 2019-09-12 13:27:29 +0200 |
| commit | a717428828558577760abfcf83a54e3d7459ee0b (patch) | |
| tree | 40460adc1ed60cf2ab8762a3cd7df3dead0015f4 /target/linux/ipq40xx/base-files | |
| parent | 1b9a4f0cb48acb91a8765d1d8715077b9846e39e (diff) | |
| download | upstream-a717428828558577760abfcf83a54e3d7459ee0b.tar.gz upstream-a717428828558577760abfcf83a54e3d7459ee0b.tar.bz2 upstream-a717428828558577760abfcf83a54e3d7459ee0b.zip | |
treewide: use new procd sysupgrade $UPGRADE_BACKUP variable
It's a variable set by procd that should replace hardcoded
/tmp/sysupgrade.tgz.
This change requires the most recent procd with the commit 0f3c136
("sysupgrade: set UPGRADE_BACKUP env variable").
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
(cherry picked from commit 641f6b6c26cb9ab5e1198810015e5f4b2b5b34ad)
Diffstat (limited to 'target/linux/ipq40xx/base-files')
| -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 0d93f289a3..e313562017 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 - [ "$UPGRADE_OPT_SAVE_CONFIG" -eq 1 ] && restore_backup="${MTD_CONFIG_ARGS} -j ${CONF_TAR}" + [ "$UPGRADE_OPT_SAVE_CONFIG" -eq 1 ] && restore_backup="${MTD_CONFIG_ARGS} -j ${UPGRADE_BACKUP}" 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 7a34e6c1d0..ced5534162 100644 --- a/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh @@ -38,7 +38,7 @@ zyxel_do_upgrade() { tar Oxf $tar_file ${board_dir}/kernel | mtd write - kernel if [ "$UPGRADE_OPT_SAVE_CONFIG" -eq 1 ]; then - tar Oxf $tar_file ${board_dir}/root | mtd -j "$CONF_TAR" write - rootfs + tar Oxf $tar_file ${board_dir}/root | mtd -j "$UPGRADE_BACKUP" write - rootfs else tar Oxf $tar_file ${board_dir}/root | mtd write - rootfs fi |