procd: prepare NAND sysupgrade for making upgraded dynamically linked
authorMatthias Schiffer <mschiffer@universe-factory.net>
Wed, 3 May 2017 06:28:05 +0000 (08:28 +0200)
committerMatthias Schiffer <mschiffer@universe-factory.net>
Mon, 29 May 2017 21:08:32 +0000 (23:08 +0200)
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 <mschiffer@universe-factory.net>
package/system/procd/files/nand.sh

index b5f86e0301274b895400c5aae816929298297fcc..9c831df3b4247d12d7e882da349eafea5894fabc 100644 (file)
@@ -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
 }