From 4eb06b469f15a0841c7c2fc4c9d2fa079e994609 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Fri, 3 Apr 2020 01:03:46 -0500 Subject: [PATCH] systemd-networkd version of dhcpcd's 50-hostapd hook --- roles/network/tasks/hostapd.yml | 28 +++++++++++++++++++ roles/network/templates/hostapd/00-iiab-debug | 2 ++ roles/network/templates/hostapd/netd-disp | 6 ++++ 3 files changed, 36 insertions(+) create mode 100644 roles/network/templates/hostapd/00-iiab-debug create mode 100644 roles/network/templates/hostapd/netd-disp diff --git a/roles/network/tasks/hostapd.yml b/roles/network/tasks/hostapd.yml index fe535a41b..691d9a76b 100644 --- a/roles/network/tasks/hostapd.yml +++ b/roles/network/tasks/hostapd.yml @@ -73,6 +73,34 @@ mode: 0644 when: is_raspbian +- name: Create networkd-dispatcher diagnosic hook for recording network events + template: + owner: root + group: root + mode: 0755 + src: "{{ item.src }}" + dest: "{{ item.dest }}" + with_items: + - { src: 'hostapd/00-iiab-debug', dest: '/etc/networkd-dispatcher/carrier.d/00-iiab-debug' } + - { src: 'hostapd/00-iiab-debug', dest: '/etc/networkd-dispatcher/degraded.d/00-iiab-debug' } + - { src: 'hostapd/00-iiab-debug', dest: '/etc/networkd-dispatcher/dormant.d/00-iiab-debug' } + - { src: 'hostapd/00-iiab-debug', dest: '/etc/networkd-dispatcher/no-carrier.d/00-iiab-debug' } + - { src: 'hostapd/00-iiab-debug', dest: '/etc/networkd-dispatcher/off.d/00-iiab-debug' } + - { src: 'hostapd/00-iiab-debug', dest: '/etc/networkd-dispatcher/routable.d/00-iiab-debug' } + when: systemd_networkd_active and discovered_wireless_iface != "none" + +- name: Create networkd-dispatcher hook for hostapd on RPi hardware + template: + owner: root + group: root + mode: 0755 + src: "{{ item.src }}" + dest: "{{ item.dest }}" + with_items: + - { src: 'hostapd/netd-disp', dest: '/etc/networkd-dispatcher/carrier.d/iiab-wifi' } + - { src: 'hostapd/netd-disp', dest: '/etc/networkd-dispatcher/no-carrier.d/iiab-wifi' } + when: systemd_networkd_active and discovered_wireless_iface != "none" and rpi_model != "none" + - name: Disable the Access Point 'hostapd' service systemd: name: hostapd diff --git a/roles/network/templates/hostapd/00-iiab-debug b/roles/network/templates/hostapd/00-iiab-debug new file mode 100644 index 000000000..d1d028d52 --- /dev/null +++ b/roles/network/templates/hostapd/00-iiab-debug @@ -0,0 +1,2 @@ +#!/bin/bash +echo "NET-DISP-$AdministrativeState $IFACE $STATE" diff --git a/roles/network/templates/hostapd/netd-disp b/roles/network/templates/hostapd/netd-disp new file mode 100644 index 000000000..f950ac4a1 --- /dev/null +++ b/roles/network/templates/hostapd/netd-disp @@ -0,0 +1,6 @@ +#!/bin/bash +if [ "$IFACE" == "{{ discovered_wireless_iface }}" ]; then + echo "NET-DISP-WiFi $IFACE $STATE" + /usr/sbin/ip link set up ap0 +fi +