external/iiab
1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-03-09 15:40:17 +00:00
Code Issues Releases Wiki Activity

add discovered_wireless_iface to lan_list_result and num_lan_interfaces_result

Browse source
This commit is contained in:
Jerry Vonau 2022-10-03 00:57:12 -05:00
parent 6c350af87d
commit 87ea472003
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
roles/network/defaults/main.yml
View file

@ -55,7 +55,7 @@ strict_networking: False
iiab_demo_mode: False iiab_demo_mode: False
gui_static_wan: False gui_static_wan: False
wan_cidr: "" wan_cidr: ""
virtual_network_devices: "-e ap0 -e lo -e br0 -e tun -e br- -e docker -e bridge0 -e veth" virtual_network_devices: "-e wwlan -e ppp -e ap0 -e lo -e br0 -e tun -e br- -e docker -e bridge0 -e veth"
# Set defaults for discovery process as strings # Set defaults for discovery process as strings
wifi1: "not found-1" wifi1: "not found-1"

4
roles/network/tasks/detected_network.yml
View file

@ -166,7 +166,7 @@
when: reserved_device is defined when: reserved_device is defined
- name: Count LAN ifaces - name: Count LAN ifaces
shell: ls /sys/class/net | grep -v {{ virtual_network_devices }} -e wwlan -e ppp -e {{ device_gw }} -e {{ exclude_devices }} | wc -l shell: ls /sys/class/net | grep -v {{ virtual_network_devices }} -e {{ discovered_wireless_iface }} -e {{ device_gw }} -e {{ exclude_devices }} | wc -l
register: num_lan_interfaces_result register: num_lan_interfaces_result
- name: Calculate number of LAN interfaces including WiFi - name: Calculate number of LAN interfaces including WiFi
@ -175,7 +175,7 @@
# LAN - pick non WAN's # LAN - pick non WAN's
- name: Create list of LAN (non WAN) ifaces - name: Create list of LAN (non WAN) ifaces
shell: ls /sys/class/net | grep -v {{ virtual_network_devices }} -e wwlan -e ppp -e {{ device_gw }} -e {{ exclude_devices }} shell: ls /sys/class/net | grep -v {{ virtual_network_devices }} -e {{ discovered_wireless_iface }} -e {{ device_gw }} -e {{ exclude_devices }}
when: num_lan_interfaces != "0" when: num_lan_interfaces != "0"
register: lan_list_result register: lan_list_result