Merge remote-tracking branch 'origin/pwnagotchi-torch-64' into pwnagotchi-torch-64

builder/data/etc/NetworkManager/conf.d/basic.conf

@@ -0,0 +1,6 @@
+[main]
+plugins=keyfile
+dhcp=dhcpcd
+
+[IFUPDOWN]
+managed=false

builder/data/usr/bin/pwnlib

@@ -40,12 +40,7 @@ start_monitor_interface() {
   rfkill unblock all
   ifconfig wlan0 up
   iw dev wlan0 set power_save off
-  airmon-ng check kill
-  iw phy "$(iw phy | head -1 | cut -d" " -f2)" interface add wlan0mon type monitor && ifconfig wlan0mon up
-
-  # If wlan0 is NOT taken down after bringing up mon0, then when switching to AUTO you will get:
-  # error 400: error while initializing wlan0mon to channel 1: iw: out=command failed: Device or resource busy (-16) err=exit status 240
-  ifconfig wlan0 down
+  airmon-ng start wlan0
 }
 
 # stops mon0

builder/pwnagotchi.json

@@ -3,13 +3,13 @@
     {
       "name": "pwnagotchi",
       "type": "arm-image",
-      "iso_url": "https://downloads.raspberrypi.org/raspios_lite_arm64/images/raspios_lite_arm64-2023-05-03/2023-05-03-raspios-bullseye-arm64-lite.img.xz",
-      "iso_checksum": "file:https://downloads.raspberrypi.org/raspios_lite_arm64/images/raspios_lite_arm64-2023-05-03/2023-05-03-raspios-bullseye-arm64-lite.img.xz.sha256",
+      "iso_url": "https://downloads.raspberrypi.org/raspios_lite_arm64/images/raspios_lite_arm64-2023-10-10/2023-10-10-raspios-bookworm-arm64-lite.img.xz",
+      "iso_checksum": "file:https://downloads.raspberrypi.org/raspios_lite_arm64/images/raspios_lite_arm64-2023-10-10/2023-10-10-raspios-bookworm-arm64-lite.img.xz.sha256",
       "target_image_size": 8568709120,
       "qemu_binary": "qemu-aarch64-static",
-      "output_filename": "../../pwnagotchi-{{user `pwn_version`}}-arm64.img",
+      "output_filename": "../../pwnagotchi-{{user `pwn_version`}}-bookworm-arm64.img",
       "qemu_args": [
-        "-r", "6.1.21-v8+"
+        "-r", "6.1.0-rpi4-rpi-v8"
       ]
     }
   ],

builder/pwnagotchi.yml

@@ -6,7 +6,7 @@
   vars:
     kernel:
       min: "6.1"
-      full: "6.1.21-v8+"
+      full: "6.1.0-rpi4-rpi-v8"
     pwnagotchi:
       hostname: "{{ lookup('env', 'PWN_HOSTNAME') | default('pwnagotchi', true) }}"
       version: "{{ lookup('env', 'PWN_VERSION') | default('pwnagotchi-torch', true) }}"
@@ -70,6 +70,7 @@
           - bluez
           - build-essential
           - curl
+          - dhcpcd5
           - dkms
           - dphys-swapfile
           - fbi
@@ -83,8 +84,6 @@
           - gcc-arm-none-eabi
           - git
           - libatlas-base-dev
-          - libavcodec58
-          - libavformat58
           - libblas-dev
           - libbz2-dev
           - libc-ares-dev
@@ -117,11 +116,12 @@
           - libsqlite3-dev
           - libssl-dev
           - libswscale5
-          - libtiff5
+          - libtiff6
           - libtool
           - libusb-1.0-0-dev
           - lsof
           - make
+          - pipx
           - python3-dbus
           - python3-flask
           - python3-flask-cors
@@ -193,7 +193,7 @@
 # Install nexmon to fix wireless scanning (takes 2.5G of space)
   - name: clone nexmon repository
     git:
-      repo: https://github.com/jayofelony/nexmon.git
+      repo: 'https://github.com/jayofelony/nexmon.git'
       dest: /usr/local/src/nexmon
     register: nexmongit
 
@@ -289,7 +289,7 @@
 
   - name: clone pwnagotchi repository
     git:
-      repo: https://github.com/jayofelony/pwnagotchi.git
+      repo: 'https://github.com/jayofelony/pwnagotchi.git'
       dest: /usr/local/src/pwnagotchi
     register: pwnagotchigit
 
@@ -300,9 +300,7 @@
     when: (pwnagotchigit.changed) or (pip_packages['pwnagotchi'] is undefined) or (pip_packages['pwnagotchi'] != pwnagotchi_version)
 
   - name: install pwnagotchi wheel and dependencies
-    pip:
-      name: "{{ lookup('fileglob', '/usr/local/src/pwnagotchi/dist/pwnagotchi*.whl') }}"
-      extra_args: "--no-cache-dir"
+    command: "pipx install /usr/local/src/pwnagotchi/dist/pwnagotchi-{{ pwnagotchi.version }}-py3-none-any.whl"
     when: (pwnagotchigit.changed) or (pip_packages['pwnagotchi'] is undefined) or (pip_packages['pwnagotchi'] != pwnagotchi_version)
 
   - name: remove pwnagotchi folder
@@ -333,7 +331,7 @@
 
   - name: download pwngrid 1.10.4
     git:
-      repo: https://github.com/jayofelony/pwngrid.git
+      repo: 'https://github.com/jayofelony/pwngrid.git'
       dest: /usr/local/src/pwngrid
     register: pwngrid
 
@@ -351,7 +349,7 @@
 
   - name: download bettercap v2.32.1
     git:
-      repo: https://github.com/jayofelony/bettercap.git
+      repo: 'https://github.com/jayofelony/bettercap.git'
       dest: /usr/local/src/bettercap
     register: bettercap
 

pwnagotchi/plugins/default/auto-update.py

@@ -126,7 +126,7 @@ def install(display, update):
             source_path = "%s-%s" % (source_path, update['available'])
 
         # setup.py is going to install data files for us
-        os.system("cd %s && pip3 install ." % source_path)
+        os.system("cd %s && pipx install ." % source_path)
     return True