diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2012-08-12 13:20:27 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2012-08-12 13:20:27 +0000 |
| commit | 70aaa116eb0b340e44f75e94e2159d41d8b2ecde (patch) | |
| tree | 4248b2f6e308234a8c52151af7315bf840a86b59 | |
| parent | 958a9c96cd631d9eb0cd7e8575d62b7d9fdc32fb (diff) | |
| download | upstream-70aaa116eb0b340e44f75e94e2159d41d8b2ecde.tar.gz upstream-70aaa116eb0b340e44f75e94e2159d41d8b2ecde.tar.bz2 upstream-70aaa116eb0b340e44f75e94e2159d41d8b2ecde.zip | |
base-files: provide a sysupgrade -r (--restore-backup) option as convenience wrapper for tar -C / -x(v)zf
SVN-Revision: 33147
| -rw-r--r-- | package/base-files/Makefile | 2 | ||||
| -rwxr-xr-x | package/base-files/files/sbin/sysupgrade | 12 |
2 files changed, 13 insertions, 1 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 441d394288..50ad7d4a0c 100644 --- 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 -PKG_RELEASE:=114 +PKG_RELEASE:=115 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 62a4012a32..802848ade7 100755 --- a/package/base-files/files/sbin/sysupgrade +++ b/package/base-files/files/sbin/sysupgrade @@ -11,6 +11,7 @@ export SAVE_OVERLAY=0 export DELAY= export CONF_IMAGE= export CONF_BACKUP= +export CONF_RESTORE= export HELP=0 export FORCE=0 @@ -24,6 +25,7 @@ while [ -n "$1" ]; do -n) export SAVE_CONFIG=0;; -c) export SAVE_OVERLAY=1;; -b|--create-backup) export CONF_BACKUP="$2"; shift;; + -r|--restore-backup) export CONF_RESTORE="$2"; shift;; -f) export CONF_IMAGE="$2"; shift;; -F|--force) export FORCE=1;; -h|--help) export HELP=1; break;; @@ -55,6 +57,10 @@ Options: 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 <file> + restore a .tar.gz created with sysupgrade -b + then exit. Does not flash an image. If file is '-', + the archive is read from stdin. -n do not save configuration over reflash -F / --force Flash image even if image checks fail, this is dangerous! @@ -126,6 +132,12 @@ if [ -n "$CONF_BACKUP" ]; then 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 |