X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/39788de8063cc240146d9698e83a6b989d0eaa13..c31e54429a547a36431f6f9c01fd1f16952b37d9:/package/base-files/files/sbin/sysupgrade

diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade
index 4feb1a937..1825cec58 100755
--- a/package/base-files/files/sbin/sysupgrade
+++ b/package/base-files/files/sbin/sysupgrade
@@ -7,13 +7,18 @@ RAMFS_COPY_DATA=""	# extra data files
 export INTERACTIVE=0
 export VERBOSE=1
 export SAVE_CONFIG=1
+export DELAY=
+export CONF_IMAGE=
 
 # parse options
 while [ -n "$1" ]; do 
 	case "$1" in
 		-i) export INTERACTIVE=1;;
+		-d) export DELAY="$2"; shift;;
 		-v) export VERBOSE="$(($VERBOSE + 1))";;
 		-q) export VERBOSE="$(($VERBOSE - 1))";;
+		-n) export SAVE_CONFIG=0;;
+		-f) export CONF_IMAGE="$2"; shift;;
 		-*)
 			echo "Invalid option: $1"
 			exit 1
@@ -34,9 +39,12 @@ export ARGC="$#"
 Usage: $0 [options] <image file or URL>
 
 Options:
-	-i	interactive mode
-	-v	more verbose
-	-q	less verbose
+	-d <delay>   add a delay before rebooting
+	-f <config>  restore configuration from .tar.gz (file or url)
+	-i           interactive mode
+	-n	     do not save configuration over reflash
+	-q           less verbose
+	-v           more verbose
 
 EOF
 	exit 1
@@ -44,7 +52,7 @@ EOF
 
 add_uci_conffiles() {
 	local file="$1"
-	find /etc/config /etc/passwd /etc/group /etc/dropbear > "$file"
+	find /etc/config /etc/passwd /etc/group /etc/dropbear /etc/firewall.user > "$file"
 	return 0
 }
 
@@ -80,7 +88,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