mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-12-25 06:14:37 +02:00
[package] base-files: Fix sysupgrade .tar.gz configuration restoring
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16626 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
e2e0b921de
commit
75b6ff7031
@ -105,26 +105,26 @@ rootfs_type() {
|
||||
|
||||
get_image() { # <source> [ <command> ]
|
||||
local from="$1"
|
||||
local cmd="$2"
|
||||
local conc
|
||||
local conc="$2"
|
||||
local cmd
|
||||
|
||||
if [ -z "$cmd" ]; then
|
||||
case "$from" in
|
||||
http://*|ftp://*) cmd="wget -O- -q";;
|
||||
*) cmd="cat";;
|
||||
esac
|
||||
case "$from" in
|
||||
http://*|ftp://*) cmd="wget -O- -q";;
|
||||
*) cmd="cat";;
|
||||
esac
|
||||
if [ -z "$conc" ]; then
|
||||
local magic="$(eval $cmd $from | dd bs=2 count=1 2>/dev/null | hexdump -n 2 -e '1/1 "%02x"')"
|
||||
case "$magic" in
|
||||
1f8b) conc="| zcat";;
|
||||
425a) conc="| bzcat";;
|
||||
1f8b) conc="zcat";;
|
||||
425a) conc="bzcat";;
|
||||
esac
|
||||
fi
|
||||
|
||||
eval "$cmd $from $conc"
|
||||
eval "$cmd $from ${conc:+| $conc}"
|
||||
}
|
||||
|
||||
get_magic_word() {
|
||||
get_image "$1" | dd bs=2 count=1 2>/dev/null | hexdump -n 2 -e '1/1 "%02x"'
|
||||
get_image "$@" | dd bs=2 count=1 2>/dev/null | hexdump -n 2 -e '1/1 "%02x"'
|
||||
}
|
||||
|
||||
refresh_mtd_partitions() {
|
||||
|
@ -88,7 +88,7 @@ for check in $sysupgrade_image_check; do
|
||||
done
|
||||
|
||||
if [ -n "$CONF_IMAGE" ]; then
|
||||
case "$(get_magic_word "$CONF_IMAGE")" in
|
||||
case "$(get_magic_word $CONF_IMAGE cat)" in
|
||||
# .gz files
|
||||
1f8b) ;;
|
||||
*)
|
||||
|
Loading…
Reference in New Issue
Block a user