Skip to content

systemd: fix systemd-boot keyboard handling lockup#144422

Merged
flokli merged 1 commit intoNixOS:stagingfrom
anund:systemd-boot-keyboard-issue
Nov 5, 2021
Merged

systemd: fix systemd-boot keyboard handling lockup#144422
flokli merged 1 commit intoNixOS:stagingfrom
anund:systemd-boot-keyboard-issue

Conversation

@anund
Copy link
Contributor

@anund anund commented Nov 3, 2021

In v248 compiler weirdness and refactoring lead to the bootloader
erroring out handling keyboard input on some systems. This leaves
users on unstable unable to select anything other than the currently
selected generation during a boot.
See systemd/systemd#19191

This should be redundant in v249.6 when it officially gets tagged in
systemd-stable.

Closes #143847

Motivation for this change
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 via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • 21.11 Release Notes (or backporting 21.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.

@github-actions github-actions bot added the 6.topic: systemd Software suite that provides an array of system components for Linux operating systems. label Nov 3, 2021
@anund
Copy link
Contributor Author

anund commented Nov 3, 2021

Building the whole world over night to double check the override applied in #143847 isn't somehow wrong when added directly.

@ofborg ofborg bot requested review from andir, edolstra, flokli and kloenk November 3, 2021 11:41
@ofborg ofborg bot added 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Nov 3, 2021
@flokli
Copy link
Member

flokli commented Nov 4, 2021

IIRC, this would need to target staging.

@anund anund changed the base branch from master to staging November 5, 2021 06:39
@ofborg ofborg bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Nov 5, 2021
@anund anund changed the base branch from staging to master November 5, 2021 06:49
@anund
Copy link
Contributor Author

anund commented Nov 5, 2021

@flokli that's staging in nixpkgs, ya? Somewhat unfamiliar with the branching process here. Preparing a staging based change in the background.

@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Nov 5, 2021
In v248 compiler weirdness and refactoring lead to the bootloader
erroring out handling keyboard input on some systems.
See systemd/systemd#19191

This should be redundant in v249.6 when it officially gets tagged in
systemd-stable.

Closes NixOS#143847
@anund
Copy link
Contributor Author

anund commented Nov 5, 2021

Status: rebuilding on master with this change results in a working systemd-boot process. I required #144429 in order to fix an existing, broken bootloader already on version v249.4. That change or something like it will be required for anyone who is currently broken.

@kloenk
Copy link
Member

kloenk commented Nov 5, 2021

Yes, the staging branch in this repo (nixpkgs).

(The reason is that this is a mass rebuild, staging makes it a bit easier on hydra the build farm)

@anund
Copy link
Contributor Author

anund commented Nov 5, 2021

👍 It took ~17 hours on a affected laptop to build and test this the master version of this change.

@github-actions github-actions bot added 6.topic: printing Drivers, CUPS & Co. 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: qt/kde Object-oriented framework for GUI creation 6.topic: rust General-purpose programming language emphasizing performance, type safety, and concurrency. 6.topic: stdenv Standard environment 6.topic: steam Steam game store/launcher (store.steampowered.com) 6.topic: vim Advanced text editor 8.has: changelog This PR adds or changes release notes 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` and removed 6.topic: printing Drivers, CUPS & Co. 6.topic: rust General-purpose programming language emphasizing performance, type safety, and concurrency. 8.has: module (update) This PR changes an existing module in `nixos/` 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: stdenv Standard environment 8.has: documentation This PR adds or changes documentation 6.topic: kernel The Linux kernel 8.has: changelog This PR adds or changes release notes 6.topic: qt/kde Object-oriented framework for GUI creation 6.topic: vim Advanced text editor 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: steam Steam game store/launcher (store.steampowered.com) labels Nov 5, 2021
@anund
Copy link
Contributor Author

anund commented Nov 5, 2021

:\ sorry everyone, I changed base in the wrong order freaking out the auto tagging/pr action.

@ofborg ofborg bot added 2.status: merge conflict This PR has merge conflicts with the target branch and removed 2.status: merge conflict This PR has merge conflicts with the target branch labels Nov 5, 2021
@anund
Copy link
Contributor Author

anund commented Nov 5, 2021

Regarding staging/master. Systemd is on v.249.5 on staging and v249.4 on master so staging is required to avoid merge shenanigans later.

@flokli flokli merged commit e48e2cf into NixOS:staging Nov 5, 2021
@anund anund deleted the systemd-boot-keyboard-issue branch November 6, 2021 06:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: systemd Software suite that provides an array of system components for Linux operating systems. 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Systemd-boot fails to recognize keyboard input on some systems

3 participants