From cde5396e85049608f0e16c550620ab37be57b882 Mon Sep 17 00:00:00 2001
From: Justin Perdok <justin-p@users.noreply.github.com>
Date: Sun, 14 Nov 2021 00:57:15 +0100
Subject: [PATCH 1/2] Ensure wpa_supplicant logs to syslog

---
 builder/data/usr/bin/pwnlib | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/builder/data/usr/bin/pwnlib b/builder/data/usr/bin/pwnlib
index fd2d0de..0e45d25 100755
--- a/builder/data/usr/bin/pwnlib
+++ b/builder/data/usr/bin/pwnlib
@@ -158,7 +158,7 @@ network={
     frequency=2437
 }
 EOF
-        >/dev/null 2>&1 wpa_supplicant -D nl80211 -i wlan0 -c /tmp/wpa_supplicant.conf &
+        >/dev/null 2>&1 wpa_supplicant -u -s -O -D nl80211 -i wlan0 -c /tmp/wpa_supplicant.conf &
       fi
 
       if ! pgrep dnsmasq >/dev/null 2>&1; then

From 7998a84ea70cab0b120b4cfe46c98536cc3e7c9a Mon Sep 17 00:00:00 2001
From: Leif Sawyer <leif@akhepcat.com>
Date: Wed, 17 Nov 2021 18:48:46 -0900
Subject: [PATCH 2/2] create the kali.pref to prefer
 bootloader/kernel/libraspberrypi0 from kali instead of debian

---
 builder/pwnagotchi.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/builder/pwnagotchi.yml b/builder/pwnagotchi.yml
index 6692d28..0ee6670 100644
--- a/builder/pwnagotchi.yml
+++ b/builder/pwnagotchi.yml
@@ -138,6 +138,16 @@
       repo: deb http://http.re4son-kernel.com/re4son/ kali-pi main
       state: present
 
+  - name: create /etc/apt/preferences.d/kali.pref
+    copy:
+      dest: /etc/apt/preferences.d/kali.pref
+      force: yes
+      content: |
+        # ensure kali packages that are installed take precedence
+        Package: *
+        Pin: release n=kali-pi
+        Pin-Priority: 999
+
   - name: add firmware packages to hold
     dpkg_selections:
       name: "{{ item }}"