treewide: replace remaining (not working now) $SAVE_CONFIG uses
authorRafał Miłecki <rafal@milecki.pl>
Thu, 5 Sep 2019 06:40:29 +0000 (08:40 +0200)
committerRafał Miłecki <rafal@milecki.pl>
Fri, 6 Sep 2019 09:36:26 +0000 (11:36 +0200)
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)

target/linux/ar71xx/base-files/lib/upgrade/dir825.sh
target/linux/ar71xx/base-files/lib/upgrade/openmesh.sh
target/linux/ar71xx/base-files/lib/upgrade/platform.sh
target/linux/ath25/base-files/lib/upgrade/platform.sh
target/linux/ath79/base-files/lib/upgrade/platform.sh
target/linux/imx6/base-files/lib/upgrade/platform.sh
target/linux/ipq40xx/base-files/lib/upgrade/openmesh.sh
target/linux/ipq40xx/base-files/lib/upgrade/platform.sh

index 7ad3dd8e1faa866ebbfd378145527716df1c26be..f77350303238b58ccd239c7a4bd647bff012579f 100644 (file)
@@ -75,7 +75,7 @@ dir825b_do_upgrade_combined() {
 
        if [ -n "$fw_mtd" ] &&  [ ${fw_blocks:-0} -gt 0 ]; then
                local append=""
-               [ -f "$CONF_TAR" -a "$SAVE_CONFIG" -eq 1 ] && append="-j $CONF_TAR"
+               [ -f "$CONF_TAR" -a "$UPGRADE_OPT_UPGRADE_OPT_SAVE_CONFIG" -eq 1 ] && append="-j $CONF_TAR"
 
                sync
                dd if="$fw_file" bs=64k skip=1 count=$fw_blocks 2>/dev/null | \
index 65c624d86cf9d36790b73c354ea0392d10e086a6..88759318c3e31513e7f67ede9fd467229005e1cf 100644 (file)
@@ -159,7 +159,7 @@ platform_do_upgrade_openmesh()
        local cfg_size= kernel_size= rootfs_size=
        local append=""
 
-       [ -f "$CONF_TAR" -a "$SAVE_CONFIG" -eq 1 ] && append="-j $CONF_TAR"
+       [ -f "$CONF_TAR" -a "$UPGRADE_OPT_UPGRADE_OPT_SAVE_CONFIG" -eq 1 ] && append="-j $CONF_TAR"
 
        cfg_size=$(dd if="$img_path" bs=2 skip=35 count=4 2>/dev/null)
        kernel_size=$(dd if="$img_path" bs=2 skip=71 count=4 2>/dev/null)
index d0690dbaf43b04771a38a4dc52025dcfb68e99c5..dea6f566e0cbfdd52721d8991e482eeb712dbe0e 100755 (executable)
@@ -65,7 +65,7 @@ platform_do_upgrade_combined() {
        then
                local rootfspart=$(platform_find_rootfspart "$partitions" "$kernelpart")
                local append=""
-               [ -f "$CONF_TAR" -a "$SAVE_CONFIG" -eq 1 ] && append="-j $CONF_TAR"
+               [ -f "$CONF_TAR" -a "$UPGRADE_OPT_UPGRADE_OPT_SAVE_CONFIG" -eq 1 ] && append="-j $CONF_TAR"
 
                if [ "$PLATFORM_DO_UPGRADE_COMBINED_SEPARATE_MTD" -ne 1 ]; then
                    ( dd if="$1" bs=$CI_BLKSZ skip=1 count=$kern_blocks 2>/dev/null; \
@@ -164,7 +164,7 @@ platform_do_upgrade_compex() {
 
        if [ -n "$fw_mtd" ] &&  [ ${fw_blocks:-0} -gt 0 ]; then
                local append=""
-               [ -f "$CONF_TAR" -a "$SAVE_CONFIG" -eq 1 ] && append="-j $CONF_TAR"
+               [ -f "$CONF_TAR" -a "$UPGRADE_OPT_UPGRADE_OPT_SAVE_CONFIG" -eq 1 ] && append="-j $CONF_TAR"
 
                sync
                dd if="$fw_file" bs=64k skip=1 count=$fw_blocks 2>/dev/null | \
index d44b8fad80962d08c60193aa4c9f788cf0369426..65ac612ac4490e6b1989c5c1a429d3448f93ec1b 100644 (file)
@@ -67,7 +67,7 @@ platform_do_upgrade() {
           [ ${erase_size:-0} -gt 0 ];
        then
                local append=""
-               [ -f "$CONF_TAR" -a "$SAVE_CONFIG" -eq 1 ] && append="-j $CONF_TAR"
+               [ -f "$CONF_TAR" -a "$UPGRADE_OPT_UPGRADE_OPT_SAVE_CONFIG" -eq 1 ] && append="-j $CONF_TAR"
 
                ( dd if="$1" bs=$CI_BLKSZ skip=1 count=$kern_blocks 2>/dev/null; \
                  dd if="$1" bs=$CI_BLKSZ skip=$((1+$kern_blocks)) count=$root_blocks 2>/dev/null ) | \
index c2fe08154d9e297fc4c79443465257af0ef3290b..a7a63e27da796c0fba047d357bb78124c3457180 100644 (file)
@@ -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
 
index c3be9d542416d111bcb86d0b42238552827450f3..07b568d9b4dba091e329da21ffa0a3577c05e9b1 100755 (executable)
@@ -78,7 +78,7 @@ platform_pre_upgrade() {
 
        case "$board" in
        apalis*)
-               [ "$SAVE_CONFIG" -eq 0 ] && {
+               [ "$UPGRADE_OPT_SAVE_CONFIG" -eq 0 ] && {
                        jffs2reset -y
                        umount /overlay
                }
index f4bc7e756581af413520a809e6b576756a6e3a2c..0d93f289a3c0af0b6e8fe84d9b0b757bfdef8993 100644 (file)
@@ -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
index e62d16c4493ed2bad42ef842354aedc582f798db..fffef2c89e69d4672fe4a3a3eeda2527704b9c7f 100644 (file)
@@ -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