domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

base-files: fix sysupgrade 'wget' handling for uclient-fetch

Browse Source 
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
This commit is contained in:
Felix Fietkau
2016-01-25 12:35:21 +00:00
parent e8e4b6eed8
commit b7ab6c66cc
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
package/base-files/files/lib/upgrade/common.sh
View File

@@ -48,13 +48,14 @@ supivot() { # <new_root> <old_root>
run_ramfs() { # <command> [...] run_ramfs() { # <command> [...]
install_bin /bin/busybox /bin/ash /bin/sh /bin/mount /bin/umount \ install_bin /bin/busybox /bin/ash /bin/sh /bin/mount /bin/umount \
/sbin/pivot_root /bin/wget /sbin/reboot /bin/sync /bin/dd \ /sbin/pivot_root /sbin/reboot /bin/sync /bin/dd /bin/grep \
/bin/grep /bin/cp /bin/mv /bin/tar /usr/bin/md5sum "/usr/bin/[" \ /bin/cp /bin/mv /bin/tar /usr/bin/md5sum "/usr/bin/[" /bin/dd \
/bin/dd /bin/vi /bin/ls /bin/cat /usr/bin/awk /usr/bin/hexdump \ /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/sleep /bin/zcat /usr/bin/bzcat /usr/bin/printf /usr/bin/wc \
/bin/cut /usr/bin/printf /bin/sync /bin/mkdir /bin/rmdir \ /bin/cut /usr/bin/printf /bin/sync /bin/mkdir /bin/rmdir \
/bin/rm /usr/bin/basename /bin/kill /bin/chmod /bin/rm /usr/bin/basename /bin/kill /bin/chmod
install_bin /bin/uclient-fetch /bin/wget
install_bin /sbin/mtd install_bin /sbin/mtd
install_bin /sbin/mount_root install_bin /sbin/mount_root
install_bin /sbin/snapshot install_bin /sbin/snapshot