From 4508b12b088a1d54baeabea117fcd7bb3dd5ed1f Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Sun, 16 May 2021 23:58:59 +0200 Subject: [PATCH] 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 --- .../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 255699bb319..84533d642a1 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 } -- 2.30.2