chrissewell/pwnagotchi
1
0
Fork 0
mirror of https://github.com/jayofelony/pwnagotchi.git synced 2025-07-01 18:37:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jeroen Oudshoorn
2024-01-10 20:43:48 +01:00
parent f0f9f8b964
commit a7f42adde0
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pwnagotchi/utils.py
View File

@ -165,10 +165,12 @@ 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/firmware/config.yml', '/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):
merge_config(boot_conf, args.user_config)
# logging not configured here yet # logging not configured here yet
print("installing %s to %s ...", boot_conf, args.user_config) print("installing new %s to %s ...", boot_conf, args.user_config)
# https://stackoverflow.com/questions/42392600/oserror-errno-18-invalid-cross-device-link # https://stackoverflow.com/questions/42392600/oserror-errno-18-invalid-cross-device-link
shutil.move(boot_conf, args.user_config) shutil.move(boot_conf, args.user_config)
break break