From: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Date: Tue, 17 Dec 2019 00:30:22 +0000 (+0100)
Subject: lantiq: use shared code for LED migration
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=f943d846154c5297228511a83f1e13edba039e57;p=openwrt%2Fstaging%2Fblocktrron.git

lantiq: use shared code for LED migration

Shared base-files package contains functions for LED migration that
are already used by several targets. Apply those also to lantiq and
drop the (redundant) local code.

While at it, reorder board names in file.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
---

diff --git a/target/linux/lantiq/base-files/etc/uci-defaults/01_led_migration b/target/linux/lantiq/base-files/etc/uci-defaults/01_led_migration
index dc594e35e9..b1e7be6bd2 100644
--- a/target/linux/lantiq/base-files/etc/uci-defaults/01_led_migration
+++ b/target/linux/lantiq/base-files/etc/uci-defaults/01_led_migration
@@ -3,37 +3,7 @@
 # Copyright (C) 2013 OpenWrt.org
 #
 
-LED_OPTIONS_CHANGED=0
-
-. /lib/functions.sh
-
-do_led_update_sysfs()
-{
-	local cfg=$1; shift
-	local tuples="$@"
-	local sysfs
-	local name
-
-	config_get sysfs $cfg sysfs
-	config_get name $cfg name
-
-	[ -z "$sysfs" ] && return
-
-	for tuple in $tuples; do
-		local old=${tuple%=*}
-		local new=${tuple#*=}
-		local new_sysfs
-
-		new_sysfs=$(echo ${sysfs} | sed "s/${old}/${new}/")
-
-		[ "$new_sysfs" = "$sysfs" ] && continue
-
-		uci set system.${cfg}.sysfs="${new_sysfs}"
-		LED_OPTIONS_CHANGED=1
-
-		logger -t led-migration "sysfs option of LED \"${name}\" updated to ${new_sysfs}"
-	done;
-}
+. /lib/functions/migrations.sh
 
 do_internet_led_rename()
 {
@@ -45,38 +15,29 @@ do_internet_led_rename()
 	uci rename system.led_internet=led_dsl
 	uci set system.led_dsl.name=dsl
 
-	LED_OPTIONS_CHANGED=1
 	logger -t led-migration "internet led renamed to dsl"
 }
 
-migrate_leds()
-{
-	config_load system
-	config_foreach do_led_update_sysfs led "$@"
-}
-
 case "$(board_name)" in
+alphanetworks,asl56026|\
 arcadyan,arv452cqw|\
 arcadyan,arv7510pw22|\
 arcadyan,arv7519rw22|\
 arcadyan,arv752dpw|\
 arcadyan,arv752dpw22|\
-alphanetworks,asl56026|\
+arcadyan,vg3503j|\
+avm,fritz7360sl|\
 bt,homehub-v2b|\
 bt,homehub-v3a|\
-bt,homehub-v5a|\
-avm,fritz7360sl|\
-arcadyan,vg3503j)
+bt,homehub-v5a)
 	do_internet_led_rename
 	;;
 netgear,dgn3500|\
 netgear,dgn3500b)
 	migrate_leds "dgn3500:blue:wireless=dgn3500:green:wireless"
 	;;
-*)
-	;;
 esac
 
-[ "$LED_OPTIONS_CHANGED" = "1" ] && uci commit system
+migrations_apply system
 
 exit 0