aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell Senior <russell@personaltelco.net>2019-11-12 15:33:48 -0800
committerDaniel Golle <daniel@makrotopia.org>2019-11-13 18:55:00 +0100
commitb20b997c680e38f999e4608b158ef08718527ca0 (patch)
tree8a7fbf68d4ae7aa32b397f78129e19f06067621c
parent261c746631d2bf311a6b62a6d3bacce6fde90976 (diff)
downloadupstream-b20b997c680e38f999e4608b158ef08718527ca0.tar.gz
upstream-b20b997c680e38f999e4608b158ef08718527ca0.tar.bz2
upstream-b20b997c680e38f999e4608b158ef08718527ca0.zip
base-files: add /usr/share/libubox/jshn.sh to sysupgrade stage2
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>
-rwxr-xr-xpackage/base-files/files/lib/upgrade/stage22
1 files changed, 1 insertions, 1 deletions
diff --git a/package/base-files/files/lib/upgrade/stage2 b/package/base-files/files/lib/upgrade/stage2
index 5d3d46ee80..41a3b2aeb3 100755
--- a/package/base-files/files/lib/upgrade/stage2
+++ b/package/base-files/files/lib/upgrade/stage2
@@ -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