[package] base-files: fix preinit code typos

[openwrt/svn-archive/archive.git] / package / base-files / files / lib / upgrade / common.sh

diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh
index 2c392496a0981763ebfa31dadbef00dbd3ff16d4..3beb6484d851f748debc1882d23123477e7d1a24 100644 (file)
--- a/package/base-files/files/lib/upgrade/common.sh
+++ b/package/base-files/files/lib/upgrade/common.sh
@@ -21,6 +21,9 @@ install_bin() { # <file> [ <symlink> ... ]
        files=$1
        [ -x "$src" ] && files="$src $(libs $src)"
        install_file $files
+       [ -e /lib/ld-linux.so.3 ] && {
+               install_file /lib/ld-linux.so.3
+       }
        shift
        for link in "$@"; do {
                dest="$RAM_ROOT/$link"
@@ -105,26 +108,26 @@ rootfs_type() {
 
 get_image() { # <source> [ <command> ]
        local from="$1"
-       local cmd="$2"
-       local conc
-
-       if [ -z "$cmd" ]; then
-               case "$from" in
-                       http://*|ftp://*) cmd="wget -O- -q";;
-                       *) cmd="cat";;
-               esac
+       local conc="$2"
+       local cmd
+
+       case "$from" in
+               http://*|ftp://*) cmd="wget -O- -q";;
+               *) cmd="cat";;
+       esac
+       if [ -z "$conc" ]; then
                local magic="$(eval $cmd $from | dd bs=2 count=1 2>/dev/null | hexdump -n 2 -e '1/1 "%02x"')"
                case "$magic" in
-                       1f8b) conc="| zcat";;
-                       425a) conc="| bzcat";;
+                       1f8b) conc="zcat";;
+                       425a) conc="bzcat";;
                esac
        fi
 
-       eval "$cmd $from $conc"
+       eval "$cmd $from ${conc:+| $conc}"
 }
 
 get_magic_word() {
-       get_image "$1" | dd bs=2 count=1 2>/dev/null | hexdump -n 2 -e '1/1 "%02x"'
+       get_image "$@" | dd bs=2 count=1 2>/dev/null | hexdump -v -n 2 -e '1/1 "%02x"'
 }
 
 refresh_mtd_partitions() {