diff --git a/bin/pwnagotchi b/bin/pwnagotchi index 7c8cd457..4efc9def 100755 --- a/bin/pwnagotchi +++ b/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) - log.setup_logging(args, config) - rc = plugins_cmd.handle_cmd(args, config) - sys.exit(rc) + config = utils.load_config(args) + log.setup_logging(args, config) + rc = plugins_cmd.handle_cmd(args, config) + sys.exit(rc) if args.version: print(pwnagotchi.__version__) diff --git a/builder/pwnagotchi.yml b/builder/pwnagotchi.yml index f2c3dcf0..e0e320e7 100644 --- a/builder/pwnagotchi.yml +++ b/builder/pwnagotchi.yml @@ -585,8 +585,10 @@ - name: install old libpcap packages become_user: root apt: - deb: /usr/local/src/libpcap* - args: allow-downgrades + force: True + state: present + deb: "/usr/local/src/{{ item }}" + with_items: "{{ packages.apt.downgrade }}" register: libpcap - name: add firmware packages to hold diff --git a/pwnagotchi/__init__.py b/pwnagotchi/__init__.py index d0b1ed41..a7f549dd 100644 --- a/pwnagotchi/__init__.py +++ b/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: