diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2009-05-07 13:27:10 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2009-05-07 13:27:10 +0000 |
| commit | f47863235d78a3ed8a7e073c3e8115fc0ef02aa6 (patch) | |
| tree | 4a13861179990cfd801eed4656f726961be43751 /package/base-files/files/lib | |
| parent | b266035a370ff86336a22ab818dfb12b99ac6deb (diff) | |
| download | master-187ad058-f47863235d78a3ed8a7e073c3e8115fc0ef02aa6.tar.gz master-187ad058-f47863235d78a3ed8a7e073c3e8115fc0ef02aa6.tar.bz2 master-187ad058-f47863235d78a3ed8a7e073c3e8115fc0ef02aa6.zip | |
[PATCH] Add option in sysupgrade to flash gzipped images
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15672 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/base-files/files/lib')
| -rw-r--r-- | package/base-files/files/lib/upgrade/common.sh | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh index d4fb04ba97..7739275bec 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 /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 } |