[brcm63xx] fix ethernet driver removal

[openwrt.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 7fc31e8..2750018 100644 (file)
--- a/package/base-files/files/lib/upgrade/common.sh
+++ b/package/base-files/files/lib/upgrade/common.sh
@@ -45,7 +45,7 @@ pivot() { # <new_root> <old_root>
 }
 
 run_ramfs() { # <command> [...]
 }
 
 run_ramfs() { # <command> [...]

-       install_bin /bin/busybox /bin/ash /bin/sh /bin/mount /bin/umount /sbin/pivot_root /usr/bin/wget /sbin/reboot /bin/sync /bin/dd /bin/grep /bin/cp /bin/mv /bin/tar /usr/bin/md5sum "/usr/bin/[" /bin/vi /bin/ls /bin/cat
+       install_bin /bin/busybox /bin/ash /bin/sh /bin/mount /bin/umount /sbin/pivot_root /usr/bin/wget /sbin/reboot /bin/sync /bin/dd /bin/grep /bin/cp /bin/mv /bin/tar /usr/bin/md5sum "/usr/bin/[" /bin/vi /bin/ls /bin/cat /usr/bin/awk /usr/bin/hexdump /bin/sleep /bin/zcat

        install_bin /sbin/mtd
        for file in $RAMFS_COPY_BIN; do
                install_bin $file
        install_bin /sbin/mtd
        for file in $RAMFS_COPY_BIN; do
                install_bin $file


@@ -105,10 +105,13 @@ rootfs_type() {
 
 get_image() {
        local from="$1"
 
 get_image() {
        local from="$1"

+       local conc="cat"
+
+       [ "$GZIPED" -eq 1 ] && conc="zcat"

 
        case "$from" in
 
        case "$from" in

-               http://*|ftp://*) wget -O- -q "$from";;
-               *) cat "$from"
+               http://*|ftp://*) wget -O- -q "$from" | "$conc";;
+               *) cat "$from" | "$conc";;

        esac
 }
 
        esac
 }
 


@@ -160,6 +163,11 @@ do_upgrade() {
                        jffs2_copy_config
                fi
        }
                        jffs2_copy_config
                fi
        }

+       v "Upgrade completed"

        [ -n "$DELAY" ] && sleep "$DELAY"
        [ -n "$DELAY" ] && sleep "$DELAY"

-       ask_bool 1 "Reboot" && reboot
+       ask_bool 1 "Reboot" && {
+               v "Rebooting system..."
+               echo b 2>/dev/null >/proc/sysrq-trigger
+               reboot
+       }

 }
 }