base-files: fix sysupgrade 'wget' handling for uclient-fetch
authorFelix Fietkau <nbd@openwrt.org>
Mon, 25 Jan 2016 12:35:21 +0000 (12:35 +0000)
committerFelix Fietkau <nbd@openwrt.org>
Mon, 25 Jan 2016 12:35:21 +0000 (12:35 +0000)
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 <inindev@gmail.com>
SVN-Revision: 48483

package/base-files/files/lib/upgrade/common.sh

index adf290c..f894f31 100644 (file)
@@ -48,13 +48,14 @@ supivot() { # <new_root> <old_root>
 
 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