From 49328cecdfd182c5a71c6ebb0e0570986323fe64 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Wed, 3 May 2017 08:28:05 +0200 Subject: [PATCH] procd: prepare NAND sysupgrade for making upgraded dynamically linked Use install_bin to copy upgraded with all dependencies. The old name /tmp/upgraded is temporarily retained as a symlink to avoid breaking things. Signed-off-by: Matthias Schiffer --- package/system/procd/files/nand.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/system/procd/files/nand.sh b/package/system/procd/files/nand.sh index b5f86e0301..9c831df3b4 100644 --- a/package/system/procd/files/nand.sh +++ b/package/system/procd/files/nand.sh @@ -333,7 +333,7 @@ nand_upgrade_stage1() { [ "$SAVE_CONFIG" != 1 -a -f "$CONF_TAR" ] && rm $CONF_TAR - ubus call system nandupgrade "{\"path\": \"$path\" }" + ubus call system nandupgrade "{\"prefix\": \"$RAM_ROOT\", \"path\": \"$path\" }" exit 0 } } @@ -370,6 +370,7 @@ nand_do_platform_check() { # $(1): file to be used for upgrade nand_do_upgrade() { echo -n $1 > /tmp/sysupgrade-nand-path - cp /sbin/upgraded /tmp/ + install_bin /sbin/upgraded + ln -s "$RAM_ROOT"/sbin/upgraded /tmp/upgraded nand_upgrade_stage1 } -- 2.30.2