domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

treewide: sysupgrade: pass "save_partitions" option to the "sysupgrade" method

Browse Source 
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>
This commit is contained in:
Rafał Miłecki
2019-08-16 17:02:58 +02:00
parent b534ba9611
commit b6f4cd57e1
9 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
package/base-files/files/lib/upgrade/stage2
View File

@@ -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