Merge branch 'pwnagotchi-torch-testing' into pwnagotchi-torch-64

bin/pwnagotchi

@@ -129,10 +129,10 @@ if __name__ == '__main__':
     args = parser.parse_args()
 
     if plugins_cmd.used_plugin_cmd(args):
-      config = utils.load_config(args)
+        config = utils.load_config(args)
-      log.setup_logging(args, config)
+        log.setup_logging(args, config)
-      rc = plugins_cmd.handle_cmd(args, config)
+        rc = plugins_cmd.handle_cmd(args, config)
-      sys.exit(rc)
+        sys.exit(rc)
 
     if args.version:
         print(pwnagotchi.__version__)

builder/pwnagotchi.yml

@@ -585,8 +585,10 @@
   - name: install old libpcap packages
     become_user: root
     apt:
-      deb: /usr/local/src/libpcap*
+      force: True
-      args: allow-downgrades
+      state: present
+      deb: "/usr/local/src/{{ item }}"
+    with_items: "{{ packages.apt.downgrade }}"
     register: libpcap
 
   - name: add firmware packages to hold

pwnagotchi/__init__.py

@@ -79,7 +79,7 @@ def _cpu_stat():
     Returns the splitted first line of the /proc/stat file
     """
     with open('/proc/stat', 'rt') as fp:
-        return list(map(int,fp.readline().split()[1:]))
+        return list(map(int, fp.readline().split()[1:]))
 
 
 def cpu_load(tag=None):
@@ -130,7 +130,7 @@ def shutdown():
 
 def restart(mode):
     logging.warning("restarting in %s mode ...", mode)
-
+    mode = mode.upper()
     if mode == 'AUTO':
         os.system("touch /root/.pwnagotchi-auto")
     else: