base-files: implement -l (--list-backup) sysupgrade parameter to list the files that...

[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 c507c3b..eb5ab03 100755 (executable)
--- a/package/base-files/files/sbin/sysupgrade
+++ b/package/base-files/files/sbin/sysupgrade
@@ -10,11 +10,13 @@ export SAVE_CONFIG=1
 export SAVE_OVERLAY=0
 export DELAY=
 export CONF_IMAGE=
+export CONF_BACKUP_LIST=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 
@@ -27,8 +29,10 @@ while [ -n "$1" ]; do
                -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;;
+               -l|--list-backup) export CONF_BACKUP_LIST=1; break;;
                -f) export CONF_IMAGE="$2"; shift;;
                -F|--force) export FORCE=1;;
+               -T|--test) export TEST=1;;
                -h|--help) export HELP=1; break;;
                -*)
                        echo "Invalid option: $1"
@@ -56,6 +60,8 @@ upgrade-option:
        -i           interactive mode
        -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
@@ -71,6 +77,9 @@ backup-command:
                     restore a .tar.gz created with sysupgrade -b
                     then exit. Does not flash an image. If file is '-',
                     the archive is read from stdin.
+       -l | --list-backup
+                    list the files that would be backed up when calling
+                    sysupgrade -b. Does not create a backup file.
 
 EOF
        exit 1
@@ -129,14 +138,28 @@ 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
+
+       rm -f "$CONFFILES"
 }
 
+if [ $CONF_BACKUP_LIST -eq 1 ]; then
+       add_uci_conffiles "$CONFFILES"
+       cat "$CONFFILES"
+       rm -f "$CONFFILES"
+       exit 0
+fi
+
 if [ -n "$CONF_BACKUP" ]; then
        do_save_conffiles "$CONF_BACKUP"
        exit $?
 fi
 
-if [ -f "$CONF_RESTORE" ] || [ "$CONF_RESTORE" = "-" ]; then
+if [ -n "$CONF_RESTORE" ]; then
+       if [ "$CONF_RESTORE" != "-" ] && [ ! -f "$CONF_RESTORE" ]; then
+               echo "Backup archive '$CONF_RESTORE' not found."
+               exit 1
+       fi
+
        [ "$VERBOSE" -gt 1 ] && TAR_V="v" || TAR_V=""
        tar -C / -x${TAR_V}zf "$CONF_RESTORE"
        exit $?
@@ -171,12 +194,16 @@ if [ -n "$CONF_IMAGE" ]; then
        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