Merging config.toml from /boot/{firmware} so only small changes apply.

This commit is contained in:
Jeroen Oudshoorn
2024-01-10 20:47:59 +01:00
parent a7f42adde0
commit 881e0ee146

View File

@ -165,9 +165,11 @@ def load_config(args):
ref_defaults_data = None ref_defaults_data = None
# check for a config.yml file on /boot/firmware # 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(boot_conf):
if os.path.exists(args.user_config): 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) merge_config(boot_conf, args.user_config)
# logging not configured here yet # logging not configured here yet
print("installing new %s to %s ...", boot_conf, args.user_config) print("installing new %s to %s ...", boot_conf, args.user_config)