Revert "systemd: revert boot-breaking systemd-boot change"#356686
Merged
emilazy merged 1 commit intoNixOS:stagingfrom Nov 17, 2024
Merged
Revert "systemd: revert boot-breaking systemd-boot change"#356686emilazy merged 1 commit intoNixOS:stagingfrom
emilazy merged 1 commit intoNixOS:stagingfrom
Conversation
This was incorporated upstream in v256.8 as <systemd/systemd@a9d9db7>. This reverts commit 63ce466. Fixes: 6fc6e7b
github-actions
bot
added
the
6.topic: systemd
Member
Author
|
Built |
Member
Author
|
Edit: No, it’s the same patch and it was just a classic Nix tarball TTL issue. |
Contributor
|
Backport failed for Please cherry-pick the changes locally and resolve any conflicts. git fetch origin release-24.11
git worktree add -d .worktree/backport-356686-to-release-24.11 origin/release-24.11
cd .worktree/backport-356686-to-release-24.11
git switch --create backport-356686-to-release-24.11
git cherry-pick -x 19853b79530b5c99e5e1412aaf9721e0ec3b70bb |
Contributor
|
Successfully created backport PR for |
1 task
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This was incorporated upstream in v256.8 as systemd/systemd@a9d9db7.
This reverts commit 63ce466.
Fixes: 6fc6e7b
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.