revert back to drschottky

This reverts commit 26913016b9.

.github/FUNDING.yml

@@ -1,4 +1,3 @@
 # These are supported funding model platforms
 
-patreon: pwnagotchi_torch
 github: jayofelony

Makefile

@@ -1,4 +1,4 @@
-PACKER_VERSION := 1.10.0
+PACKER_VERSION := 1.10.1
 PWN_HOSTNAME := pwnagotchi
 PWN_VERSION := $(shell cut -d"'" -f2 < pwnagotchi/_version.py)
 

README.md

@@ -8,7 +8,7 @@ The RPi5 can only be used headless currently. (without display.)
 If you are using an older 32-bit version Raspberry Pi, ZeroWH, use this [fork](https://github.com/jayofelony/pwnagotchi-torch/releases/tag/v2.6.4) and make sure you download the `armhf` version.
 
 ---
-Download the latest image file [here](https://github.com/jayofelony/pwnagotchi-bookworm/releases/tag/v2.7.9), and let it auto-update from here on out.
+Download the latest image file [here](https://github.com/jayofelony/pwnagotchi-bookworm/releases/tag/v2.8.2), and let it auto-update from here on out.
 
 **Use RPi imager to flash, please don't flash a new user as this will mess with logs created.**
   - Select `Use Custom Image`

builder/data/etc/default/zramswap

@@ -1,15 +0,0 @@
-# Specifies amount of zram devices to create.
-# By default, zramswap-start will use all available cores.
-#CORES=1
-
-# Specifies the amount of RAM that should be used for zram
-# based on a percentage the total amount of available memory
-PERCENTAGE=60
-
-# Specifies a static amount of RAM that should be used for
-# the ZRAM devices, this is in MiB
-#ALLOCATION=256
-
-# Specifies the priority for the swap devices, see swapon(2)
-# for more details.
-#PRIORITY=100

builder/data/etc/dphys-swapfile

@@ -0,0 +1,26 @@
+# /etc/dphys-swapfile - user settings for dphys-swapfile package
+# author Neil Franklin, last modification 2010.05.05
+# copyright ETH Zuerich Physics Departement
+#   use under either modified/non-advertising BSD or GPL license
+
+# this file is sourced with . so full normal sh syntax applies
+
+# the default settings are added as commented out CONF_*=* lines
+
+
+# where we want the swapfile to be, this is the default
+#CONF_SWAPFILE=/var/swap
+
+# set size to absolute value, leaving empty (default) then uses computed value
+#   you most likely don't want this, unless you have an special disk situation
+CONF_SWAPSIZE=2048
+
+# set size to computed value, this times RAM size, dynamically adapts,
+#   guarantees that there is enough swap without wasting disk space on excess
+#CONF_SWAPFACTOR=2
+
+# restrict size (computed and absolute!) to maximally this limit
+#   can be set to empty for no limit, but beware of filled partitions!
+#   this is/was a (outdated?) 32bit kernel limit (in MBytes), do not overrun it
+#   but is also sensible on 64bit to prevent filling /var or even / partition
+#CONF_MAXSWAP=2048

builder/data/etc/network/interfaces.d/usb0-cfg

@@ -5,4 +5,4 @@ iface usb0 inet static
   network 10.0.0.0
   broadcast 10.0.0.255
   gateway 10.0.0.1
-  metric 101
+  metric 101

builder/data/etc/systemd/system/pwnagotchi.service

@@ -1,6 +1,6 @@
 [Unit]
 Description=pwnagotchi Deep Reinforcement Learning instrumenting bettercap for WiFI pwning.
-Documentation=https://pwnagotchi.ai
+Documentation=https://pwnagotchi.org
 Wants=network.target
 After=pwngrid-peer.service
 
@@ -8,6 +8,7 @@ After=pwngrid-peer.service
 Type=simple
 WorkingDirectory=~
 ExecStart=/usr/bin/pwnagotchi-launcher
+ExecStopPost=/usr/bin/bash -c "if egrep -qi  'personality.clear_on_exit[ =]*true' /etc/pwnagotchi/config.toml ; then /usr/local/bin/pwnagotchi --clear; fi"
 Restart=always
 RestartSec=30
 TasksMax=infinity

builder/pwnagotchi.json.pkr.hcl

@@ -74,10 +74,6 @@ build {
     inline = ["chmod +x /usr/bin/*"]
   }
 
-  provisioner "shell" {
-    inline = ["dpkg --add-architecture armhf"]
-  }
-
   provisioner "file" {
     destination = "/etc/systemd/system/"
     sources     = [

builder/raspberrypi64.yml

@@ -27,7 +27,6 @@
         - fstrim.timer
         - pwnagotchi.service
         - pwngrid-peer.service
-        - zramswap.service
       disable:
         - apt-daily-upgrade.service
         - apt-daily-upgrade.timer
@@ -78,6 +77,7 @@
           - build-essential
           - curl
           - dkms
+          - dphys-swapfile
           - fbi
           - firmware-atheros
           - firmware-brcm80211
@@ -102,7 +102,6 @@
           - libbz2-dev
           - libc-ares-dev
           - libc6-dev
-          - libc6:armhf
           - libcap-dev
           - libcurl-ocaml-dev
           - libdbus-1-dev
@@ -117,10 +116,7 @@
           - libgmp3-dev
           - libgstreamer1.0-0
           - libhdf5-dev
-          - libisl23:armhf
           - liblapack-dev
-          - libmpc3:armhf
-          - libmpfr6:armhf
           - libncursesw5-dev
           - libnetfilter-queue-dev
           - libopenblas-dev
@@ -135,7 +131,6 @@
           - libsqlite3-dev
           - libssl-dev
           - libssl-ocaml-dev
-          - libstdc++6:armhf
           - libswscale5
           - libtiff6
           - libtool
@@ -173,10 +168,8 @@
           - wl
           - xxd
           - zlib1g-dev
-          - zram-tools
   environment:
     ARCHFLAGS: "-arch aarch64"
-    QEMU_UNAME: "{{ kernel.full }}"
     
   tasks:
     # First we install packages
@@ -298,22 +291,9 @@
         state: absent
         path: /usr/local/src/hcxtools
 
-    # Install nexmon to fix wireless scanning (takes 2.5G of space)
-    - name: symlink 1
-      file:
-        src: "/usr/lib/arm-linux-gnueabihf/libisl.so.23.2.0"
-        dest: "/usr/lib/arm-linux-gnueabihf/libisl.so.10"
-        state: link
-
-    - name: symlink 2
-      file:
-        src: "/usr/lib/arm-linux-gnueabihf/libmpfr.so.6.2.0"
-        dest: "/usr/lib/arm-linux-gnueabihf/libmpfr.so.4"
-        state: link
-
     - name: clone nexmon repository
       git:
-        repo: https://github.com/seemoo-lab/nexmon.git
+        repo: https://github.com/DrSchottky/nexmon.git
         dest: /usr/local/src/nexmon
 
     # FIRST WE BUILD DRIVER FOR RPi5
@@ -366,7 +346,7 @@
 
     - name: clone nexmon repository
       git:
-        repo: https://github.com/seemoo-lab/nexmon.git
+        repo: https://github.com/DrSchottky/nexmon.git
         dest: /usr/local/src/nexmon
 
     - name: make firmware, RPi4

pwnagotchi/_version.py

@@ -1 +1 @@
-__version__ = '2.8.2'
+__version__ = '2.8.3'

pwnagotchi/defaults.toml

@@ -156,6 +156,8 @@ personality.bond_encounters_factor = 20000
 personality.throttle_a = 0.4
 personality.throttle_d = 0.9
 
+personality.clear_on_exit = true # clear display when shutting down cleanly
+
 ui.fps = 0.0
 ui.font.name = "DejaVuSansMono" # for japanese: fonts-japanese-gothic
 ui.font.size_offset = 0 # will be added to the font size