[ar7] let 802.1q tagged frames go in and out from cpmac (#6730)

[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 ecc5e9a..0cf51cf 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 SAVE_CONFIG=1
 export DELAY=
 export CONF_IMAGE=

-export GZIPED=0

 # parse options
 while [ -n "$1" ]; do 
        case "$1" in
 # 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;;
                -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
                -*)
                        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)
 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
        -i           interactive mode
        -n           do not save configuration over reflash
        -q           less verbose


@@ -54,7 +51,8 @@ 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 -type f > "$file"

        return 0
 }
 
        return 0
 }
 


@@ -91,7 +89,7 @@ for check in $sysupgrade_image_check; do
 done
 
 if [ -n "$CONF_IMAGE" ]; then
 done
 
 if [ -n "$CONF_IMAGE" ]; then

-       case "$(get_magic_word "$CONF_IMAGE")" in
+       case "$(get_magic_word $CONF_IMAGE cat)" in

                # .gz files
                1f8b) ;;
                *)
                # .gz files
                1f8b) ;;
                *)


@@ -99,7 +97,7 @@ if [ -n "$CONF_IMAGE" ]; then
                        exit 1
                ;;
        esac
                        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
        export SAVE_CONFIG=1
 elif ask_bool $SAVE_CONFIG "Keep config files over reflash"; then
        do_save_conffiles