diff options
| author | Mathias Kresin <dev@kresin.me> | 2017-07-09 13:00:36 +0200 |
|---|---|---|
| committer | Mathias Kresin <dev@kresin.me> | 2017-07-15 23:13:34 +0200 |
| commit | e4e984f2a07d2cd96d8e5e90955bc268eb5d4e5a (patch) | |
| tree | a4534355402283a176866ce6b03f774d8cf98769 /target/linux/orion/generic | |
| parent | e0b9ec8e969e1c37c284cfa2f252e9b0a71157db (diff) | |
| download | mtk-20170518-e4e984f2a07d2cd96d8e5e90955bc268eb5d4e5a.zip mtk-20170518-e4e984f2a07d2cd96d8e5e90955bc268eb5d4e5a.tar.gz mtk-20170518-e4e984f2a07d2cd96d8e5e90955bc268eb5d4e5a.tar.bz2 | |
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/generic')
| -rw-r--r-- | target/linux/orion/generic/base-files/etc/uci-defaults/09_hardware | 4 | ||||
| -rw-r--r-- | target/linux/orion/generic/base-files/lib/upgrade/platform.sh | 2 |
2 files changed, 3 insertions, 3 deletions
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 5b30f27..751749d 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 9c9967e..db23306 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")" |