aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2017-07-10 10:35:19 +0200
committerMatthias Schiffer <mschiffer@universe-factory.net>2017-07-11 17:19:23 +0200
commit7a29e44f9075b14ca959a730faa7fc6e2e23393f (patch)
tree043b8ae75153c6e3f7cd569de0b67b00161a4344
parenta89c36b50875e61c790113d3adee10621575788a (diff)
downloadupstream-7a29e44f9075b14ca959a730faa7fc6e2e23393f.tar.gz
upstream-7a29e44f9075b14ca959a730faa7fc6e2e23393f.tar.bz2
upstream-7a29e44f9075b14ca959a730faa7fc6e2e23393f.zip
base-files: upgrade: correctly handle nand_do_upgrade argument passed from preupgrade
Fixes: 30f61a34b4cf "base-files: always use staged sysupgrade" Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-rw-r--r--package/base-files/files/lib/upgrade/common.sh2
-rw-r--r--package/base-files/files/lib/upgrade/nand.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh
index fc59bf2323..c8b71015c2 100644
--- a/package/base-files/files/lib/upgrade/common.sh
+++ b/package/base-files/files/lib/upgrade/common.sh
@@ -211,7 +211,7 @@ default_do_upgrade() {
do_upgrade_stage2() {
v "Performing system upgrade..."
if [ -n "$do_upgrade" ]; then
- $do_upgrade "$IMAGE"
+ eval "$do_upgrade"
elif type 'platform_do_upgrade' >/dev/null 2>/dev/null; then
platform_do_upgrade "$IMAGE"
else
diff --git a/package/base-files/files/lib/upgrade/nand.sh b/package/base-files/files/lib/upgrade/nand.sh
index 6b2bdba256..563db4c320 100644
--- a/package/base-files/files/lib/upgrade/nand.sh
+++ b/package/base-files/files/lib/upgrade/nand.sh
@@ -289,7 +289,7 @@ nand_do_upgrade() {
# hook; this piece of code handles scripts that haven't been
# updated. All scripts should gradually move to call nand_do_upgrade
# from platform_do_upgrade instead.
- export do_upgrade=nand_do_upgrade
+ export do_upgrade="nand_do_upgrade '$1'"
return
fi