[package] kmod-libertas needs kmod-lib80211 to load

[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 2230e5b..a582d43 100755 (executable)
--- a/package/base-files/files/sbin/sysupgrade
+++ b/package/base-files/files/sbin/sysupgrade
@@ -8,7 +8,7 @@ export INTERACTIVE=0
 export VERBOSE=1
 export SAVE_CONFIG=1
 export DELAY=
 export VERBOSE=1
 export SAVE_CONFIG=1
 export DELAY=

-
+export CONF_IMAGE=

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


@@ -17,6 +17,7 @@ while [ -n "$1" ]; do
                -v) export VERBOSE="$(($VERBOSE + 1))";;
                -q) export VERBOSE="$(($VERBOSE - 1))";;
                -n) export SAVE_CONFIG=0;;
                -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
                -*)
                        echo "Invalid option: $1"
                        exit 1


@@ -38,6 +39,7 @@ 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)

        -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


@@ -49,7 +51,7 @@ EOF
 
 add_uci_conffiles() {
        local file="$1"
 
 add_uci_conffiles() {
        local file="$1"

-       find /etc/config /etc/passwd /etc/group /etc/dropbear /etc/firewall.user > "$file"
+       find /etc/config /etc/passwd /etc/group /etc/dropbear /etc/firewall.user /etc/rc.local > "$file"

        return 0
 }
 
        return 0
 }
 


@@ -85,7 +87,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 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
        do_save_conffiles
        export SAVE_CONFIG=1
 else


@@ -93,5 +106,9 @@ else
 fi
 run_hooks "" $sysupgrade_pre_upgrade
 
 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