[package] iptables: drop iptables-utils and ip6tables-utils, ship needed symlinks...

[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 139135e..7efb2b4 100755 (executable)
--- a/package/base-files/files/sbin/sysupgrade
+++ b/package/base-files/files/sbin/sysupgrade
@@ -7,9 +7,11 @@ RAMFS_COPY_DATA=""     # extra data files
 export INTERACTIVE=0
 export VERBOSE=1
 export SAVE_CONFIG=1
+export SAVE_OVERLAY=0
 export DELAY=
 export CONF_IMAGE=
-export GZIPED=
+export HELP=0
+
 # parse options
 while [ -n "$1" ]; do 
        case "$1" in
@@ -18,8 +20,9 @@ while [ -n "$1" ]; do
                -v) export VERBOSE="$(($VERBOSE + 1))";;
                -q) export VERBOSE="$(($VERBOSE - 1))";;
                -n) export SAVE_CONFIG=0;;
+               -c) export SAVE_OVERLAY=1;;
                -f) export CONF_IMAGE="$2"; shift;;
-               -g) export GZIPED=1;;
+               -h|--help) export HELP=1; break;;
                -*)
                        echo "Invalid option: $1"
                        exit 1
@@ -35,18 +38,19 @@ export CONF_TAR=/tmp/sysupgrade.tgz
 export ARGV="$*"
 export ARGC="$#"
 
-[ -z "$ARGV" ] && {
+[ -z "$ARGV" -o $HELP -gt 0 ] && {
        cat <<EOF
 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
+       -c           attempt to preserve all changed files in /etc/
+       -n           do not save configuration over reflash
        -q           less verbose
        -v           more verbose
+       -h / --help  display this help
 
 EOF
        exit 1
@@ -54,13 +58,29 @@ EOF
 
 add_uci_conffiles() {
        local file="$1"
-       find /etc/config /etc/passwd /etc/group /etc/dropbear /etc/firewall.user > "$file"
+       ( find $(sed -ne '/^[[:space:]]*$/d; /^#/d; p' \
+               /etc/sysupgrade.conf /lib/upgrade/keep.d/* 2>/dev/null) \
+               -type f 2>/dev/null;
+         opkg list-changed-conffiles ) | sort -u > "$file"
+       return 0
+}
+
+add_overlayfiles() {
+       local file="$1"
+       find /overlay/etc/ -type f | sed \
+               -e 's,^/overlay/,/,' \
+               -e '\,/META_[a-zA-Z0-9]*$,d' \
+               -e '\,/functions.sh$,d' \
+               -e '\,/[^/]*-opkg$,d' \
+       > "$file"
        return 0
 }
 
 # hooks
 sysupgrade_image_check="platform_check_image"
-sysupgrade_init_conffiles="add_uci_conffiles"
+[ $SAVE_OVERLAY = 0 -o ! -d /overlay/etc ] && \
+       sysupgrade_init_conffiles="add_uci_conffiles" || \
+       sysupgrade_init_conffiles="add_overlayfiles"
 
 include /lib/upgrade
 
@@ -91,7 +111,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 +119,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
@@ -114,4 +134,4 @@ if [ -n "$(rootfs_type)" ]; then
        run_ramfs '. /etc/functions.sh; include /lib/upgrade; do_upgrade'
 else
        do_upgrade
-fi
\ No newline at end of file
+fi