Author: nbd
Date: 2016-01-25 13:35:21 +0100 (Mon, 25 Jan 2016)
New Revision: 48483

Modified:
   trunk/package/base-files/files/lib/upgrade/common.sh
Log:
base-files: fix sysupgrade 'wget' handling for uclient-fetch

change 48451 tried to add support for uclient-fetch by moving
/usr/bin/wget to /bin/wget, but this change kept the symbolic
link to /bin/busybox as install_bin creates links to param 1

the desired fix is to link to uclient-fetch to wget:
  install_bin /bin/uclient-fetch /bin/wget

Signed-off-by: John Clark <[email protected]>

Modified: trunk/package/base-files/files/lib/upgrade/common.sh
===================================================================
--- trunk/package/base-files/files/lib/upgrade/common.sh        2016-01-25 
10:28:29 UTC (rev 48482)
+++ trunk/package/base-files/files/lib/upgrade/common.sh        2016-01-25 
12:35:21 UTC (rev 48483)
@@ -48,13 +48,14 @@
 
 run_ramfs() { # <command> [...]
        install_bin /bin/busybox /bin/ash /bin/sh /bin/mount /bin/umount        
\
-               /sbin/pivot_root /bin/wget /sbin/reboot /bin/sync /bin/dd       
\
-               /bin/grep /bin/cp /bin/mv /bin/tar /usr/bin/md5sum "/usr/bin/[" 
\
-               /bin/dd /bin/vi /bin/ls /bin/cat /usr/bin/awk /usr/bin/hexdump  
\
+               /sbin/pivot_root /sbin/reboot /bin/sync /bin/dd /bin/grep       
\
+               /bin/cp /bin/mv /bin/tar /usr/bin/md5sum "/usr/bin/[" /bin/dd   
\
+               /bin/vi /bin/ls /bin/cat /usr/bin/awk /usr/bin/hexdump          
\
                /bin/sleep /bin/zcat /usr/bin/bzcat /usr/bin/printf /usr/bin/wc 
\
                /bin/cut /usr/bin/printf /bin/sync /bin/mkdir /bin/rmdir        
\
                /bin/rm /usr/bin/basename /bin/kill /bin/chmod
 
+       install_bin /bin/uclient-fetch /bin/wget
        install_bin /sbin/mtd
        install_bin /sbin/mount_root
        install_bin /sbin/snapshot
_______________________________________________
openwrt-commits mailing list
[email protected]
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits

Reply via email to