[PATCH] Add option in sysupgrade to flash gzipped images

[openwrt.git] / package / base-files / files / sbin / sysupgrade

diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade
index c647462..83cc956 100755 (executable)
--- a/package/base-files/files/sbin/sysupgrade
+++ b/package/base-files/files/sbin/sysupgrade
@@ -8,7 +8,8 @@ export INTERACTIVE=0
 export VERBOSE=1
 export SAVE_CONFIG=1
 export DELAY=
 export VERBOSE=1
 export SAVE_CONFIG=1
 export DELAY=

-
+export CONF_IMAGE=
+export GZIPED=

 # parse options
 while [ -n "$1" ]; do 
        case "$1" in
 # parse options
 while [ -n "$1" ]; do 
        case "$1" in


@@ -16,7 +17,9 @@ while [ -n "$1" ]; do
                -d) export DELAY="$2"; shift;;
                -v) export VERBOSE="$(($VERBOSE + 1))";;
                -q) export VERBOSE="$(($VERBOSE - 1))";;
                -d) export DELAY="$2"; shift;;
                -v) 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;;
+               -g) export GZIPED=1;;

                -*)
                        echo "Invalid option: $1"
                        exit 1
                -*)
                        echo "Invalid option: $1"
                        exit 1


@@ -38,6 +41,8 @@ Usage: $0 [options] <image file or URL>
 
 Options:
        -d <delay>   add a delay before rebooting
 
 Options:
        -d <delay>   add a delay before rebooting

+       -f <config>  restore configuration from .tar.gz (file or url)
+       -g           gziped image

        -i           interactive mode
        -n           do not save configuration over reflash
        -q           less verbose
        -i           interactive mode
        -n           do not save configuration over reflash
        -q           less verbose


@@ -85,7 +90,18 @@ for check in $sysupgrade_image_check; do
        }
 done
 
        }
 done
 

-if ask_bool $SAVE_CONFIG "Keep config files over reflash"; then
+if [ -n "$CONF_IMAGE" ]; then
+       case "$(get_magic_word "$CONF_IMAGE")" in
+               # .gz files
+               1f8b) ;;
+               *)
+                       echo "Invalid config file. Please use only .tar.gz files"
+                       exit 1
+               ;;
+       esac
+       get_image "$CONF_IMAGE" > "$CONF_TAR"
+       export SAVE_CONFIG=1
+elif ask_bool $SAVE_CONFIG "Keep config files over reflash"; then

        do_save_conffiles
        export SAVE_CONFIG=1
 else
        do_save_conffiles
        export SAVE_CONFIG=1
 else