systemd: revert boot-breaking systemd-boot change#355290
systemd: revert boot-breaking systemd-boot change#355290ElvishJerricco merged 1 commit intoNixOS:stagingfrom
Conversation
Fixes boot for me. Closes: NixOS#355284
github-actions
bot
added
the
6.topic: systemd
emilazy
left a comment
emilazy
left a comment
There was a problem hiding this comment.
SGTM since this is trading a QEMU VM boot bug for something that breaks boot on a bunch of real and popular hardware, and the patch appears to be fundamentally incorrect. But I’ll let @ElvishJerricco look at this too.
| ./0015-tpm2_context_init-fix-driver-name-checking.patch | ||
| ./0016-systemctl-edit-suggest-systemdctl-edit-runtime-on-sy.patch | ||
| ./0017-meson.build-do-not-create-systemdstatedir.patch | ||
| ./0019-Revert-boot-Make-initrd_prepare-semantically-equival.patch |
There was a problem hiding this comment.
Should this only apply for aarch64? Or is it possible for x86 and other architectures EFI support could be affected?
There was a problem hiding this comment.
An AMD Opteron that could theoretically be affected by this was mentioned in the upstream issue, though AFAICT nobody has reported whether it actually is in practice or not. Also conditional patches are just evil and we should avoid platform divergence wherever possible.
ElvishJerricco
left a comment
ElvishJerricco
left a comment
There was a problem hiding this comment.
LGTM. There was a conflict in the revert, so I double checked that you've resolved it correctly just in case. I've also built systemdMinimal with this and it builds ok. Thanks!
|
Backport failed for |
|
Successfully created backport PR for |
4 participants
Fixes boot for me.
Closes: #355284
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.