From de51cfed9aa2abc85916a0d53f8a85fe91f0166f Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Tue, 5 May 2020 13:06:26 +0200 Subject: [PATCH] sunxi: tidy up cases in base-files This removes unnecessary quotes in cases and applies alphabetic order to members. Signed-off-by: Adrian Schmutzler --- .../sunxi/base-files/etc/board.d/02_network | 62 +++++++++---------- .../base-files/lib/preinit/03_b53_hack.sh | 4 +- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/target/linux/sunxi/base-files/etc/board.d/02_network b/target/linux/sunxi/base-files/etc/board.d/02_network index 67a93b93a5..7a2a7c402d 100755 --- a/target/linux/sunxi/base-files/etc/board.d/02_network +++ b/target/linux/sunxi/base-files/etc/board.d/02_network @@ -7,42 +7,42 @@ board_config_update -case "$(board_name)" in -"olimex,a20-olinuxino-micro") - ucidef_set_interface_lan 'wlan0' - ;; -"lamobo,lamobo-r1") +case $(board_name) in +lamobo,lamobo-r1) ucidef_add_switch "switch0" \ "4:lan:1" "0:lan:2" "1:lan:3" "2:lan:4" "3:wan" "8@eth0" ;; -"xunlong,orangepi-r1") - ucidef_set_interfaces_lan_wan "eth0" "eth1" - ;; -"friendlyelec,nanopi-r1" \ -|"friendlyelec,nanopi-r1s-h3" \ -|"friendlyelec,nanopi-r1s-h5") - ucidef_set_interfaces_lan_wan "eth1" "eth0" - ;; -"friendlyelec,nanopi-m1-plus" \ -|"friendlyelec,nanopi-k1-plus" \ -|"friendlyelec,nanopi-duo" \ -|"friendlyelec,nanopi-duo2" \ -|"friendlyelec,nanopi-neo-plus2" \ -|"friendlyelec,nanopi-neo-s") - ucidef_set_interfaces_lan_wan "wlan0" "eth0" - ;; -"friendlyelec,nanopi-neo" \ -|"friendlyelec,nanopi-neo2" \ -|"friendlyelec,nanopi-neo-core2" \ -|"friendlyelec,nanopi-neo2-black" \ -|"friendlyelec,nanopi-m1" \ -|"friendlyelec,zeropi") - ucidef_set_interface_wan "eth0" - ;; -"friendlyelec,nanopi-neo-air") +olimex,a20-olinuxino-micro) ucidef_set_interface_lan "wlan0" ;; -"friendlyelec,nanopi-neo-core") +xunlong,orangepi-r1) + ucidef_set_interfaces_lan_wan "eth0" "eth1" + ;; +friendlyelec,nanopi-r1|\ +friendlyelec,nanopi-r1s-h3|\ +friendlyelec,nanopi-r1s-h5) + ucidef_set_interfaces_lan_wan "eth1" "eth0" + ;; +friendlyelec,nanopi-m1-plus|\ +friendlyelec,nanopi-k1-plus|\ +friendlyelec,nanopi-duo|\ +friendlyelec,nanopi-duo2|\ +friendlyelec,nanopi-neo-plus2|\ +friendlyelec,nanopi-neo-s) + ucidef_set_interfaces_lan_wan "wlan0" "eth0" + ;; +friendlyelec,nanopi-neo|\ +friendlyelec,nanopi-neo2|\ +friendlyelec,nanopi-neo-core2|\ +friendlyelec,nanopi-neo2-black|\ +friendlyelec,nanopi-m1|\ +friendlyelec,zeropi) + ucidef_set_interface_wan "eth0" + ;; +friendlyelec,nanopi-neo-air) + ucidef_set_interface_lan "wlan0" + ;; +friendlyelec,nanopi-neo-core) ucidef_set_interface_wan "eth0" ;; *) diff --git a/target/linux/sunxi/base-files/lib/preinit/03_b53_hack.sh b/target/linux/sunxi/base-files/lib/preinit/03_b53_hack.sh index 170cfd5b29..b09e86e694 100755 --- a/target/linux/sunxi/base-files/lib/preinit/03_b53_hack.sh +++ b/target/linux/sunxi/base-files/lib/preinit/03_b53_hack.sh @@ -4,8 +4,8 @@ do_b53_hack() { . /lib/functions.sh # hack: enable switch on Lamobo R1 and reset counters - case "$(board_name)" in - "lamobo,lamobo-r1") + case $(board_name) in + lamobo,lamobo-r1) ifconfig eth0 up sleep 1 swconfig dev switch0 set reset 1