2 files changed, 23 insertions, 13 deletions
diff --git a/target/linux/kirkwood/base-files/etc/uci-defaults/01_leds b/target/linux/kirkwood/base-files/etc/uci-defaults/01_leds
index 1e7e064085..cdaac813f8 100644
--- a/target/linux/kirkwood/base-files/etc/uci-defaults/01_leds
+++ b/target/linux/kirkwood/base-files/etc/uci-defaults/01_leds
@@ -4,20 +4,27 @@
 #
 
 . /lib/functions/uci-defaults.sh
+. /lib/functions/kirkwood.sh
 
-case "`cat /proc/device-tree/model`" in
-"Seagate FreeAgent Dockstar")
-	ucidef_set_led_default "health" "status:green:health" "1"
-	ucidef_set_led_default "fault" "status:orange:fault" "1"
-	;;
-"Cloud Engines Pogoplug E02")
+board=$(kirkwood_board_name)
+
+case "$board" in
+"dockstar")
 	ucidef_set_led_default "health" "status:green:health" "1"
 	ucidef_set_led_default "fault" "status:orange:fault" "1"
 	;;
-"Linksys EA4500")
+"ea4500")
 	ucidef_set_led_default "health" "ea4500:white:health" "1"
 	ucidef_set_led_default "pulse" "ea4500:white:pulse" "1"
 	;;
+"ib62x0")
+	ucidef_set_led_default "health" "ib62x0:green:os" "1"
+	ucidef_set_led_default "fault" "ib62x0:red:os" "1"
+	;;
+"pogo_e02")
+	ucidef_set_led_default "health" "status:green:health" "1"
+	ucidef_set_led_default "fault" "status:orange:fault" "1"
+	;;
 *)
 	;;
 esac
diff --git a/target/linux/kirkwood/base-files/etc/uci-defaults/02_network b/target/linux/kirkwood/base-files/etc/uci-defaults/02_network
index 0c55cbfd28..949e4d71a7 100644
--- a/target/linux/kirkwood/base-files/etc/uci-defaults/02_network
+++ b/target/linux/kirkwood/base-files/etc/uci-defaults/02_network
@@ -21,23 +21,26 @@ EOF
 }
 
 . /lib/functions/uci-defaults.sh
+. /lib/functions/kirkwood.sh
+
+board=$(kirkwood_board_name)
 
 ucidef_set_interface_loopback
 
-case "`cat /proc/device-tree/model`" in
-"Seagate FreeAgent Dockstar")
+case "$board" in
+"dockstar")
 	set_lan_dhcp "eth0"
 	;;
-"Iomega Iconnect")
+"iconnect")
 	set_lan_dhcp "eth0"
 	;;
-"RaidSonic ICY BOX IB-NAS62x0 (Rev B)")
+"ib62x0")
 	set_lan_dhcp "eth0"
 	;;
-"Cloud Engines Pogoplug E02")
+"pogo_e02")
 	set_lan_dhcp "eth0"
 	;;
-"Linksys EA4500")
+"ea4500")
 	ucidef_set_interfaces_lan_wan "eth0" "eth1"
 	;;
 *)