wlan-ap-Telecominfraproject/patches/base/0013-base-files-sysupgrade-always-assume-n-if-f-is-not-pr.patch
John Crispin 492db67f64 base-files: sysupgrade: always imply -n if -f is not provided
This ensures that no random config giles get carried over.

Signed-off-by: John Crispin <john@phrozen.org>
2023-01-27 12:18:37 +01:00

38 lines
1.1 KiB
Diff

From 60cf08fa4ce44d7c3d3c6264a933f4c6e5b2e831 Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org>
Date: Mon, 23 Jan 2023 09:47:54 +0100
Subject: [PATCH] base-files: sysupgrade: always assume -n if -f is not
provided
Signed-off-by: John Crispin <john@phrozen.org>
---
package/base-files/files/sbin/sysupgrade | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade
index 5a2d459013..f55237b935 100755
--- a/package/base-files/files/sbin/sysupgrade
+++ b/package/base-files/files/sbin/sysupgrade
@@ -9,7 +9,7 @@ export MTD_ARGS=""
export MTD_CONFIG_ARGS=""
export INTERACTIVE=0
export VERBOSE=1
-export SAVE_CONFIG=1
+export SAVE_CONFIG=0
export SAVE_OVERLAY=0
export SAVE_OVERLAY_PATH=
export SAVE_PARTITIONS=1
@@ -345,9 +345,6 @@ if [ -n "$CONF_IMAGE" ]; then
esac
get_image "$CONF_IMAGE" "cat" > "$CONF_TAR"
export SAVE_CONFIG=1
-elif ask_bool $SAVE_CONFIG "Keep config files over reflash"; then
- [ $TEST -eq 1 ] || do_save_conffiles "$CONF_TAR"
- export SAVE_CONFIG=1
else
[ $TEST -eq 1 ] || rm -f "$CONF_TAR"
export SAVE_CONFIG=0
--
2.34.1