[package] base-files: Remove redundant stopping of watchdog

[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 ffe3433..0cf51cf 100755 (executable)
--- a/package/base-files/files/sbin/sysupgrade
+++ b/package/base-files/files/sbin/sysupgrade
@@ -7,13 +7,17 @@ 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 +38,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 +51,8 @@ EOF
 
 add_uci_conffiles() {
        local file="$1"
-       find /etc/config /etc/passwd /etc/group /etc/dropbear /etc/firewall.* > "$file"
+       find /etc/config /etc/passwd /etc/group /etc/dropbear \
+               /etc/firewall.user /etc/rc.local -type f > "$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 cat)" in
+               # .gz files
+               1f8b) ;;
+               *)
+                       echo "Invalid config file. Please use only .tar.gz files"
+                       exit 1
+               ;;
+       esac
+       get_image "$CONF_IMAGE" "cat" > "$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
@@ -88,5 +107,9 @@ else
 fi
 run_hooks "" $sysupgrade_pre_upgrade
 
-v "Switching to ramdisk..."
-run_ramfs '. /etc/functions.sh; include /lib/upgrade; do_upgrade'
+if [ -n "$(rootfs_type)" ]; then
+       v "Switching to ramdisk..."
+       run_ramfs '. /etc/functions.sh; include /lib/upgrade; do_upgrade'
+else
+       do_upgrade
+fi