[OpenWrt-Devel] [PATCH] base-files: add /usr/share/libubox/jshn.sh to sysupgrade stage2

[Daniel Golle]

Hi Russell,

On Tue, Nov 12, 2019 at 03:33:48PM -0800, Russell Senior wrote:
> 
> 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.

I've applied your patch to master. Do we need to apply it for
openwrt-19.07 as well?

Cheers


Daniel

> 
> 
> Signed-off-by: Russell Senior <russell at personaltelco.net>
> ---
>  package/base-files/files/lib/upgrade/stage2 | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> 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
>  
> -- 
> 2.24.0
> 
> 
> 
> -- 
> Russell Senior, President
> russell at personaltelco.net
> 
> _______________________________________________
> openwrt-devel mailing list
> openwrt-devel at lists.openwrt.org
> https://lists.openwrt.org/mailman/listinfo/openwrt-devel

_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel