oxnas: finally make board names consistent

r48337 unfortunately incorrectly changed the boardname of the stg212
into stg-212 which is not the name of the image of DTS file or
boardname using sysupgrade, which is 'stg212' and imho should stay
that way.
The changes r48337 made for pogoplug-pro and pogoplug-v3 were correct,
thus this commit only partially reverts r48337.
Also properly set default for USB LED while already at it.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48398 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/oxnas/base-files/etc/board.d/01_leds b/target/linux/oxnas/base-files/etc/board.d/01_leds
index f29ccff..af565d7 100755 (executable)
--- a/target/linux/oxnas/base-files/etc/board.d/01_leds
+++ b/target/linux/oxnas/base-files/etc/board.d/01_leds
@@ -7,9 +7,9 @@ board=$(oxnas_board_name)
 board_config_update
 
 case $board in
-       stg-212)
+       stg212)
                ucidef_set_led_default "power" "power" "zyxel:blue:status" "1"
-               ucidef_set_led_usbdev "usb" "USB" "$1" "1-1"
+               ucidef_set_led_usbdev "usb" "USB" "zyxel:orange:copy" "1-1"
                ;;
        kd20)
                ucidef_set_led_default "power" "power" "kd20:blue:status" "1"

diff --git a/target/linux/oxnas/base-files/etc/diag.sh b/target/linux/oxnas/base-files/etc/diag.sh
index 8f484ae..5aec796 100644 (file)
--- a/target/linux/oxnas/base-files/etc/diag.sh
+++ b/target/linux/oxnas/base-files/etc/diag.sh
@@ -6,7 +6,7 @@
 
 get_status_led() {
        case $(oxnas_board_name) in
-       stg-212)
+       stg212)
                status_led="zyxel:blue:status"
                ;;
        kd20)

diff --git a/target/linux/oxnas/base-files/lib/oxnas.sh b/target/linux/oxnas/base-files/lib/oxnas.sh
index 2a07928..8ae5fbb 100755 (executable)
--- a/target/linux/oxnas/base-files/lib/oxnas.sh
+++ b/target/linux/oxnas/base-files/lib/oxnas.sh
@@ -14,7 +14,7 @@ oxnas_board_detect() {
 
        case "$machine" in
        *"MitraStar Technology Corp. STG-212"*)
-               name="stg-212"
+               name="stg212"
                ;;
        *"Shuttle KD20"*)
                name="kd20"