From a551021d176da21d914fc115a39226727771557e Mon Sep 17 00:00:00 2001 From: Jeroen Oudshoorn Date: Fri, 29 Sep 2023 20:47:57 +0200 Subject: [PATCH 1/5] Update bettercap.py Signed-off-by: Jeroen Oudshoorn --- pwnagotchi/bettercap.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pwnagotchi/bettercap.py b/pwnagotchi/bettercap.py index 695c20ce..f7ba7a71 100644 --- a/pwnagotchi/bettercap.py +++ b/pwnagotchi/bettercap.py @@ -99,7 +99,8 @@ class Client(object): continue except OSError: logging.warning('[bettercap] connection to the bettercap endpoint failed...') - pwnagotchi.reboot() + sleep(10) + continue def run(self, command, verbose_errors=True): while True: @@ -113,4 +114,4 @@ class Client(object): else: break - return decode(r, verbose_errors=verbose_errors) \ No newline at end of file + return decode(r, verbose_errors=verbose_errors) From 9576909af0fad0ec4d8af5e752a82bfd36f85501 Mon Sep 17 00:00:00 2001 From: Jeroen Oudshoorn Date: Fri, 29 Sep 2023 20:48:25 +0200 Subject: [PATCH 2/5] Update bettercap.service Signed-off-by: Jeroen Oudshoorn --- builder/data/etc/systemd/system/bettercap.service | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builder/data/etc/systemd/system/bettercap.service b/builder/data/etc/systemd/system/bettercap.service index 987d33ac..edf17bac 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=30 +RestartSec=5 [Install] -WantedBy=multi-user.target \ No newline at end of file +WantedBy=multi-user.target From 661d93636448a3ecb50fd33444006e46bca5169d Mon Sep 17 00:00:00 2001 From: Jeroen Oudshoorn Date: Fri, 29 Sep 2023 20:54:16 +0200 Subject: [PATCH 3/5] Update bettercap.py Signed-off-by: Jeroen Oudshoorn --- pwnagotchi/bettercap.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pwnagotchi/bettercap.py b/pwnagotchi/bettercap.py index f7ba7a71..55fe9fb4 100644 --- a/pwnagotchi/bettercap.py +++ b/pwnagotchi/bettercap.py @@ -99,7 +99,7 @@ class Client(object): continue except OSError: logging.warning('[bettercap] connection to the bettercap endpoint failed...') - sleep(10) + await asyncio.sleep(10) continue def run(self, command, verbose_errors=True): From 6cdd8c0e360d443dc687bc5d72f97dd421471a9b Mon Sep 17 00:00:00 2001 From: Jeroen Oudshoorn Date: Sat, 30 Sep 2023 15:21:21 +0200 Subject: [PATCH 4/5] Update bettercap.py --- pwnagotchi/bettercap.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pwnagotchi/bettercap.py b/pwnagotchi/bettercap.py index 55fe9fb4..0bdd95ee 100644 --- a/pwnagotchi/bettercap.py +++ b/pwnagotchi/bettercap.py @@ -99,8 +99,8 @@ class Client(object): continue except OSError: logging.warning('[bettercap] connection to the bettercap endpoint failed...') - await asyncio.sleep(10) - continue + pwnagotchi.reboot() + def run(self, command, verbose_errors=True): while True: From 8db28055a6bf1004a240aca103bf5de4947b7789 Mon Sep 17 00:00:00 2001 From: Jeroen Oudshoorn Date: Sat, 30 Sep 2023 15:30:27 +0200 Subject: [PATCH 5/5] Update __init__.py --- pwnagotchi/__init__.py | 1 - 1 file changed, 1 deletion(-) diff --git a/pwnagotchi/__init__.py b/pwnagotchi/__init__.py index a7f549dd..4387579b 100644 --- a/pwnagotchi/__init__.py +++ b/pwnagotchi/__init__.py @@ -166,4 +166,3 @@ def reboot(mode=None): os.system("sync") os.system("shutdown -r now") - os.system("service pwnagotchi restart")