From b78a266888aad6632ccc9eecb04e615f9ce43868 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Fri, 17 Jul 2020 12:09:57 +0200 Subject: [PATCH] lantiq: move 01_led_migration script to subtargets Split the /etc/uci-defaults/01_led_migration scripts into subtargets as already done for most of the other base-files. While this introduces a minor amount of code duplication, it still is considered an improvement, as device-specific settings are kept together in the subtargets' base-files and the script at hand can be removed entirely for two of the subtargets not needing it. Signed-off-by: Adrian Schmutzler --- .../etc/uci-defaults/01_led_migration | 32 +++++++++++++++++++ .../etc/uci-defaults/01_led_migration | 8 +---- .../etc/uci-defaults/01_led_migration | 28 ++++++++++++++++ 3 files changed, 61 insertions(+), 7 deletions(-) create mode 100644 target/linux/lantiq/xrx200/base-files/etc/uci-defaults/01_led_migration rename target/linux/lantiq/{ => xway}/base-files/etc/uci-defaults/01_led_migration (81%) create mode 100644 target/linux/lantiq/xway_legacy/base-files/etc/uci-defaults/01_led_migration diff --git a/target/linux/lantiq/xrx200/base-files/etc/uci-defaults/01_led_migration b/target/linux/lantiq/xrx200/base-files/etc/uci-defaults/01_led_migration new file mode 100644 index 0000000000..35903d212c --- /dev/null +++ b/target/linux/lantiq/xrx200/base-files/etc/uci-defaults/01_led_migration @@ -0,0 +1,32 @@ +# +# Copyright (C) 2013 OpenWrt.org +# + +. /lib/functions/migrations.sh + +do_internet_led_rename() +{ + config_load system + + [ -n $(config_get led_internet name) ] || return + [ -z $(config_get led_dsl name) ] || return + + uci rename system.led_internet=led_dsl + uci set system.led_dsl.name=dsl + + logger -t led-migration "internet led renamed to dsl" +} + +case "$(board_name)" in +alphanetworks,asl56026|\ +arcadyan,arv7519rw22|\ +arcadyan,vg3503j|\ +avm,fritz7360sl|\ +bt,homehub-v5a) + do_internet_led_rename + ;; +esac + +migrations_apply system + +exit 0 diff --git a/target/linux/lantiq/base-files/etc/uci-defaults/01_led_migration b/target/linux/lantiq/xway/base-files/etc/uci-defaults/01_led_migration similarity index 81% rename from target/linux/lantiq/base-files/etc/uci-defaults/01_led_migration rename to target/linux/lantiq/xway/base-files/etc/uci-defaults/01_led_migration index 961e39ee61..0139ef28b5 100644 --- a/target/linux/lantiq/base-files/etc/uci-defaults/01_led_migration +++ b/target/linux/lantiq/xway/base-files/etc/uci-defaults/01_led_migration @@ -18,17 +18,11 @@ do_internet_led_rename() } case "$(board_name)" in -alphanetworks,asl56026|\ -arcadyan,arv452cqw|\ arcadyan,arv7510pw22|\ -arcadyan,arv7519rw22|\ arcadyan,arv752dpw|\ arcadyan,arv752dpw22|\ -arcadyan,vg3503j|\ -avm,fritz7360sl|\ bt,homehub-v2b|\ -bt,homehub-v3a|\ -bt,homehub-v5a) +bt,homehub-v3a) do_internet_led_rename ;; netgear,dgn3500|\ diff --git a/target/linux/lantiq/xway_legacy/base-files/etc/uci-defaults/01_led_migration b/target/linux/lantiq/xway_legacy/base-files/etc/uci-defaults/01_led_migration new file mode 100644 index 0000000000..18bf6a3f96 --- /dev/null +++ b/target/linux/lantiq/xway_legacy/base-files/etc/uci-defaults/01_led_migration @@ -0,0 +1,28 @@ +# +# Copyright (C) 2013 OpenWrt.org +# + +. /lib/functions/migrations.sh + +do_internet_led_rename() +{ + config_load system + + [ -n $(config_get led_internet name) ] || return + [ -z $(config_get led_dsl name) ] || return + + uci rename system.led_internet=led_dsl + uci set system.led_dsl.name=dsl + + logger -t led-migration "internet led renamed to dsl" +} + +case "$(board_name)" in +arcadyan,arv452cqw) + do_internet_led_rename + ;; +esac + +migrations_apply system + +exit 0