gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/systemd-boot: refactor json.load() logic for better error message (#421916)

Browse Source
This commit is contained in:
Will Fancher
2025-07-27 23:08:42 -04:00
committed by GitHub
parent 991e546fab dedf852ccd
commit 4b3b18a44f
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
View File

@@ -116,10 +116,15 @@ def write_loader_conf(profile: str | None, generation: int, specialisation: str
def get_bootspec(profile: str | None, generation: int) -> BootSpec: def get_bootspec(profile: str | None, generation: int) -> BootSpec:
system_directory = system_dir(profile, generation, None) system_directory = system_dir(profile, generation, None)
boot_json_path = os.path.realpath("%s/%s" % (system_directory, "boot.json")) boot_json_path = os.path.join(system_directory, "boot.json")
if os.path.isfile(boot_json_path): if os.path.isfile(boot_json_path):
boot_json_f = open(boot_json_path, 'r') with open(boot_json_path, 'r') as boot_json_f:
# check if json is well-formed, else throw error with filepath
try:
bootspec_json = json.load(boot_json_f) bootspec_json = json.load(boot_json_f)
except ValueError as e:
print(f"error: Malformed Json: {e}, in {boot_json_path}", file=sys.stderr)
sys.exit(1)
else: else:
boot_json_str = run( boot_json_str = run(
[ [