KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

base-files: upgrade: correctly handle nand_do_upgrade argument passed from preupgrade

Browse source 
Fixes: 30f61a34b4 "base-files: always use staged sysupgrade"
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
This commit is contained in:
Matthias Schiffer 2017-07-10 10:35:19 +02:00
parent a89c36b508
commit 7a29e44f90
No known key found for this signature in database
GPG key ID: 16EF3F64CB201D9C
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package/base-files/files/lib/upgrade/common.sh
View file

@ -211,7 +211,7 @@ default_do_upgrade() {
do_upgrade_stage2() { do_upgrade_stage2() {
v "Performing system upgrade..." v "Performing system upgrade..."
if [ -n "$do_upgrade" ]; then if [ -n "$do_upgrade" ]; then
$do_upgrade "$IMAGE" eval "$do_upgrade"
elif type 'platform_do_upgrade' >/dev/null 2>/dev/null; then elif type 'platform_do_upgrade' >/dev/null 2>/dev/null; then
platform_do_upgrade "$IMAGE" platform_do_upgrade "$IMAGE"
else else

2
package/base-files/files/lib/upgrade/nand.sh
View file

@ -289,7 +289,7 @@ nand_do_upgrade() {
# hook; this piece of code handles scripts that haven't been # hook; this piece of code handles scripts that haven't been
# updated. All scripts should gradually move to call nand_do_upgrade # updated. All scripts should gradually move to call nand_do_upgrade
# from platform_do_upgrade instead. # from platform_do_upgrade instead.
export do_upgrade=nand_do_upgrade export do_upgrade="nand_do_upgrade '$1'"
return return
fi fi