diff options
| author | Mathias Kresin <dev@kresin.me> | 2017-02-15 08:39:05 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2017-06-03 20:41:26 +0200 |
| commit | 524ed5088e900821307694180d77038df5a3ea9a (patch) | |
| tree | fcc92cc0c560bc847004915685b4c810dc5ea29d | |
| parent | bf6216e5e3938cd306b0295161140ec281a094b9 (diff) | |
| download | mtk-20170518-524ed5088e900821307694180d77038df5a3ea9a.zip mtk-20170518-524ed5088e900821307694180d77038df5a3ea9a.tar.gz mtk-20170518-524ed5088e900821307694180d77038df5a3ea9a.tar.bz2 | |
base-files: always set proto passed to _ucidef_set_interface()
Overwrite an already set proto if a new one is passed to
_ucidef_set_interface() similar to what is done for the interface.
It is required when using ""ucidef_set_interface_wan 'ptm0' 'pppoe'"
after some initial wan interface configuration is already done by
ucidef_add_switch.
The "json_is_a protocol string" guard is meant to not reset an earlier
set interface proto in case something like
"ucidef_set_interface_lan 'eth0'" is used afterwards.
Signed-off-by: Mathias Kresin <dev@kresin.me>
| -rwxr-xr-x | package/base-files/files/lib/functions/uci-defaults.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package/base-files/files/lib/functions/uci-defaults.sh b/package/base-files/files/lib/functions/uci-defaults.sh index 06004c3..7cc63ff 100755 --- a/package/base-files/files/lib/functions/uci-defaults.sh +++ b/package/base-files/files/lib/functions/uci-defaults.sh @@ -35,7 +35,7 @@ _ucidef_set_interface() { json_select_object "$name" json_add_string ifname "$iface" - if ! json_is_a protocol string; then + if ! json_is_a protocol string || [ -n "$proto" ]; then case "$proto" in static|dhcp|none|pppoe) : ;; *) |