Skip to content

nixos/console: add required store paths to initrd for systemd stage 1#178529

Merged
lheckemann merged 1 commit intoNixOS:masterfrom
oxalica:fix/systemd-initrd-vconsole
Jul 30, 2022
Merged

nixos/console: add required store paths to initrd for systemd stage 1#178529
lheckemann merged 1 commit intoNixOS:masterfrom
oxalica:fix/systemd-initrd-vconsole

Conversation

@oxalica
Copy link
Copy Markdown
Contributor

@oxalica oxalica commented Jun 22, 2022

Description of changes

Fixes #172403
Fixes #178340

cc @andersk @ncfavier

console.{font,keyMap} may be a path or a string to a store path, which should be added to initrd for systemd-vconsole-setup before the prompt for the LUKS password.

Tested with my configurations. The Caps Lock and Ctrl are swapped and the big font is set before the LUKS password prompt now.

{
  services.xserver.xkbOptions = "ctrl:swapcaps";
  console.font = "${pkgs.terminus_font}/share/consolefonts/ter-v28n.psf.gz";
  console.useXkbConfig = true;
}
Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • 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.11 Release Notes (or backporting 22.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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

`console.{font,keyMap}` may be a path or a string to a store path,
which should be added to initrd for `systemd-vconsole-setup` before
the prompt for the LUKS password.
@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 Jun 22, 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 Jun 22, 2022
Copy link
Copy Markdown
Member

@ncfavier ncfavier left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixes both issues for me!

@bobby285271 bobby285271 added the 12.approvals: 1 This PR was reviewed and approved by one person. label Jun 23, 2022
@lheckemann lheckemann merged commit bb7f88c into NixOS:master Jul 30, 2022
@oxalica oxalica deleted the fix/systemd-initrd-vconsole branch July 30, 2022 10:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

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. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

vconsole setup fails in systemd initrd hardware.video.hidpi.enable fails to set the console font early with systemd stage 1

4 participants