From 6f9251dc669a77f4790cba40b1788e28b2bbba09 Mon Sep 17 00:00:00 2001
From: Jeroen Oudshoorn <oudshoorn.jeroen@gmail.com>
Date: Tue, 26 Sep 2023 16:23:30 +0200
Subject: [PATCH] v2.4.3

Signed-off-by: Jeroen Oudshoorn <oudshoorn.jeroen@gmail.com>
---
 Makefile                |  2 +-
 builder/pwnagotchi.json |  3 ++-
 builder/pwnagotchi.yml  | 13 ++++++++-----
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 22133674..23ff36d5 100644
--- a/Makefile
+++ b/Makefile
@@ -55,7 +55,7 @@ $(PWN_RELEASE).img: $(SDIST) builder/pwnagotchi.json builder/pwnagotchi.yml $(sh
 	sudo $(PACKER) plugins install github.com/solo-io/arm-image
 	cd builder && sudo $(UNSHARE) $(PACKER) build -var "pwn_hostname=$(PWN_HOSTNAME)" -var "pwn_version=$(PWN_VERSION)" pwnagotchi.json
 	sudo chown -R $$USER:$$USER builder/images
-	mv builder/images /home/$$USER
+	mv builder/images ../../../../
 
 # If any of these files are updated, rebuild the checksums.
 $(PWN_RELEASE).sha256: $(PWN_RELEASE).img
diff --git a/builder/pwnagotchi.json b/builder/pwnagotchi.json
index 76a18d5f..7f6eb1ea 100644
--- a/builder/pwnagotchi.json
+++ b/builder/pwnagotchi.json
@@ -105,7 +105,8 @@
       "inline": [
         "apt-get -y --allow-releaseinfo-change update",
         "apt-get -y dist-upgrade",
-        "apt-get install -y ansible"
+        "apt-get install -y ansible",
+        "ansible-galaxy collection install community.general"
       ]
     },
     {
diff --git a/builder/pwnagotchi.yml b/builder/pwnagotchi.yml
index 4130d08b..6475607d 100644
--- a/builder/pwnagotchi.yml
+++ b/builder/pwnagotchi.yml
@@ -358,10 +358,11 @@
         /sbin/depmod -a
         exit 0
 
-  - name: make /etc/rc.local executable
-    file:
-      path: "/etc/rc.local"
-      mode: 0755
+  - name: Add the brcmfmac module
+    community.general.modprobe:
+      name: brcmfmac
+      state: present
+      persistent: present
 
   # To shrink the final image, remove the nexmon directory (takes 2.5G of space) post build and installation
   - name: Delete nexmon content & directory
@@ -659,7 +660,9 @@
       path: "{{ item }}"
     with_fileglob:
       - "/etc/ssh/ssh_host*_key*"
-
+  community:
+    general:
+      modprobe:
   handlers:
   - name: reload systemd services
     become_user: root