mr/openwrt
2
0
Fork 1
Code Issues 7 Pull Requests Releases Wiki Activity

Add option in sysupgrade to flash gzipped images

Browse Source 
SVN-Revision: 15672
This commit is contained in:
Jo-Philipp Wich 2009-05-07 13:27:10 +00:00
parent b3bb79cb72
commit 71e0f59b80
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
package/base-files/files/lib/upgrade/common.sh
View File

@ -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 /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 install_bin /sbin/mtd
for file in $RAMFS_COPY_BIN; do for file in $RAMFS_COPY_BIN; do
install_bin $file install_bin $file
@ -105,10 +105,13 @@ rootfs_type() {
get_image() { get_image() {
local from="$1" local from="$1"
local conc="cat"
[ $GZIPED -eq 1 ] && conc="zcat"
case "$from" in case "$from" in
http://*|ftp://*) wget -O- -q "$from";; http://*|ftp://*) wget -O- -q "$from" | "$conc";;
*) cat "$from" *) cat "$from" | "$conc";;
esac esac
} }

4
package/base-files/files/sbin/sysupgrade
View File

@ -9,7 +9,7 @@ export VERBOSE=1
export SAVE_CONFIG=1 export SAVE_CONFIG=1
export DELAY= export DELAY=
export CONF_IMAGE= export CONF_IMAGE=
export GZIPED=
# parse options # parse options
while [ -n "$1" ]; do while [ -n "$1" ]; do
case "$1" in case "$1" in
@ -19,6 +19,7 @@ while [ -n "$1" ]; do
-q) export VERBOSE="$(($VERBOSE - 1))";; -q) export VERBOSE="$(($VERBOSE - 1))";;
-n) export SAVE_CONFIG=0;; -n) export SAVE_CONFIG=0;;
-f) export CONF_IMAGE="$2"; shift;; -f) export CONF_IMAGE="$2"; shift;;
-g) export GZIPED=1;;
-*) -*)
echo "Invalid option: $1" echo "Invalid option: $1"
exit 1 exit 1
@ -41,6 +42,7 @@ Usage: $0 [options] <image file or URL>
Options: Options:
-d <delay> add a delay before rebooting -d <delay> add a delay before rebooting
-f <config> restore configuration from .tar.gz (file or url) -f <config> restore configuration from .tar.gz (file or url)
-g gziped image
-i interactive mode -i interactive mode
-n do not save configuration over reflash -n do not save configuration over reflash
-q less verbose -q less verbose