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)

diff --git a/package/base-files/files/lib/upgrade/stage2 b/package/base-files/files/lib/upgrade/stage2
index 4e5837af833dd7217ca8d9946584a02751eb0138..ff2a9aee057255cd06ac25eceb2001500618757b 100755 (executable)
--- 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
 
 

diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade
index 15514159b35fd22f4feb2fdec4e69d48815d8d28..c27c1fbc47766619b19a1ac813e040b3cdffa56a 100755 (executable)
--- a/package/base-files/files/sbin/sysupgrade
+++ b/package/base-files/files/sbin/sysupgrade
@@ -351,12 +351,6 @@ if [ $TEST -eq 1 ]; then
        exit 0
 fi
 
-if [ $SAVE_PARTITIONS -eq 0 ]; then
-       touch /tmp/sysupgrade.always.overwrite.bootdisk.partmap
-else
-       rm -f /tmp/sysupgrade.always.overwrite.bootdisk.partmap
-fi
-
 install_bin /sbin/upgraded
 v "Commencing upgrade. Closing all shell sessions."
 
@@ -371,7 +365,8 @@ else
                \"path\": $(json_string "$IMAGE"),
                \"command\": $(json_string "$COMMAND"),
                \"options\": {
-                       \"save_config\": $SAVE_CONFIG
+                       \"save_config\": $SAVE_CONFIG,
+                       \"save_partitions\": $SAVE_PARTITIONS
                }
        }"
 fi

diff --git a/target/linux/sunxi/base-files/lib/upgrade/platform.sh b/target/linux/sunxi/base-files/lib/upgrade/platform.sh
index abe910b154c7de928687abde7707ee58da8d59d5..c8b0175fd58c56fadac29db3462e0e04df37274c 100644 (file)
--- a/target/linux/sunxi/base-files/lib/upgrade/platform.sh
+++ b/target/linux/sunxi/base-files/lib/upgrade/platform.sh
@@ -45,7 +45,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

diff --git a/target/linux/x86/base-files/lib/upgrade/platform.sh b/target/linux/x86/base-files/lib/upgrade/platform.sh
index 439ba8f5125d97932248ff966340165a84e1b24a..162dbaf3aaaa00539851856b67e8e6b1a5eb8b08 100644 (file)
--- 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