X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/d8ef8d0af9de96b8768d8f10028bc12e7d7ecb90..271da7f4e93492f377c0fcf25def4591d60b9fbc:/package/base-files/files/sbin/sysupgrade diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade index c64746234..3d76bb3a0 100755 --- a/package/base-files/files/sbin/sysupgrade +++ b/package/base-files/files/sbin/sysupgrade @@ -7,7 +7,9 @@ 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= # parse options while [ -n "$1" ]; do @@ -16,7 +18,9 @@ while [ -n "$1" ]; do -d) export DELAY="$2"; shift;; -v) export VERBOSE="$(($VERBOSE + 1))";; -q) export VERBOSE="$(($VERBOSE - 1))";; - -n) export SAVE_CONFIG=0 + -n) export SAVE_CONFIG=0;; + -c) export SAVE_OVERLAY=1;; + -f) export CONF_IMAGE="$2"; shift;; -*) echo "Invalid option: $1" exit 1 @@ -38,8 +42,10 @@ Usage: $0 [options] Options: -d add a delay before rebooting + -f restore configuration from .tar.gz (file or url) -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 @@ -49,13 +55,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 @@ -85,7 +107,18 @@ for check in $sysupgrade_image_check; do } 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 @@ -93,5 +126,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