0030-base-files-upgrade-correctly-handle-nand_do_upgrade-argument-passed-from-preupgrade.patch 1.5 KB

123456789101112131415161718192021222324252627282930313233
  1. From: Matthias Schiffer <mschiffer@universe-factory.net>
  2. Date: Mon, 10 Jul 2017 10:35:19 +0200
  3. Subject: base-files: upgrade: correctly handle nand_do_upgrade argument passed from preupgrade
  4. Fixes: 30f61a34b4cf "base-files: always use staged sysupgrade"
  5. Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
  6. diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh
  7. index fc59bf2323498d332159b00eb7ab443bfe6b147e..c8b71015c2e44210696a4e28a5b7babbd0233184 100644
  8. --- a/package/base-files/files/lib/upgrade/common.sh
  9. +++ b/package/base-files/files/lib/upgrade/common.sh
  10. @@ -211,7 +211,7 @@ default_do_upgrade() {
  11. do_upgrade_stage2() {
  12. v "Performing system upgrade..."
  13. if [ -n "$do_upgrade" ]; then
  14. - $do_upgrade "$IMAGE"
  15. + eval "$do_upgrade"
  16. elif type 'platform_do_upgrade' >/dev/null 2>/dev/null; then
  17. platform_do_upgrade "$IMAGE"
  18. else
  19. diff --git a/package/base-files/files/lib/upgrade/nand.sh b/package/base-files/files/lib/upgrade/nand.sh
  20. index 1e69c8f9657b39adf2a2c33bd9bac9303bcbc3d7..72f0fe0e10312e74ce085ad53f0adceb921fd013 100644
  21. --- a/package/base-files/files/lib/upgrade/nand.sh
  22. +++ b/package/base-files/files/lib/upgrade/nand.sh
  23. @@ -289,7 +289,7 @@ nand_do_upgrade() {
  24. # hook; this piece of code handles scripts that haven't been
  25. # updated. All scripts should gradually move to call nand_do_upgrade
  26. # from platform_do_upgrade instead.
  27. - export do_upgrade=nand_do_upgrade
  28. + export do_upgrade="nand_do_upgrade '$1'"
  29. return
  30. fi