systemd-boot: Revert boot counting again #334526
Merged
+76
−438
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.
Description of changes
Unfortunately, with the specialisation-related regression caused by boot counting, and fixes like #334473 being generally hasty and unsatisfactory, the most effective way to unblock the unstable channel is to simply revert boot counting.
This was made a little tricky, as there were three, other, PRs that were merged for systemd-boot this week, which interfered with the revert. I believe I've preserved those PRs correctly, and all systemd-boot tests seem to pass, including the
specialisation
one on aarch64 (it's the only one testing thedevicetree
change).Things done
nix.conf
? (See Nix manual)sandbox = relaxed
sandbox = true
nix-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.