add a defconfig for wrt160nl which contains switch settings

[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 83cc956..a582d43 100755 (executable)
--- a/package/base-files/files/sbin/sysupgrade
+++ b/package/base-files/files/sbin/sysupgrade
@@ -9,7 +9,6 @@ export VERBOSE=1
 export SAVE_CONFIG=1
 export DELAY=
 export CONF_IMAGE=
-export GZIPED=
 # parse options
 while [ -n "$1" ]; do 
        case "$1" in
@@ -19,7 +18,6 @@ while [ -n "$1" ]; do
                -q) export VERBOSE="$(($VERBOSE - 1))";;
                -n) export SAVE_CONFIG=0;;
                -f) export CONF_IMAGE="$2"; shift;;
-               -g) export GZIPED=1;;
                -*)
                        echo "Invalid option: $1"
                        exit 1
@@ -42,7 +40,6 @@ 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
@@ -54,7 +51,7 @@ EOF
 
 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
 }
 
@@ -91,7 +88,7 @@ for check in $sysupgrade_image_check; do
 done
 
 if [ -n "$CONF_IMAGE" ]; then
-       case "$(get_magic_word "$CONF_IMAGE")" in
+       case "$(get_magic_word $CONF_IMAGE cat)" in
                # .gz files
                1f8b) ;;
                *)
@@ -99,7 +96,7 @@ if [ -n "$CONF_IMAGE" ]; then
                        exit 1
                ;;
        esac
-       get_image "$CONF_IMAGE" > "$CONF_TAR"
+       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
@@ -109,5 +106,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