[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 1825cec..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=

-

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


@@ -52,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
 }
 


@@ -89,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) ;;
                *)


@@ -97,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


@@ -107,5 +107,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