gwrx/openwrt
1
0
Fork 0
Code Issues Pull Requests 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
Show Stats 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" export IMAGE="$1"
COMMAND="$2" COMMAND="$2"
export SAVE_PARTITIONS=1
export INTERACTIVE=0 export INTERACTIVE=0
export VERBOSE=1 export VERBOSE=1
export CONFFILES=/tmp/sysupgrade.conffiles 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_BIN= # extra programs for temporary ramfs root
RAMFS_COPY_DATA= # extra data files RAMFS_COPY_DATA= # extra data files
[ -f /tmp/sysupgrade.always.overwrite.bootdisk.partmap ] && export SAVE_PARTITIONS=0
include /lib/upgrade include /lib/upgrade

9
package/base-files/files/sbin/sysupgrade
View File

@ -351,12 +351,6 @@ if [ $TEST -eq 1 ]; then
exit 0 exit 0
fi 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 install_bin /sbin/upgraded
v "Commencing upgrade. Closing all shell sessions." v "Commencing upgrade. Closing all shell sessions."
@ -371,7 +365,8 @@ else
\"path\": $(json_string "$IMAGE"), \"path\": $(json_string "$IMAGE"),
\"command\": $(json_string "$COMMAND"), \"command\": $(json_string "$COMMAND"),
\"options\": { \"options\": {
\"save_config\": $SAVE_CONFIG \"save_config\": $SAVE_CONFIG,
\"save_partitions\": $SAVE_PARTITIONS
} }
}" }"
fi fi

2
target/linux/apm821xx/base-files/lib/upgrade/wdbook.sh
View File

@ -43,7 +43,7 @@ mbl_do_upgrade() {
sync sync
if [ "$SAVE_PARTITIONS" = "1" ]; then if [ "$UPGRADE_OPT_SAVE_PARTITIONS" = "1" ]; then
get_partitions "/dev/$diskdev" bootdisk get_partitions "/dev/$diskdev" bootdisk
#extract the boot sector from the image #extract the boot sector from the image

2
target/linux/brcm2708/base-files/lib/upgrade/platform.sh
View File

@ -45,7 +45,7 @@ platform_do_upgrade() {
sync sync
if [ "$SAVE_PARTITIONS" = "1" ]; then if [ "$UPGRADE_OPT_SAVE_PARTITIONS" = "1" ]; then
get_partitions "/dev/$diskdev" bootdisk get_partitions "/dev/$diskdev" bootdisk
#extract the boot sector from the image #extract the boot sector from the image

2
target/linux/mvebu/base-files/lib/upgrade/sdcard.sh
View File

@ -49,7 +49,7 @@ platform_do_upgrade_sdcard() {
sync sync
if [ "$SAVE_PARTITIONS" = "1" ]; then if [ "$UPGRADE_OPT_SAVE_PARTITIONS" = "1" ]; then
get_partitions "/dev/$diskdev" bootdisk get_partitions "/dev/$diskdev" bootdisk
#extract the boot sector from the image #extract the boot sector from the image

2
target/linux/omap/base-files/lib/upgrade/platform.sh
View File

@ -45,7 +45,7 @@ platform_do_upgrade() {
sync sync
if [ "$SAVE_PARTITIONS" = "1" ]; then if [ "$UPGRADE_OPT_SAVE_PARTITIONS" = "1" ]; then
get_partitions "/dev/$diskdev" bootdisk get_partitions "/dev/$diskdev" bootdisk
#extract the boot sector from the image #extract the boot sector from the image

2
target/linux/sunxi/base-files/lib/upgrade/platform.sh
View File

@ -45,7 +45,7 @@ platform_do_upgrade() {
sync sync
if [ "$SAVE_PARTITIONS" = "1" ]; then if [ "$UPGRADE_OPT_SAVE_PARTITIONS" = "1" ]; then
get_partitions "/dev/$diskdev" bootdisk get_partitions "/dev/$diskdev" bootdisk
#extract the boot sector from the image #extract the boot sector from the image

2
target/linux/tegra/base-files/lib/upgrade/platform.sh
View File

@ -62,7 +62,7 @@ platform_do_upgrade() {
sync sync
if [ "$SAVE_PARTITIONS" = "1" ]; then if [ "$UPGRADE_OPT_SAVE_PARTITIONS" = "1" ]; then
get_partitions "/dev/$diskdev" bootdisk get_partitions "/dev/$diskdev" bootdisk
#extract the boot sector from the image #extract the boot sector from the image

2
target/linux/x86/base-files/lib/upgrade/platform.sh
View File

@ -54,7 +54,7 @@ platform_do_upgrade() {
sync sync
if [ "$SAVE_PARTITIONS" = "1" ]; then if [ "$UPGRADE_OPT_SAVE_PARTITIONS" = "1" ]; then
get_partitions "/dev/$diskdev" bootdisk get_partitions "/dev/$diskdev" bootdisk
#extract the boot sector from the image #extract the boot sector from the image