From d3e7c0d18b0de91720b4fe67568cf6a7f62a99e3 Mon Sep 17 00:00:00 2001
From: Jeroen Oudshoorn <oudshoorn.jeroen@gmail.com>
Date: Tue, 3 Oct 2023 12:46:41 +0200
Subject: [PATCH] v2.4.5

Signed-off-by: Jeroen Oudshoorn <oudshoorn.jeroen@gmail.com>
---
 .idea/misc.xml                                  |  2 +-
 .idea/pwnagotchi.iml                            |  2 +-
 .../data/etc/systemd/system/bettercap.service   |  2 +-
 builder/data/usr/bin/pwnlib                     |  4 ++--
 builder/pwnagotchi.yml                          | 17 ++++++++++++++++-
 pwnagotchi/_version.py                          |  2 +-
 6 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 6178365c..d95f6c4d 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.10 (pwnagotchi)" project-jdk-type="Python SDK" />
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.11 (pwnagotchi)" project-jdk-type="Python SDK" />
 </project>
\ No newline at end of file
diff --git a/.idea/pwnagotchi.iml b/.idea/pwnagotchi.iml
index ad51e808..b258c893 100644
--- a/.idea/pwnagotchi.iml
+++ b/.idea/pwnagotchi.iml
@@ -4,7 +4,7 @@
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/venv" />
     </content>
-    <orderEntry type="jdk" jdkName="Python 3.10 (pwnagotchi)" jdkType="Python SDK" />
+    <orderEntry type="jdk" jdkName="Python 3.11 (pwnagotchi)" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
   <component name="PyDocumentationSettings">
diff --git a/builder/data/etc/systemd/system/bettercap.service b/builder/data/etc/systemd/system/bettercap.service
index edf17bac..ce8e8290 100644
--- a/builder/data/etc/systemd/system/bettercap.service
+++ b/builder/data/etc/systemd/system/bettercap.service
@@ -7,7 +7,7 @@ Wants=network.target
 Type=simple
 ExecStart=/usr/bin/bettercap-launcher
 Restart=always
-RestartSec=5
+RestartSec=30
 
 [Install]
 WantedBy=multi-user.target
diff --git a/builder/data/usr/bin/pwnlib b/builder/data/usr/bin/pwnlib
index 2046ac55..23827206 100755
--- a/builder/data/usr/bin/pwnlib
+++ b/builder/data/usr/bin/pwnlib
@@ -79,12 +79,12 @@ is_auto_mode() {
 
   # if usb0 is up, we're in MANU
   if is_interface_up usb0; then
-    return 0
+    return 1
   fi
 
   # if eth0 is up (for other boards), we're in MANU
   if is_interface_up eth0; then
-    return 0
+    return 1
   fi
 
   # no override, but none of the interfaces is up -> AUTO
diff --git a/builder/pwnagotchi.yml b/builder/pwnagotchi.yml
index 40f52e5c..6fa07d61 100644
--- a/builder/pwnagotchi.yml
+++ b/builder/pwnagotchi.yml
@@ -58,7 +58,6 @@
           - libpcap0.8
           - libpcap0.8-dev
         remove:
-          - dhcpcd5
           - nfs-common
           - raspberrypi-net-mods
           - triggerhappy
@@ -470,11 +469,27 @@
         # ui.display.type = "waveshare_2"
     when: not user_config.stat.exists
 
+  - name: Delete motd
+    file:
+      state: absent
+      path: /etc/motd
+
+  - name: Delete motd 10-uname
+    file:
+      state: absent
+      path: /etc/update-motd.d/10-uname
+
   - name: enable ssh on boot
     file:
       path: /boot/ssh
       state: touch
 
+  - name: disable wlan0 in dhcpcd.conf
+    lineinfile:
+      dest: /etc/dhcpcd.conf
+      insertafter: EOF
+      line: "denyinterfaces wlan0"
+
   - name: adjust /boot/config.txt
     lineinfile:
       dest: /boot/config.txt
diff --git a/pwnagotchi/_version.py b/pwnagotchi/_version.py
index 25cb3b49..fdc8312a 100644
--- a/pwnagotchi/_version.py
+++ b/pwnagotchi/_version.py
@@ -1 +1 @@
-__version__ = '2.4.5'
+__version__ = '2.4.6'