Skip to content

sdboot-builder: fix crash in exception handling#162252

Merged
lukegb merged 1 commit intoNixOS:masterfrom
sternenseemann:systemd-boot-builder-fix-errors
Mar 13, 2022
Merged

sdboot-builder: fix crash in exception handling#162252
lukegb merged 1 commit intoNixOS:masterfrom
sternenseemann:systemd-boot-builder-fix-errors

Conversation

@sternenseemann
Copy link
Member

@sternenseemann sternenseemann commented Feb 28, 2022

Motivation for this change

Extracted the fix from #156798, so it may be reviewed, merged and backported quicker.

cc @m-bdf

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 22.05 Release Notes (or backporting 21.11 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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@sternenseemann sternenseemann requested a review from dasJ as a code owner February 28, 2022 18:15
@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 Feb 28, 2022
@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 Feb 28, 2022
@sternenseemann sternenseemann requested a review from lukegb March 13, 2022 12:59
lukegb
lukegb approved these changes Mar 13, 2022
View reviewed changes
@sternenseemann sternenseemann force-pushed the systemd-boot-builder-fix-errors branch from 732ce22 to 529b09a Compare March 13, 2022 13:38
@sternenseemann
Copy link
Member Author

sternenseemann commented Mar 13, 2022

@ofborg test systemd-boot

@lukegb lukegb merged commit 5f81753 into NixOS:master Mar 13, 2022
@sternenseemann sternenseemann deleted the systemd-boot-builder-fix-errors branch March 13, 2022 14:21
@github-actions github-actions bot mentioned this pull request Mar 13, 2022
Merged
1 task
@github-actions
Copy link
Contributor

github-actions bot commented Mar 13, 2022

Successfully created backport PR #164005 for release-21.11.

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

Reviewers

@lukegb lukegb lukegb approved these changes

@Mic92 Mic92 Awaiting requested review from Mic92

@FRidh FRidh Awaiting requested review from FRidh

@dasJ dasJ Awaiting requested review from dasJ

+1 more reviewer

@m-bdf m-bdf m-bdf approved these changes

Reviewers whose approvals may not affect merge requirements

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: 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.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@sternenseemann @lukegb @m-bdf