From 631b11159292523ff046414028759ea4c21add8f Mon Sep 17 00:00:00 2001
From: torben
Date: Fri, 7 Sep 2018 13:48:11 +0200
Subject: adding wpa_cli

---
 .../systemd-networkd-ext/hooks/prepare-network-service-in-newroot.sh    | 2 +-
 modules.d/systemd-networkd-ext/module-setup.sh                          | 2 +-
 modules.d/systemd-networkd-ext/restart-wireless-daemon.service          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules.d/systemd-networkd-ext/hooks/prepare-network-service-in-newroot.sh b/modules.d/systemd-networkd-ext/hooks/prepare-network-service-in-newroot.sh
index 6857ef6e..6e2ab60f 100755
--- a/modules.d/systemd-networkd-ext/hooks/prepare-network-service-in-newroot.sh
+++ b/modules.d/systemd-networkd-ext/hooks/prepare-network-service-in-newroot.sh
@@ -102,7 +102,7 @@ if $SLX_ONLINE; then
         # TODO remove "false" if pre-caching is working.
         cat << EOF >"$NEWROOT/root/.bash_profile"
 wget --output-document - http://10.21.9.111/BOOTED
-if [ ! -f /tmp/wireless-daemon-restarted ]; then
+if false && [ ! -f /tmp/wireless-daemon-restarted ]; then
     systemctl start restart-wireless-daemon.service
     touch /tmp/wireless-daemon-restarted
 fi
diff --git a/modules.d/systemd-networkd-ext/module-setup.sh b/modules.d/systemd-networkd-ext/module-setup.sh
index 49be57eb..915cfd44 100755
--- a/modules.d/systemd-networkd-ext/module-setup.sh
+++ b/modules.d/systemd-networkd-ext/module-setup.sh
@@ -193,6 +193,7 @@ install() {
         # wpa_supplicant version:
     inst_multiple -o \
         $systemdsystemunitdir/wpa_supplicant@.service \
+        wpa_cli \
         wpa_supplicant
         # optional:
         # iwd version (needs dbus implication in initramfs):
@@ -419,7 +420,6 @@ EOF
     # the hook script that will parse the "ip=" kernel command line
     # parameter and generate the .link and .network files needed
     # by systemd-networkd.
-
     inst_hook pre-pivot 20 "$moddir/hooks/prepare-network-service-in-newroot.sh"
     inst_hook pre-pivot 30 "$moddir/hooks/configure-dhcp-for-newroot.sh"
 }
diff --git a/modules.d/systemd-networkd-ext/restart-wireless-daemon.service b/modules.d/systemd-networkd-ext/restart-wireless-daemon.service
index e4c803dc..562ec5a9 100644
--- a/modules.d/systemd-networkd-ext/restart-wireless-daemon.service
+++ b/modules.d/systemd-networkd-ext/restart-wireless-daemon.service
@@ -16,7 +16,7 @@ ExecStartPre=-/run/initramfs/usr/bin/sync
 #ExecStartPre=-/run/initramfs/usr/bin/sleep 20
 #ExecStart=/usr/bin/systemctl start iwd
 ExecStart=/usr/bin/systemctl start wpa_supplicant@wireless.service
-#ExecStartPre=/usr/bin/systemctl start systemd-networkd
+#ExecStartPre=/usr/bin/systemctl (re-)start systemd-networkd
 # Restarts dhcp lease to retrieve a valid unique ip.
 RemainAfterExit=true
 StandardError=null
-- 
cgit v1.2.3-55-g7522