[openwrt/openwrt] octeon: use shared function for platform_copy_config()
LEDE Commits
lede-commits at lists.infradead.org
Sun May 16 16:01:48 PDT 2021
adrian pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/4508b12b088a1d54baeabea117fcd7bb3dd5ed1f
commit 4508b12b088a1d54baeabea117fcd7bb3dd5ed1f
Author: Adrian Schmutzler <freifunk at adrianschmutzler.de>
AuthorDate: Sun May 16 23:58:59 2021 +0200
octeon: use shared function for platform_copy_config()
This reduces redundant instructions.
The solution is inspired by a different implemention of
Roman Kuzmitskii.
Signed-off-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
---
.../octeon/base-files/lib/upgrade/platform.sh | 24 ++++++++++++----------
1 file changed, 13 insertions(+), 11 deletions(-)
diff --git a/target/linux/octeon/base-files/lib/upgrade/platform.sh b/target/linux/octeon/base-files/lib/upgrade/platform.sh
index 255699bb31..84533d642a 100755
--- a/target/linux/octeon/base-files/lib/upgrade/platform.sh
+++ b/target/linux/octeon/base-files/lib/upgrade/platform.sh
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2014 OpenWrt.org
+# Copyright (C) 2021 OpenWrt.org
#
platform_get_rootfs() {
@@ -17,23 +17,25 @@ platform_get_rootfs() {
fi
}
+platform_copy_config_helper() {
+ local device=$1
+
+ mount -t vfat "$device" /mnt
+ cp -af "$UPGRADE_BACKUP" "/mnt/$BACKUP_FILE"
+ umount /mnt
+}
+
platform_copy_config() {
case "$(board_name)" in
erlite)
- mount -t vfat /dev/sda1 /mnt
- cp -af "$UPGRADE_BACKUP" "/mnt/$BACKUP_FILE"
- umount /mnt
+ platform_copy_config_helper /dev/sda1
;;
itus,shield-router)
- mount -t vfat /dev/mmcblk1p1 /mnt
- cp -af "$UPGRADE_BACKUP" "/mnt/$BACKUP_FILE"
- umount /mnt
+ platform_copy_config_helper /dev/mmcblk1p1
;;
- ubnt,edgerouter-4 | \
+ ubnt,edgerouter-4|\
ubnt,edgerouter-6p)
- mount -t vfat /dev/mmcblk0p1 /mnt
- cp -af "$UPGRADE_BACKUP" "/mnt/$BACKUP_FILE"
- umount /mnt
+ platform_copy_config_helper /dev/mmcblk0p1
;;
esac
}
More information about the lede-commits
mailing list