From 3d3f40d6e46c74d6aee04f27bdf74afd8a80ea81 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Mon, 31 Dec 2018 16:24:26 +0100 Subject: [PATCH] base-files: sysupgrade: support additional mtd options Add support for passing additional parameters to mtd called during sysupgrade. It will be required to toggle the "recovery moe" flag supported by recent tp-link boards. Signed-off-by: David Bauer [split code from board support patch; add commit message] Signed-off-by: Mathias Kresin --- package/base-files/files/lib/upgrade/common.sh | 4 ++-- package/base-files/files/sbin/sysupgrade | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh index 4d8392635d..84c716694b 100644 --- a/package/base-files/files/lib/upgrade/common.sh +++ b/package/base-files/files/lib/upgrade/common.sh @@ -282,9 +282,9 @@ indicate_upgrade() { default_do_upgrade() { sync if [ "$SAVE_CONFIG" -eq 1 ]; then - get_image "$1" "$2" | mtd $MTD_CONFIG_ARGS -j "$CONF_TAR" write - "${PART_NAME:-image}" + get_image "$1" "$2" | mtd $MTD_ARGS $MTD_CONFIG_ARGS -j "$CONF_TAR" write - "${PART_NAME:-image}" else - get_image "$1" "$2" | mtd write - "${PART_NAME:-image}" + get_image "$1" "$2" | mtd $MTD_ARGS write - "${PART_NAME:-image}" fi [ $? -ne 0 ] && exit 1 } diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade index 1dc6d4e954..56a410cf9c 100755 --- a/package/base-files/files/sbin/sysupgrade +++ b/package/base-files/files/sbin/sysupgrade @@ -5,6 +5,7 @@ . /usr/share/libubox/jshn.sh # initialize defaults +export MTD_ARGS="" export MTD_CONFIG_ARGS="" export INTERACTIVE=0 export VERBOSE=1