X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Fbase-files%2Ffiles%2Flib%2Fupgrade%2Fcommon.sh;h=9ba9e23e7e8067264df31c7f1f553a5c28d61156;hb=e5b98fff8d75fbe463ad76eb9375637f91225303;hp=7fc31e8b452bb35d71241482f6dfae5befc9d51c;hpb=498cc73e5163eb5b4c910d369a0bfc5f46342f70;p=openwrt-10.03%2F.git

diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh
index 7fc31e8b4..9ba9e23e7 100644
--- 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
+	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
 }
 
@@ -160,6 +163,11 @@ do_upgrade() {
 			jffs2_copy_config
 		fi
 	}
+	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
+	}
 }