From fc67b2710c6a00e8ef90e83347da1e43a4c2a99f Mon Sep 17 00:00:00 2001 From: Thomas Schneider <qsx@chaotikum.eu> Date: Mon, 2 Mar 2020 19:04:20 +0100 Subject: [PATCH] Fix wpa_wait --- radius-client/templates/networkd-override.conf.j2 | 2 +- radius-client/templates/wpa_wait.sh.j2 | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/radius-client/templates/networkd-override.conf.j2 b/radius-client/templates/networkd-override.conf.j2 index f61ae97..5aa7a75 100644 --- a/radius-client/templates/networkd-override.conf.j2 +++ b/radius-client/templates/networkd-override.conf.j2 @@ -1,2 +1,2 @@ [Service] -ExecStartPre=/usr/local/bin/wpa_wait.sh +ExecStartPre=+/usr/local/bin/wpa_wait.sh diff --git a/radius-client/templates/wpa_wait.sh.j2 b/radius-client/templates/wpa_wait.sh.j2 index 3200925..939f196 100755 --- a/radius-client/templates/wpa_wait.sh.j2 +++ b/radius-client/templates/wpa_wait.sh.j2 @@ -1,7 +1,6 @@ -#!/bin/bash +#!/bin/sh {% if radius_client_wait %} -journalctl -u wpa_supplicant-wired@{{ ansible_default_ipv4.interface }} -b | tail -n1 | grep CONNECTED -while [ $? == 1 ]; do - journalctl -u wpa_supplicant-wired@{{ ansible_default_ipv4.interface }} -b | tail -n1 | grep CONNECTED +while ! wpa_cli -i {{ ansible_default_ipv4.interface }} status | grep -q "wpa_state=COMPLETED"; do + sleep 1 done {% endif %} -- GitLab