base-files: add /usr/share/libubox/jshn.sh to sysupgrade stage2
authorRussell Senior <russell@personaltelco.net>
Tue, 12 Nov 2019 23:33:48 +0000 (15:33 -0800)
committerRISCi_ATOM <bob@bobcall.me>
Mon, 18 Nov 2019 15:24:30 +0000 (10:24 -0500)
Discovered recent changes had broken sysupgrade for ar71xx mikrotik
rb-493g, traced the problem to missing /usr/share/libubox/jshn.sh after
switching to tmpfs.

Signed-off-by: Russell Senior <russell@personaltelco.net>
package/base-files/files/lib/upgrade/stage2

index 5d3d46ee8091001d4541829eae25f465979edb84..41a3b2aeb383c7ada3fc4575c63bce35b6edda6d 100755 (executable)
@@ -48,7 +48,7 @@ switch_to_ramfs() {
                local file="$(which "$binary" 2>/dev/null)"
                [ -n "$file" ] && install_bin "$file"
        done
-       install_file /etc/resolv.conf /lib/*.sh /lib/functions/*.sh /lib/upgrade/*.sh /lib/upgrade/do_stage2 $RAMFS_COPY_DATA
+       install_file /etc/resolv.conf /lib/*.sh /lib/functions/*.sh /lib/upgrade/*.sh /lib/upgrade/do_stage2 /usr/share/libubox/jshn.sh $RAMFS_COPY_DATA
 
        [ -L "/lib64" ] && ln -s /lib $RAM_ROOT/lib64