diff options
| author | Mathias Kresin <dev@kresin.me> | 2017-02-15 08:39:05 +0100 |
|---|---|---|
| committer | Mathias Kresin <dev@kresin.me> | 2017-03-11 13:45:00 +0100 |
| commit | 0f01253b257b8e832bea8b63115d4a4280375ccb (patch) | |
| tree | 0559b1e6619b003a0f8f50778b69aabfe1883884 | |
| parent | 715b06641933a128acfba0e0240b261afd6afa1c (diff) | |
| download | upstream-0f01253b257b8e832bea8b63115d4a4280375ccb.tar.gz upstream-0f01253b257b8e832bea8b63115d4a4280375ccb.tar.bz2 upstream-0f01253b257b8e832bea8b63115d4a4280375ccb.zip | |
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 f4c1d968e2..9fad1896ec 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) : ;; *) |