aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/orion
diff options
context:
space:
mode:
authorMathias Kresin <dev@kresin.me>2017-07-09 13:00:36 +0200
committerMathias Kresin <dev@kresin.me>2017-07-15 23:13:34 +0200
commite4e984f2a07d2cd96d8e5e90955bc268eb5d4e5a (patch)
treea4534355402283a176866ce6b03f774d8cf98769 /target/linux/orion
parente0b9ec8e969e1c37c284cfa2f252e9b0a71157db (diff)
downloadupstream-e4e984f2a07d2cd96d8e5e90955bc268eb5d4e5a.tar.gz
upstream-e4e984f2a07d2cd96d8e5e90955bc268eb5d4e5a.tar.bz2
upstream-e4e984f2a07d2cd96d8e5e90955bc268eb5d4e5a.zip
treewide: use only board_name function to get name
Do not parse /tmp/sysinfo/board_name, /proc/cpuinfo or the device tree compatible string directly. Always use the board_name function to get the board name. The admswconfig package still reads /proc/cpuinfo directly. The code looks somehow broken and the whole adm5120 which uses this package looks unmaintained. Leave it as it is for now. Signed-off-by: Mathias Kresin <dev@kresin.me>
Diffstat (limited to 'target/linux/orion')
-rw-r--r--target/linux/orion/base-files/etc/hotplug.d/usb/10-usb4
-rw-r--r--target/linux/orion/generic/base-files/etc/uci-defaults/09_hardware4
-rw-r--r--target/linux/orion/generic/base-files/lib/upgrade/platform.sh2
3 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/orion/base-files/etc/hotplug.d/usb/10-usb b/target/linux/orion/base-files/etc/hotplug.d/usb/10-usb
index 5572daede1..2ae0f73bdc 100644
--- a/target/linux/orion/base-files/etc/hotplug.d/usb/10-usb
+++ b/target/linux/orion/base-files/etc/hotplug.d/usb/10-usb
@@ -30,9 +30,9 @@ usb_led_off() {
}
get_usb_led() {
- local hardware=`sed -n /Hardware/s/.*:.//p /proc/cpuinfo`
+ . /lib/functions.sh
- case "${hardware}" in
+ case "$(board_name)" in
'Linksys WRT350N v2')
usb_led='wrt350nv2:green:usb'
usb_device='1-1:1.0'
diff --git a/target/linux/orion/generic/base-files/etc/uci-defaults/09_hardware b/target/linux/orion/generic/base-files/etc/uci-defaults/09_hardware
index 5b30f27e5e..751749d13d 100644
--- a/target/linux/orion/generic/base-files/etc/uci-defaults/09_hardware
+++ b/target/linux/orion/generic/base-files/etc/uci-defaults/09_hardware
@@ -10,7 +10,7 @@
# This script sets system defaults for the hardware on firstboot
#
-hardware=`sed -n /Hardware/s/.*:.//p /proc/cpuinfo`
+. /lib/functions.sh
wrt350nv2_default() {
# leds
@@ -47,7 +47,7 @@ __EOF
}
}
-case "${hardware}" in
+case "$(board_name)" in
'Linksys WRT350N v2')
wrt350nv2_default
;;
diff --git a/target/linux/orion/generic/base-files/lib/upgrade/platform.sh b/target/linux/orion/generic/base-files/lib/upgrade/platform.sh
index 9c9967e4af..db2330684d 100644
--- a/target/linux/orion/generic/base-files/lib/upgrade/platform.sh
+++ b/target/linux/orion/generic/base-files/lib/upgrade/platform.sh
@@ -8,7 +8,7 @@
platform_check_image() {
[ "${ARGC}" -gt 1 ] && { echo 'Too many arguments. Only flash file expected.'; return 1; }
- local hardware=`sed -n /Hardware/s/.*:.//p /proc/cpuinfo`
+ local hardware="$(board_name)"
local magic="$(get_magic_word "$1")"
local magic_long="$(get_magic_long "$1")"