X-Git-Url: https://git.archive.openwrt.org/?p=openwrt.git;a=blobdiff_plain;f=package%2Fbase-files%2Ffiles%2Fsbin%2Fsysupgrade;h=49c34b80732b84a32df96cfd71a6b4791cd2fe83;hp=ecc5e9a70888163b96ee4cd326fbd60bd23eba11;hb=949bb5b843236432a9401046502ad3065080ae6f;hpb=b1df7537469232b413a301e01843d105b53af15f diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade index ecc5e9a708..49c34b8073 100755 --- a/package/base-files/files/sbin/sysupgrade +++ b/package/base-files/files/sbin/sysupgrade @@ -1,5 +1,5 @@ #!/bin/sh -. /etc/functions.sh +. /lib/functions.sh # initialize defaults RAMFS_COPY_BIN="" # extra programs for temporary ramfs root @@ -7,9 +7,16 @@ 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=0 +export CONF_BACKUP= +export CONF_RESTORE= +export NEED_IMAGE= +export HELP=0 +export FORCE=0 +export TEST=0 + # parse options while [ -n "$1" ]; do case "$1" in @@ -18,8 +25,13 @@ while [ -n "$1" ]; do -v) export VERBOSE="$(($VERBOSE + 1))";; -q) export VERBOSE="$(($VERBOSE - 1))";; -n) export SAVE_CONFIG=0;; + -c) export SAVE_OVERLAY=1;; + -b|--create-backup) export CONF_BACKUP="$2" NEED_IMAGE=1; shift;; + -r|--restore-backup) export CONF_RESTORE="$2" NEED_IMAGE=1; shift;; -f) export CONF_IMAGE="$2"; shift;; - -g) export GZIPED=1;; + -F|--force) export FORCE=1;; + -T|--test) export TEST=1;; + -h|--help) export HELP=1; break;; -*) echo "Invalid option: $1" exit 1 @@ -35,36 +47,81 @@ export CONF_TAR=/tmp/sysupgrade.tgz export ARGV="$*" export ARGC="$#" -[ -z "$ARGV" ] && { +[ -z "$ARGV" -a -z "$NEED_IMAGE" -o $HELP -gt 0 ] && { cat < +Usage: $0 [...] + $0 [-q] [-i] -Options: +upgrade-option: -d add a delay before rebooting -f 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 + -T | --test + Verify image and config .tar.gz but do not actually flash. + -F | --force + Flash image even if image checks fail, this is dangerous! -q less verbose -v more verbose + -h | --help display this help + +backup-command: + -b | --create-backup + create .tar.gz of files specified in sysupgrade.conf + then exit. Does not flash an image. If file is '-', + i.e. stdout, verbosity is set to 0 (i.e. quiet). + -r | --restore-backup + restore a .tar.gz created with sysupgrade -b + then exit. Does not flash an image. If file is '-', + the archive is read from stdin. EOF exit 1 } +[ -n "$ARGV" -a -n "$NEED_IMAGE" ] && { + cat <<-EOF + -b|--create-backup and -r|--restore-backup do not perform a firmware upgrade. + Do not specify both -b|-r and a firmware image. + EOF + exit 1 +} + +# prevent messages from clobbering the tarball when using stdout +[ "$CONF_BACKUP" = "-" ] && export VERBOSE=0 + 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 do_save_conffiles() { + local conf_tar="${1:-$CONF_TAR}" + [ -z "$(rootfs_type)" ] && { echo "Cannot save config while running from ramdisk." ask_bool 0 "Abort" && exit @@ -75,9 +132,20 @@ do_save_conffiles() { v "Saving config files..." [ "$VERBOSE" -gt 1 ] && TAR_V="v" || TAR_V="" - tar c${TAR_V}zf "$CONF_TAR" -T "$CONFFILES" 2>/dev/null + tar c${TAR_V}zf "$conf_tar" -T "$CONFFILES" 2>/dev/null } +if [ -n "$CONF_BACKUP" ]; then + do_save_conffiles "$CONF_BACKUP" + exit $? +fi + +if [ -f "$CONF_RESTORE" ] || [ "$CONF_RESTORE" = "-" ]; then + [ "$VERBOSE" -gt 1 ] && TAR_V="v" || TAR_V="" + tar -C / -x${TAR_V}zf "$CONF_RESTORE" + exit $? +fi + type platform_check_image >/dev/null 2>/dev/null || { echo "Firmware upgrade is not implemented for this platform." exit 1 @@ -85,13 +153,18 @@ type platform_check_image >/dev/null 2>/dev/null || { for check in $sysupgrade_image_check; do ( eval "$check \"\$ARGV\"" ) || { - echo "Image check '$check' failed." - exit 1 + if [ $FORCE -eq 1 ]; then + echo "Image check '$check' failed but --force given - will update anyway!" + break + else + echo "Image check '$check' failed." + exit 1 + fi } 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,19 +172,31 @@ 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 + [ $TEST -eq 1 ] || do_save_conffiles export SAVE_CONFIG=1 else export SAVE_CONFIG=0 fi + +if [ $TEST -eq 1 ]; then + exit 0 +fi + run_hooks "" $sysupgrade_pre_upgrade +ubus call system upgrade +touch /tmp/sysupgrade + +kill_remaining TERM +sleep 3 +kill_remaining KILL + if [ -n "$(rootfs_type)" ]; then v "Switching to ramdisk..." - run_ramfs '. /etc/functions.sh; include /lib/upgrade; do_upgrade' + run_ramfs '. /lib/functions.sh; include /lib/upgrade; do_upgrade' else do_upgrade fi