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

2-common/tasks/packages.yml merge conflic resolved

Browse source
This commit is contained in:
root 2021-04-28 10:52:50 -04:00
commit 6e8e8d7842
4 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
iiab-network
View file

@ -73,7 +73,7 @@ if [[ `command -v nmcli` ]]; then # "command -v" is POSIX compliant; it c
fi fi
ip r >> iiab-network.log ip r >> iiab-network.log
brctl show >> iiab-network.log bridge -d link >> iiab-network.log
echo >> iiab-network.log echo >> iiab-network.log
echo "iiab-network run start: $Start" >> iiab-network.log echo "iiab-network run start: $Start" >> iiab-network.log
echo "iiab-network run end: $End" >> iiab-network.log echo "iiab-network run end: $End" >> iiab-network.log
@ -88,7 +88,7 @@ if [[ `command -v nmcli` ]]; then
nmcli c nmcli c
fi fi
ip r ip r
brctl show bridge -d link
echo echo
echo "iiab-network run start: $Start" echo "iiab-network run start: $Start"
echo "iiab-network run end: $End" echo "iiab-network run end: $End"

2
roles/2-common/tasks/packages.yml
View file

@ -31,7 +31,6 @@
package: package:
name: name:
- acpid # Daemon for ACPI (power mgmt) events - acpid # Daemon for ACPI (power mgmt) events
- bridge-utils # DEPRECATED according to https://wiki.linuxfoundation.org/networking/bridge SEE PR #2752
- bzip2 # 2021-04-26: Prob not used, but can't hurt? - bzip2 # 2021-04-26: Prob not used, but can't hurt?
- curl # Used to install roles/nodejs and roles/nodered - curl # Used to install roles/nodejs and roles/nodered
#- etckeeper # "nobody is really using etckeeper and it's bloating the filesystem every time apt runs" per @jvonau at https://github.com/iiab/iiab/issues/1146 #- etckeeper # "nobody is really using etckeeper and it's bloating the filesystem every time apt runs" per @jvonau at https://github.com/iiab/iiab/issues/1146
@ -39,6 +38,7 @@
- hostapd - hostapd
- htop - htop
- i2c-tools # Low-level bus/chip/register/EEPROM tools e.g. for RTC - i2c-tools # Low-level bus/chip/register/EEPROM tools e.g. for RTC
- iproute2
- logrotate - logrotate
#- lynx # Installed by 1-prep's roles/iiab-admin/tasks/access.yml #- lynx # Installed by 1-prep's roles/iiab-admin/tasks/access.yml
- make # 2021-04-26: What roles (if any) truly still use this? - make # 2021-04-26: What roles (if any) truly still use this?

2
roles/network/tasks/restart.yml
View file

@ -65,7 +65,7 @@
command: /usr/bin/iiab-gen-iptables command: /usr/bin/iiab-gen-iptables
- name: Checking if WiFi slave is active - name: Checking if WiFi slave is active
shell: brctl show br0 | grep {{ iiab_wireless_lan_iface }} | wc -l shell: bridge -d link | grep {{ iiab_wireless_lan_iface }} | wc -l
# when: hostapd_enabled and discovered_wireless_iface != iiab_wan_iface and iiab_lan_iface == "br0" # when: hostapd_enabled and discovered_wireless_iface != iiab_wan_iface and iiab_lan_iface == "br0"
when: hostapd_enabled and iiab_lan_iface == "br0" when: hostapd_enabled and iiab_lan_iface == "br0"
register: wifi_slave register: wifi_slave

2
scripts/iiab-diagnostics
View file

@ -189,7 +189,7 @@ cat_cmd 'ip addr' 'Network interfaces'
cat_cmd 'ifconfig' 'Network interfaces (old view)' cat_cmd 'ifconfig' 'Network interfaces (old view)'
cat_cmd 'ip route' 'Routing table' cat_cmd 'ip route' 'Routing table'
cat_cmd 'netstat -rn' 'Routing table (old view)' cat_cmd 'netstat -rn' 'Routing table (old view)'
cat_cmd 'brctl show' 'Bridge for LAN side' cat_cmd 'bridge -d link' 'Bridge for LAN side'
cat_cmd 'sudo netstat -natp' 'Ports/Services in use' cat_cmd 'sudo netstat -natp' 'Ports/Services in use'
cat_cmd 'systemctl status dnsmasq' 'Is dnsmasq running?' cat_cmd 'systemctl status dnsmasq' 'Is dnsmasq running?'
cat_cmd 'sudo journalctl -b 0 -u dnsmasq' 'dnsmasq log' cat_cmd 'sudo journalctl -b 0 -u dnsmasq' 'dnsmasq log'