From d5507cfbc37d3551b6f05394ff3b5b3c5de565c0 Mon Sep 17 00:00:00 2001 From: Jeroen Oudshoorn Date: Fri, 15 Dec 2023 09:36:00 +0100 Subject: [PATCH] Update for bookworm release --- .idea/pwnagotchi.iml | 2 +- builder/data/usr/bin/pwnagotchi-launcher | 3 --- builder/orangepi.yml | 15 +++++++++++++++ builder/raspberrypi32.yml | 17 ++++++++++++++++- pwnagotchi/ui/web/server.py | 4 +++- 5 files changed, 35 insertions(+), 6 deletions(-) diff --git a/.idea/pwnagotchi.iml b/.idea/pwnagotchi.iml index b6766f65..a931bffa 100644 --- a/.idea/pwnagotchi.iml +++ b/.idea/pwnagotchi.iml @@ -4,7 +4,7 @@ - + diff --git a/builder/data/usr/bin/pwnagotchi-launcher b/builder/data/usr/bin/pwnagotchi-launcher index a56665f9..9728c0cd 100755 --- a/builder/data/usr/bin/pwnagotchi-launcher +++ b/builder/data/usr/bin/pwnagotchi-launcher @@ -9,9 +9,6 @@ if is_crypted_mode; then done fi -# blink 10 times to signal ready state -blink_led 10 & - if is_auto_mode; then /usr/local/bin/pwnagotchi else diff --git a/builder/orangepi.yml b/builder/orangepi.yml index 46ca0055..d6621b2a 100644 --- a/builder/orangepi.yml +++ b/builder/orangepi.yml @@ -133,12 +133,27 @@ - libusb-1.0-0-dev - lsof - make + - python3-yaml - python3-dbus - python3-flask - python3-flask-cors - python3-flaskext.wtf + - python3-gast - python3-pil + - python3-pycryptodome + - python3-requests + - python3-scapy + - python3-smbus2 + - python3-spidev + - python3-tweepy + - python3-werkzeug + - firmware-atheros + - firmware-brcm80211 + - firmware-libertas + - firmware-misc-nonfree + - firmware-realtek - python3-pip + - python3-setuptools - python3-smbus - qpdf - raspberrypi-kernel-headers diff --git a/builder/raspberrypi32.yml b/builder/raspberrypi32.yml index e0cdf939..4370a544 100644 --- a/builder/raspberrypi32.yml +++ b/builder/raspberrypi32.yml @@ -172,12 +172,27 @@ - libusb-1.0-0-dev - lsof - make + - python3-yaml + - python3-dbus - python3-flask - python3-flask-cors - python3-flaskext.wtf + - python3-gast - python3-pil + - python3-pycryptodome + - python3-requests + - python3-scapy + - python3-smbus2 + - python3-spidev + - python3-tweepy + - python3-werkzeug + - firmware-atheros + - firmware-brcm80211 + - firmware-libertas + - firmware-misc-nonfree + - firmware-realtek - python3-pip - - python3-protobuf + - python3-setuptools - python3-smbus - qpdf - raspberrypi-kernel-headers diff --git a/pwnagotchi/ui/web/server.py b/pwnagotchi/ui/web/server.py index 652129fd..8c7ce5cb 100644 --- a/pwnagotchi/ui/web/server.py +++ b/pwnagotchi/ui/web/server.py @@ -10,7 +10,9 @@ from flask_wtf.csrf import CSRFProtect from pwnagotchi.ui.web.handler import Handler # https://stackoverflow.com/questions/14888799/disable-console-messages-in-flask-server logging.getLogger('werkzeug').setLevel(logging.ERROR) -os.environ['WERKZEUG_RUN_MAIN'] = 'true' + +# Commented this out, on bookworm it wouldnt load the flask server for webui +# os.environ['WERKZEUG_RUN_MAIN'] = 'true' class Server: