aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/x86
diff options
context:
space:
mode:
authorRafał Miłecki <rafal@milecki.pl>2019-08-16 17:02:58 +0200
committerJo-Philipp Wich <jo@mein.io>2019-09-04 13:43:05 +0200
commit2c77562af89a4b3f21be2e745a13cb647bfb7234 (patch)
tree64dd9f9869ecb1a7bf395fb533a6ba23821290d4 /target/linux/x86
parentf25d164aca80ff7c21ebb99b95e5f7db11fe21b3 (diff)
downloadupstream-2c77562af89a4b3f21be2e745a13cb647bfb7234.tar.gz
upstream-2c77562af89a4b3f21be2e745a13cb647bfb7234.tar.bz2
upstream-2c77562af89a4b3f21be2e745a13cb647bfb7234.zip
treewide: sysupgrade: pass "save_partitions" option to the "sysupgrade" method
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 <rafal@milecki.pl> (cherry picked from commit b6f4cd57e19a8cfcd9ff52582b65164ce6213c3d)
Diffstat (limited to 'target/linux/x86')
-rw-r--r--target/linux/x86/base-files/lib/upgrade/platform.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/x86/base-files/lib/upgrade/platform.sh b/target/linux/x86/base-files/lib/upgrade/platform.sh
index 439ba8f512..162dbaf3aa 100644
--- a/target/linux/x86/base-files/lib/upgrade/platform.sh
+++ b/target/linux/x86/base-files/lib/upgrade/platform.sh
@@ -54,7 +54,7 @@ platform_do_upgrade() {
sync
- if [ "$SAVE_PARTITIONS" = "1" ]; then
+ if [ "$UPGRADE_OPT_SAVE_PARTITIONS" = "1" ]; then
get_partitions "/dev/$diskdev" bootdisk
#extract the boot sector from the image