From 409aecc7556dd472355d98f810ff2b8fc43a4c3e Mon Sep 17 00:00:00 2001
From: torben
Date: Thu, 6 Sep 2018 22:50:56 +0200
Subject: fix.

---
 .../convert-kcl-network-configuration-to-systemd-service-files.sh   | 1 -
 .../hooks/prepare-network-service-in-newroot.sh                     | 2 +-
 modules.d/systemd-networkd-ext/module-setup.sh                      | 6 ------
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/modules.d/systemd-networkd-ext/hooks/convert-kcl-network-configuration-to-systemd-service-files.sh b/modules.d/systemd-networkd-ext/hooks/convert-kcl-network-configuration-to-systemd-service-files.sh
index 88908174..722127d4 100755
--- a/modules.d/systemd-networkd-ext/hooks/convert-kcl-network-configuration-to-systemd-service-files.sh
+++ b/modules.d/systemd-networkd-ext/hooks/convert-kcl-network-configuration-to-systemd-service-files.sh
@@ -333,7 +333,6 @@ if [[ "$WIRELESS_BOOTIF" != false ]]; then
         echo 'SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", ATTR{address}=="'$WIRELESS_BOOTIF'", NAME="'$WIRELESS_BOOTIF_NAME'"' \
             > /etc/udev/rules.d/70-pxe-wireless-boot-interface.rules
     fi
-    #macchanger --random "$WIRELESS_BOOTIF_NAME"
 fi
 
 # Generate config files for networkd
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 a853e7ef..ab0d93e1 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
@@ -99,7 +99,7 @@ if $SLX_ONLINE; then
         #    "$NEWROOT/usr/lib/systemd/system/multi-user.target.wants/restart-wireless-daemon.service"
         # Login to tty1 version, works:
         # TODO remove "false" if working and dynamically add relevant mac address.
-        echo -e "false && [ ! -f /tmp/wireless-daemon-restarted ] && /run/initramfs/usr/bin/aireplay-ng --deauth 10 -a 18:0F:76:04:53:B1 wireless && sed --in-place --regexp-extended 's/(CriticalConnection=true)/#\1/' /etc/systemd/network/wireless.network && systemctl daemon-reload && systemctl start restart-wireless-daemon.service && touch /tmp/wireless-daemon-restarted\n$(cat "$NEWROOT/root/.bash_profile")" \
+        echo -e "false && [ ! -f /tmp/wireless-daemon-restarted ] && systemctl start systemd-netword && sed --in-place --regexp-extended 's/(CriticalConnection=true)/#\1/' /etc/systemd/network/wireless.network && systemctl start restart-wireless-daemon.service && systemctl restart systemd-netword && touch /tmp/wireless-daemon-restarted\n$(cat "$NEWROOT/root/.bash_profile")" \
             > "$NEWROOT/root/.bash_profile"
         # Stops daemon at boot yet.
         #bl.logging.info \
diff --git a/modules.d/systemd-networkd-ext/module-setup.sh b/modules.d/systemd-networkd-ext/module-setup.sh
index b67085f3..4986dc99 100755
--- a/modules.d/systemd-networkd-ext/module-setup.sh
+++ b/modules.d/systemd-networkd-ext/module-setup.sh
@@ -191,12 +191,6 @@ install() {
         # wpa_supplicant version:
     inst_multiple -o \
         $systemdsystemunitdir/wpa_supplicant@.service \
-        aireplay-ng \
-        wpa_cli \
-        dhclient \
-        macchanger \
-        /usr/share/macchanger/OUI.list \
-        /usr/share/macchanger/wireless.list \
         wpa_supplicant
         # optional:
     #inst_multiple -o \
-- 
cgit v1.2.3-55-g7522