Skip to content

nixos/systemd-boot: allow for bootspec-less generations#267985

Merged
RaitoBezarius merged 1 commit intoNixOS:masterfrom
JulienMalka:absent-bootspec
Nov 17, 2023
Merged

nixos/systemd-boot: allow for bootspec-less generations#267985
RaitoBezarius merged 1 commit intoNixOS:masterfrom
JulienMalka:absent-bootspec

Conversation

@JulienMalka
Copy link
Member

@JulienMalka JulienMalka commented Nov 16, 2023 •
edited
Loading

The systemd-boot loader is now relying on bootspec documents, but generation built with old versions of NixOS with no bootspec support may still be present on the system and must be accounted for.

Thanks @RaitoBezarius for noticing this behavior.

Description of changes

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.11 Release Notes (or backporting 23.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@JulienMalka JulienMalka requested a review from dasJ as a code owner November 16, 2023 23:50
@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Nov 16, 2023
RaitoBezarius
RaitoBezarius reviewed Nov 16, 2023
View reviewed changes
@RaitoBezarius
Copy link
Member

RaitoBezarius commented Nov 16, 2023

@ofborg test no-bootspec

@RaitoBezarius
Copy link
Member

RaitoBezarius commented Nov 16, 2023

@ofborg test systemd-boot.no-bootspec

1 similar comment
@JulienMalka
Copy link
Member Author

JulienMalka commented Nov 16, 2023 •
edited
Loading

@ofborg test systemd-boot.no-bootspec

@delroth delroth added the 12.approvals: 1 This PR was reviewed and approved by one person. label Nov 17, 2023
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Nov 17, 2023
@JulienMalka
Copy link
Member Author

JulienMalka commented Nov 17, 2023

So the ofborg run made me realize the synthesize tool is not working for aarch64-linux, I've opened a PR upstream and added a patch for now.

@delroth delroth removed the 12.approvals: 1 This PR was reviewed and approved by one person. label Nov 17, 2023
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. and removed 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. labels Nov 17, 2023
@JulienMalka JulienMalka mentioned this pull request Nov 17, 2023
Merged
6 tasks
@JulienMalka
nixos/systemd-boot: allow for bootspec-less generations
81e3786 
Generation built with old versions of NixOS with no bootspec
support may still be present on the system and must be
accounted for.
RaitoBezarius
RaitoBezarius approved these changes Nov 17, 2023
View reviewed changes
Copy link
Member

@RaitoBezarius RaitoBezarius left a comment

Choose a reason for hiding this comment

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

Can confirm this fixes my activation on bootspec-less generations.

@delroth delroth added the 12.approvals: 1 This PR was reviewed and approved by one person. label Nov 17, 2023
@RaitoBezarius RaitoBezarius merged commit 65481ec into NixOS:master Nov 17, 2023
@JulienMalka JulienMalka deleted the absent-bootspec branch November 17, 2023 17:52
@tpwrules tpwrules mentioned this pull request Nov 18, 2023
Closed
@nrbray
Copy link

nrbray commented Nov 18, 2023

I've reverted after my error in #268313 to inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05"; and the systemd-boot issue is gone

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@RaitoBezarius RaitoBezarius RaitoBezarius approved these changes

@dasJ dasJ Awaiting requested review from dasJ

@grahamc grahamc Awaiting requested review from grahamc

@Hoverbear Hoverbear Awaiting requested review from Hoverbear

@cole-h cole-h Awaiting requested review from cole-h

@lheckemann lheckemann Awaiting requested review from lheckemann

Assignees

No one assigned

Labels

6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@JulienMalka @RaitoBezarius @nrbray @delroth