projects
/
openwrt
/
staging
/
ynezz.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
base-files: generate network config with "device" options
[openwrt/staging/ynezz.git]
/
package
/
base-files
/
files
/
lib
/
functions
/
uci-defaults.sh
diff --git
a/package/base-files/files/lib/functions/uci-defaults.sh
b/package/base-files/files/lib/functions/uci-defaults.sh
index 407a9c710ff72ffafd5162e427e2da2d73bbcd55..02882f43ca4ed719a1f84144c1d8ea67fa7f1553 100644
(file)
--- a/
package/base-files/files/lib/functions/uci-defaults.sh
+++ b/
package/base-files/files/lib/functions/uci-defaults.sh
@@
-39,7
+39,7
@@
ucidef_set_interface() {
[ -n "$opt" -a -n "$val" ] || break
[ -n "$opt" -a -n "$val" ] || break
- [ "$opt" = "
ifnam
e" -a "$val" != "${val/ //}" ] && {
+ [ "$opt" = "
devic
e" -a "$val" != "${val/ //}" ] && {
json_select_array "ports"
for e in $val; do json_add_string "" "$e"; done
json_close_array
json_select_array "ports"
for e in $val; do json_add_string "" "$e"; done
json_close_array
@@
-79,11
+79,11
@@
ucidef_set_compat_version() {
}
ucidef_set_interface_lan() {
}
ucidef_set_interface_lan() {
- ucidef_set_interface "lan"
ifnam
e "$1" protocol "${2:-static}"
+ ucidef_set_interface "lan"
devic
e "$1" protocol "${2:-static}"
}
ucidef_set_interface_wan() {
}
ucidef_set_interface_wan() {
- ucidef_set_interface "wan"
ifnam
e "$1" protocol "${2:-dhcp}"
+ ucidef_set_interface "wan"
devic
e "$1" protocol "${2:-dhcp}"
}
ucidef_set_interfaces_lan_wan() {
}
ucidef_set_interfaces_lan_wan() {
@@
-201,14
+201,14
@@
_ucidef_finish_switch_roles() {
json_select_object "$role"
# attach previous interfaces (for multi-switch devices)
json_select_object "$role"
# attach previous interfaces (for multi-switch devices)
- json_get_var devices
ifnam
e
+ json_get_var devices
devic
e
if ! list_contains devices "$device"; then
devices="${devices:+$devices }$device"
fi
json_select ..
json_select ..
if ! list_contains devices "$device"; then
devices="${devices:+$devices }$device"
fi
json_select ..
json_select ..
- ucidef_set_interface "$role"
ifnam
e "$devices"
+ ucidef_set_interface "$role"
devic
e "$devices"
done
}
done
}