Skip to content

nixos/systemd-boot: fix conditional, undefined variable #132688

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
cole-h wants to merge 2 commits into from
Closed

nixos/systemd-boot: fix conditional, undefined variable #132688

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
18d4799
nixos/systemd-boot: fix profile conditional
cole-h Aug 4, 2021
b486319
nixos/systemd-boot: fix undefined reference to `profile`
cole-h Aug 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,8 @@ def remove_old_entries(gens: List[Tuple[Optional[str], int]]) -> None:
else:
prof = "system"
Copy link
Member

@Mic92 Mic92 Dec 3, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we than not just set this to None?

Suggested change
prof = "system"
prof = None

gen_number = int(rex_generation.sub(r"\1", path))
if not (prof, gen_number) in gens:
profile = prof if prof != "system" else None
if not (profile, gen_number) in gens:
os.unlink(path)
except ValueError:
pass
Expand Down Expand Up @@ -241,7 +242,7 @@ def main() -> None:
if os.readlink(system_dir(*gen)) == args.default_config:
write_loader_conf(*gen)
except OSError as e:
print("ignoring profile '{}' in the list of boot entries because of the following error:\n{}".format(profile, e), file=sys.stderr)
print("ignoring profile '{}' in the list of boot entries because of the following error:\n{}".format(gen[0] if gen[0] else "system", e), file=sys.stderr)
Copy link
Member

@Mic92 Mic92 Dec 3, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
print("ignoring profile '{}' in the list of boot entries because of the following error:\n{}".format(gen[0] if gen[0] else "system", e), file=sys.stderr)
profile = gen[0] or "system"
print("ignoring profile '{}' in the list of boot entries because of the following error:\n{}".format(profile, e), file=sys.stderr)

Copy link
Contributor

@miallo miallo Feb 3, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Related to #155054


memtest_entry_file = "@efiSysMountPoint@/loader/entries/memtest86.conf"
if os.path.exists(memtest_entry_file):
Expand Down