[package] sysupgrade: use sysrq-trigger if available

[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 d4fb04ba97e89e343c250cd1a85908a9f40be70a..9ba9e23e7e8067264df31c7f1f553a5c28d61156 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> [...]
-       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
+       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
@@ -105,10 +105,13 @@ rootfs_type() {
 
 get_image() {
        local from="$1"
+       local conc="cat"
+
+       [ $GZIPED -eq 1 ] && conc="zcat"
 
        case "$from" in
-               http://*|ftp://*) wget -O- -q "$from";;
-               *) cat "$from"
+               http://*|ftp://*) wget -O- -q "$from" | "$conc";;
+               *) cat "$from" | "$conc";;
        esac
 }
 
@@ -162,5 +165,9 @@ do_upgrade() {
        }
        v "Upgrade completed"
        [ -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
+       }
 }