X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/d8ef8d0af9de96b8768d8f10028bc12e7d7ecb90..45ff7559b1a29c1be0ac06dae2ba3ad860fa6634:/package/base-files/files/sbin/sysupgrade?ds=sidebyside

diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade
index c64746234..83cc95682 100755
--- 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 CONF_IMAGE=
+export GZIPED=
 # 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))";;
-		-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
@@ -38,6 +41,8 @@ Usage: $0 [options] <image file or URL>
 
 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
@@ -85,7 +90,18 @@ for check in $sysupgrade_image_check; do
 	}
 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