projects
/
openwrt
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
base-files: failsafe: Fix IP configuration
[openwrt/openwrt.git]
/
package
/
base-files
/
files
/
lib
/
preinit
/
10_indicate_preinit
diff --git
a/package/base-files/files/lib/preinit/10_indicate_preinit
b/package/base-files/files/lib/preinit/10_indicate_preinit
index 3c59929790168c12d1745c395f171b08b6d06f8a..56e96c63baabc0c320da9b3db3d4c5c916d6bb97 100644
(file)
--- a/
package/base-files/files/lib/preinit/10_indicate_preinit
+++ b/
package/base-files/files/lib/preinit/10_indicate_preinit
@@
-72,14
+72,20
@@
preinit_config_board() {
json_select network
json_select "lan"
json_select network
json_select "lan"
- json_get_vars ifname
+ json_get_vars device
+ json_get_values ports ports
json_select ..
json_select ..
json_select ..
json_select ..
- [ -n "$ifname" ] || return
+ [ -n "$device" -o -n "$ports" ] || return
+
+ # swconfig uses $device and DSA uses ports
+ [ -z "$ports" ] && {
+ ports="$device"
+ }
# only use the first one
# only use the first one
- ifname=${
ifname
%% *}
+ ifname=${
ports
%% *}
if [ -x /sbin/swconfig ]; then
# configure the switch, if present
if [ -x /sbin/swconfig ]; then
# configure the switch, if present