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>
SVN-Revision: 48398

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 f29ccff7aa1e00afb0669c532e19a95ad71d1759..af565d70317de90d9df8fdea6e2fd8945a655d5e 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 8f484ae66e8df5f4f505259e148edf651d201ee6..5aec796cb2ae8012b04583deb3b956263e885d1d 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 2a07928f76ce3396167e2598001d41eebf857e31..8ae5fbbeeea715299323713cf138c61e7c075307 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"