Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

network.lua use an alternate string if ifname is not found by owrt_device_parser #948

Merged
merged 1 commit into from
Nov 27, 2022

Conversation

ilario
Copy link
Member

@ilario ilario commented Nov 23, 2022

Fix #944

@codecov-commenter
Copy link

Codecov Report

Merging #948 (15aa6d2) into master (c967ed0) will increase coverage by 0.00%.
The diff coverage is 0.00%.

@@           Coverage Diff           @@
##           master     #948   +/-   ##
=======================================
  Coverage   77.93%   77.94%           
=======================================
  Files          48       48           
  Lines        4174     4175    +1     
=======================================
+ Hits         3253     3254    +1     
  Misses        921      921           
Impacted Files Coverage Δ
...ges/lime-system/files/usr/lib/lua/lime/network.lua 75.67% <0.00%> (-0.26%) ⬇️
...kages/lime-system/files/usr/lib/lua/lime/utils.lua 85.79% <0.00%> (+0.29%) ⬆️

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@ilario ilario marked this pull request as ready for review November 24, 2022 17:36
@ilario
Copy link
Member Author

ilario commented Nov 24, 2022

Just tested on OpenWrt 19.07 and works as seem that the code is intended to work. I think this is ready to merge.

root@OpenWrt:~# opkg install lime-system
Installing lime-system (2022-11-23-1669191489) to root...
Downloading http://192.168.1.2:8000/packages/mipsel_24kc/libremesh/lime-system_2022-11-23-1669191489_all.ipk
Installing liblua5.1.5 (5.1.5-3) to root...
Downloading http://192.168.1.2:8000/packages/mipsel_24kc/base/liblua5.1.5_5.1.5-3_mipsel_24kc.ipk
Installing libiwinfo-lua (2019-10-16-07315b6f-1) to root...
Downloading http://192.168.1.2:8000/targets/ramips/mt7621/packages/libiwinfo-lua_2019-10-16-07315b6f-1_mipsel_24kc.ipk
Installing lua (5.1.5-3) to root...
Downloading http://192.168.1.2:8000/packages/mipsel_24kc/base/lua_5.1.5-3_mipsel_24kc.ipk
Installing libuci-lua (2019-09-01-415f9e48-4) to root...
Downloading http://192.168.1.2:8000/packages/mipsel_24kc/base/libuci-lua_2019-09-01-415f9e48-4_mipsel_24kc.ipk
Installing luci-lib-ip (git-22.264.46202-f25285a-1) to root...
Downloading http://192.168.1.2:8000/packages/mipsel_24kc/luci/luci-lib-ip_git-22.264.46202-f25285a-1_mipsel_24kc.ipk
Installing luci-lib-nixio (git-22.264.46202-f25285a-1) to root...
Downloading http://192.168.1.2:8000/packages/mipsel_24kc/luci/luci-lib-nixio_git-22.264.46202-f25285a-1_mipsel_24kc.ipk
Installing luci-lib-jsonc (git-22.264.46202-f25285a-1) to root...
Downloading http://192.168.1.2:8000/packages/mipsel_24kc/luci/luci-lib-jsonc_git-22.264.46202-f25285a-1_mipsel_24kc.ipk
Configuring liblua5.1.5.
Configuring libuci-lua.
Configuring luci-lib-ip.
Configuring libiwinfo-lua.
Configuring lua.
Configuring luci-lib-nixio.
Configuring luci-lib-jsonc.
Configuring lime-system.
migrate-wifi-modes: migration finished, now run lime-config
Configuring LiMe for first boot...
Mac-config: lime-d45f25eb7eac
sh: /etc/init.d/odhcpd: not found
Clearing wireless config...
Clearing network config...
Disabling odhcpd
Cleaning dnsmasq
Disabling 6relayd...
network.scandevices.owrt_ifname_parser found ifname wlan0-ap
network.scandevices.dev_parser found WiFi device wlan0-ap
network.scandevices.owrt_ifname_parser found ifname wlan0-apname
network.scandevices.dev_parser found WiFi device wlan0-apname
network.scandevices.owrt_ifname_parser found ifname wlan0-mesh
network.scandevices.dev_parser found WiFi device wlan0-mesh
network.scandevices.owrt_ifname_parser found ifname wlan1-ap
network.scandevices.dev_parser found WiFi device wlan1-ap
network.scandevices.owrt_ifname_parser found ifname wlan1-apname
network.scandevices.dev_parser found WiFi device wlan1-apname
network.scandevices.owrt_ifname_parser found ifname wlan1-mesh
network.scandevices.dev_parser found WiFi device wlan1-mesh
network.scandevices.owrt_ifname_parser found ifname lo
network.scandevices.owrt_ifname_parser found ifname eth0.1
network.scandevices.dev_parser found vlan device eth0.1 and marking eth0 as nobridge
network.scandevices.owrt_ifname_parser found ifname eth0.2
network.scandevices.dev_parser found vlan device eth0.2 and marking eth0 as nobridge
network.scandevices.owrt_ifname_parser found ifname eth0.2
network.scandevices.dev_parser found vlan device eth0.2 and marking eth0 as nobridge
network.scandevices.owrt_device_parser found base interface not_found and derived device eth0.1
network.scandevices.dev_parser found vlan device eth0.1 and marking eth0 as nobridge
network.scandevices.dev_parser got nil device
network.scandevices.owrt_device_parser found base interface not_found and derived device eth0.2
network.scandevices.dev_parser found vlan device eth0.2 and marking eth0 as nobridge
network.scandevices.dev_parser got nil device
network.scandevices.dev_parser found plain Ethernet device eth0
network.scandevices.dev_parser found vlan device eth0.1 and marking eth0 as nobridge
network.scandevices.dev_parser found vlan device eth0.2 and marking eth0 as nobridge
Configuring system...
Let uhttpd listen on IPv4/IPv6
Applying generic configs:
 uhttpd_https
 Error on generic config uci_set: uhttpd.main.redirect_https=0
Done applying generic configs.
Copying assets:
Done copying assets.
Running assets on ATFIRSTBOOT :
Done running assets.
Running assets on ATCONFIG :
Done running assets.
Configuring official LibreMesh opkg feeds

@G10h4ck
Copy link
Member

G10h4ck commented Nov 27, 2022

Thanks for investigating and proposing a solution to this @ilario

@G10h4ck G10h4ck merged commit 2a702d3 into libremesh:master Nov 27, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

network.lua throws an error when owrt_device_parser cannot find ifname
3 participants