base-files: implement -T (--test) sysupgrade parameter to verify image without actual...

SVN-Revision: 37620

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 9c226c40afc9052f49e4556fd23cb845b8548373..dcae920f9acb59b3a52b3091bab074450eeb0e6e 100644 (file)
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/kernel.mk
 include $(INCLUDE_DIR)/version.mk
 
 PKG_NAME:=base-files
 include $(INCLUDE_DIR)/version.mk
 
 PKG_NAME:=base-files

-PKG_RELEASE:=143
+PKG_RELEASE:=144

 
 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
 PKG_BUILD_DEPENDS:=opkg/host
 
 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
 PKG_BUILD_DEPENDS:=opkg/host

diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade
index c507c3bfdfa7bcf643d3d083a617bb470186da2c..49c34b80732b84a32df96cfd71a6b4791cd2fe83 100755 (executable)
--- a/package/base-files/files/sbin/sysupgrade
+++ b/package/base-files/files/sbin/sysupgrade
@@ -15,6 +15,7 @@ export CONF_RESTORE=
 export NEED_IMAGE=
 export HELP=0
 export FORCE=0
 export NEED_IMAGE=
 export HELP=0
 export FORCE=0

+export TEST=0

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


@@ -29,6 +30,7 @@ while [ -n "$1" ]; do
                -r|--restore-backup) export CONF_RESTORE="$2" NEED_IMAGE=1; shift;;
                -f) export CONF_IMAGE="$2"; shift;;
                -F|--force) export FORCE=1;;
                -r|--restore-backup) export CONF_RESTORE="$2" NEED_IMAGE=1; shift;;
                -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"
                -h|--help) export HELP=1; break;;
                -*)
                        echo "Invalid option: $1"


@@ -56,6 +58,8 @@ upgrade-option:
        -i           interactive mode
        -c           attempt to preserve all changed files in /etc/
        -n           do not save configuration over reflash
        -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
        -F | --force
                     Flash image even if image checks fail, this is dangerous!
        -q           less verbose


@@ -171,12 +175,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
        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
 
        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
 run_hooks "" $sysupgrade_pre_upgrade
 
 ubus call system upgrade