From 2c77562af89a4b3f21be2e745a13cb647bfb7234 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Fri, 16 Aug 2019 17:02:58 +0200 Subject: treewide: sysupgrade: pass "save_partitions" option to the "sysupgrade" method MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This explicitly lets stage2 know if partitions should be preserved. No more "touch /tmp/sysupgrade.always.overwrite.bootdisk.partmap" hack. Signed-off-by: Rafał Miłecki (cherry picked from commit b6f4cd57e19a8cfcd9ff52582b65164ce6213c3d) --- package/base-files/files/lib/upgrade/stage2 | 5 ----- 1 file changed, 5 deletions(-) (limited to 'package/base-files/files/lib') diff --git a/package/base-files/files/lib/upgrade/stage2 b/package/base-files/files/lib/upgrade/stage2 index 4e5837af83..ff2a9aee05 100755 --- a/package/base-files/files/lib/upgrade/stage2 +++ b/package/base-files/files/lib/upgrade/stage2 @@ -6,8 +6,6 @@ export IMAGE="$1" COMMAND="$2" -export SAVE_PARTITIONS=1 - export INTERACTIVE=0 export VERBOSE=1 export CONFFILES=/tmp/sysupgrade.conffiles @@ -16,9 +14,6 @@ export CONF_TAR=/tmp/sysupgrade.tgz RAMFS_COPY_BIN= # extra programs for temporary ramfs root RAMFS_COPY_DATA= # extra data files - -[ -f /tmp/sysupgrade.always.overwrite.bootdisk.partmap ] && export SAVE_PARTITIONS=0 - include /lib/upgrade -- cgit v1.2.3