raspberrypi/rpi-eeprom
1
0
Fork 0
mirror of https://github.com/raspberrypi/rpi-eeprom.git synced 2026-01-20 21:13:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

rpi-eeprom-config: Fix calls for reading/replacing bootconf.txt

Browse Source 
The config read/update APIs have been replaced with generic
read/replace 'boot file' APIs in order to support secure-boot.

The previous secure-boot related commits  broke the interactive
rpi-eeprom-config --edit/-a options.
This commit is contained in:
Tim Gover
2021-11-23 11:26:27 +00:00
parent 3e56160f8b
commit 12907d02ff
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rpi-eeprom-config
View File

@@ -140,9 +140,13 @@ def apply_update(config, eeprom=None, config_src=None):
else: else:
eeprom_image = get_latest_eeprom() eeprom_image = get_latest_eeprom()
create_tempdir() create_tempdir()
# Replace the contents of bootconf.txt with the contents of the config file
tmp_update = os.path.join(TEMP_DIR, 'pieeprom.upd') tmp_update = os.path.join(TEMP_DIR, 'pieeprom.upd')
image = BootloaderImage(eeprom_image, tmp_update) image = BootloaderImage(eeprom_image, tmp_update)
image.write(config) image.update_file(config, BOOTCONF_TXT)
image.write()
config_str = open(config).read() config_str = open(config).read()
if config_src is None: if config_src is None:
config_src = '' config_src = ''
@@ -176,7 +180,7 @@ def edit_config(eeprom=None):
if os.path.exists(pending): if os.path.exists(pending):
config_src = pending config_src = pending
image = BootloaderImage(pending) image = BootloaderImage(pending)
current_config = image.get_config().decode('utf-8') current_config = image.get_file(BOOTCONF_TXT).decode('utf-8')
else: else:
current_config, config_src = read_current_config() current_config, config_src = read_current_config()