From: David Bauer Date: Mon, 31 Dec 2018 15:24:26 +0000 (+0100) Subject: base-files: sysupgrade: support additional mtd options X-Git-Tag: v19.07.0-rc1~1474 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=28cd2caa35ba9d3749fb0e792dfa9d9aeacc61fa;p=oweals%2Fopenwrt.git 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 --- diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh index 8ee07494a3..b3a29fb32e 100644 --- a/package/base-files/files/lib/upgrade/common.sh +++ b/package/base-files/files/lib/upgrade/common.sh @@ -223,9 +223,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 58b613b5a0..54d7a64b48 100755 --- a/package/base-files/files/sbin/sysupgrade +++ b/package/base-files/files/sbin/sysupgrade @@ -4,6 +4,7 @@ . /lib/functions/system.sh # initialize defaults +export MTD_ARGS="" export MTD_CONFIG_ARGS="" export INTERACTIVE=0 export VERBOSE=1