From 881e0ee14671d5685e2add133988d0e9de16d4cf Mon Sep 17 00:00:00 2001 From: Jeroen Oudshoorn Date: Wed, 10 Jan 2024 20:47:59 +0100 Subject: [PATCH] Merging config.toml from /boot/{firmware} so only small changes apply. --- pwnagotchi/utils.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pwnagotchi/utils.py b/pwnagotchi/utils.py index 9e259f0b..318b7d64 100644 --- a/pwnagotchi/utils.py +++ b/pwnagotchi/utils.py @@ -165,9 +165,11 @@ def load_config(args): ref_defaults_data = None # check for a config.yml file on /boot/firmware - for boot_conf in ['/boot/config.yml', '/boot/firmware/config.yml', '/boot/config.toml', '/boot/firmware/config.toml']: + for boot_conf in ['/boot/config.yml', '/boot/firmware/config.yml', + '/boot/config.toml', '/boot/firmware/config.toml']: if os.path.exists(boot_conf): if os.path.exists(args.user_config): + # if /etc/pwnagotchi/config.toml already exists we just merge the new config merge_config(boot_conf, args.user_config) # logging not configured here yet print("installing new %s to %s ...", boot_conf, args.user_config)