cleanup ucidef_set_interface* usage

- quote the interface name
- remove call of not existing function
- remove the proto if it's the default proto

Signed-off-by: Mathias Kresin <dev@kresin.me>
owl
Mathias Kresin 2016-09-10 09:46:14 +02:00
parent 92eaf27c62
commit c1578d4fc9
6 changed files with 8 additions and 9 deletions

View File

@ -69,7 +69,6 @@ bsb)
ucidef_set_interfaces_lan_wan "eth1" "eth0"
ucidef_add_switch "switch0" \
"0@eth1" "1:lan" "3:lan" # XXX: confirm cpu port!
ucidef_set_interface_wlan
;;
cpe210|\
@ -194,7 +193,7 @@ el-m150)
;;
tellstick-znet-lite)
ucidef_set_interface_wan "eth0" "dhcp"
ucidef_set_interface_wan "eth0"
ucidef_set_interface_raw "wlan" "wlan0" "dhcp"
;;

View File

@ -36,7 +36,7 @@ case "$board" in
ucidef_set_interface_lan "eth0" "dhcp"
;;
*)
ucidef_set_interface_lan "eth0" "static"
ucidef_set_interface_lan "eth0"
;;
esac

View File

@ -170,8 +170,8 @@ fi
ucidef_set_interface_wan "$interface_wan" "pppoe"
[ -n "$lan_mac" ] && ucidef_set_interface_macaddr lan "$lan_mac"
[ -n "$wan_mac" ] && ucidef_set_interface_macaddr wan "$wan_mac"
[ -n "$lan_mac" ] && ucidef_set_interface_macaddr "lan" "$lan_mac"
[ -n "$wan_mac" ] && ucidef_set_interface_macaddr "wan" "$wan_mac"
board_config_flush

View File

@ -14,7 +14,7 @@ case "$board" in
tl-wdr4900-v1)
ucidef_add_switch "switch0" \
"0@eth0" "2:lan:1" "3:lan:2" "4:lan:3" "5:lan:4" "1:wan"
ucidef_set_interface_macaddr wan "$(mtd_get_mac_binary config 332)"
ucidef_set_interface_macaddr "wan" "$(mtd_get_mac_binary config 332)"
;;
*)
ucidef_set_interfaces_lan_wan "eth0" "eth1"

View File

@ -15,7 +15,7 @@ case "$(oxnas_board_name)" in
esac
ucidef_set_interface_lan "eth0" "dhcp"
[ -n "$lan_mac" ] && ucidef_set_interface_macaddr lan "$lan_mac"
[ -n "$lan_mac" ] && ucidef_set_interface_macaddr "lan" "$lan_mac"
board_config_flush

View File

@ -371,8 +371,8 @@ ramips_setup_macs()
;;
esac
[ -n "$lan_mac" ] && ucidef_set_interface_macaddr lan $lan_mac
[ -n "$wan_mac" ] && ucidef_set_interface_macaddr wan $wan_mac
[ -n "$lan_mac" ] && ucidef_set_interface_macaddr "lan" $lan_mac
[ -n "$wan_mac" ] && ucidef_set_interface_macaddr "wan" $wan_mac
}
board_config_update