aboutsummaryrefslogtreecommitdiffstats
path: root/package/base-files/files/lib/upgrade/stage2
diff options
context:
space:
mode:
authorRafał Miłecki <rafal@milecki.pl>2019-08-16 16:54:38 +0200
committerJo-Philipp Wich <jo@mein.io>2019-09-04 13:42:40 +0200
commitf25d164aca80ff7c21ebb99b95e5f7db11fe21b3 (patch)
tree72152d9f555a00b14b656bbe097fae2ce85ebb76 /package/base-files/files/lib/upgrade/stage2
parent4e85dc95b02878f36d19a142f0eb26fd92abdbc1 (diff)
downloadupstream-f25d164aca80ff7c21ebb99b95e5f7db11fe21b3.tar.gz
upstream-f25d164aca80ff7c21ebb99b95e5f7db11fe21b3.tar.bz2
upstream-f25d164aca80ff7c21ebb99b95e5f7db11fe21b3.zip
base-files: pass "save_config" option to the "sysupgrade" method
This explicitly lets stage2 know if config should be preserved. Signed-off-by: Rafał Miłecki <rafal@milecki.pl> (cherry picked from commit b534ba96110012d2697d19d71b7dcd60bd4cd375)
Diffstat (limited to 'package/base-files/files/lib/upgrade/stage2')
-rwxr-xr-xpackage/base-files/files/lib/upgrade/stage22
1 files changed, 0 insertions, 2 deletions
diff --git a/package/base-files/files/lib/upgrade/stage2 b/package/base-files/files/lib/upgrade/stage2
index fef121f37c..4e5837af83 100755
--- a/package/base-files/files/lib/upgrade/stage2
+++ b/package/base-files/files/lib/upgrade/stage2
@@ -6,7 +6,6 @@
export IMAGE="$1"
COMMAND="$2"
-export SAVE_CONFIG=1
export SAVE_PARTITIONS=1
export INTERACTIVE=0
@@ -18,7 +17,6 @@ RAMFS_COPY_BIN= # extra programs for temporary ramfs root
RAMFS_COPY_DATA= # extra data files
-[ -f "$CONF_TAR" ] || export SAVE_CONFIG=0
[ -f /tmp/sysupgrade.always.overwrite.bootdisk.partmap ] && export SAVE_PARTITIONS=0
include /lib/upgrade