aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2015-06-05 14:12:05 +0000
committerJohn Crispin <john@openwrt.org>2015-06-05 14:12:05 +0000
commitf57076956e757269996c2767780f34c43a806fad (patch)
tree31814f99b2a333832142c0c0a9de8783c0a7eded
parent262f6869a280ce7404a95f13a6895ea92a520af9 (diff)
downloadupstream-f57076956e757269996c2767780f34c43a806fad.tar.gz
upstream-f57076956e757269996c2767780f34c43a806fad.tar.bz2
upstream-f57076956e757269996c2767780f34c43a806fad.zip
base-files: default_do_upgrade: accept & forward image extraction command
get_image allows passing 2nd argument that is used in a pipe for extracting firmware from a non-native format. By accepting such command in default_do_upgrade we allow platforms to use this helper for vendor specific images. Signed-off-by: Rafał Miłecki <zajec5@gmail.com> SVN-Revision: 45900
-rw-r--r--package/base-files/files/lib/upgrade/common.sh8
1 files changed, 6 insertions, 2 deletions
diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh
index 8cdabc6bda..189ef69e95 100644
--- a/package/base-files/files/lib/upgrade/common.sh
+++ b/package/base-files/files/lib/upgrade/common.sh
@@ -212,12 +212,16 @@ jffs2_copy_config() {
fi
}
+# Flash firmware to MTD partition
+#
+# $(1): path to image
+# $(2): (optional) pipe command to extract firmware, e.g. dd bs=n skip=m
default_do_upgrade() {
sync
if [ "$SAVE_CONFIG" -eq 1 ]; then
- get_image "$1" | mtd $MTD_CONFIG_ARGS -j "$CONF_TAR" write - "${PART_NAME:-image}"
+ get_image "$1" "$2" | mtd $MTD_CONFIG_ARGS -j "$CONF_TAR" write - "${PART_NAME:-image}"
else
- get_image "$1" | mtd write - "${PART_NAME:-image}"
+ get_image "$1" "$2" | mtd write - "${PART_NAME:-image}"
fi
}