Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

nixos/systemd-boot: Add consoleMode option #42877

Merged
merged 1 commit into from Aug 4, 2018
Merged

nixos/systemd-boot: Add consoleMode option #42877

merged 1 commit into from Aug 4, 2018

Conversation

infinisil
Copy link
Member

@infinisil infinisil commented Jul 2, 2018 •
edited

Motivation for this change

Closes #41714. I think this warrants its own option.

@davidtwco can you test this PR?

Ping @Mic92 @KaiHa @grahamc @shlevy @aszlig

@GrahamcOfBorg test installer.simpleUefiSystemdBoot

I successfully ran the installer.simpleUefiSystemdBoot test.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Fits CONTRIBUTING.md.

@davidtwco
Copy link
Member

@infinisil Sadly, I don't currently have access to a NixOS machine to test this at the moment.

@Mic92
Copy link
Member

Mic92 commented Jul 3, 2018

@GrahamcOfBorg build installer.simpleUefiSystemdBoot

@Mic92
Copy link
Member

Mic92 commented Jul 3, 2018

@GrahamcOfBorg test installer.simpleUefiSystemdBoot

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: installer.simpleUefiSystemdBoot

Partial log (click to expand)

Cannot nix-instantiate `installer.simpleUefiSystemdBoot' because:
�[31;1merror:�[0m attribute 'installer' in selection path 'installer.simpleUefiSystemdBoot' not found

@GrahamcOfBorg
Copy link

No attempt on aarch64-linux (full log)

The following builds were skipped because they don't evaluate on aarch64-linux: installer.simpleUefiSystemdBoot

Partial log (click to expand)

Cannot nix-instantiate `installer.simpleUefiSystemdBoot' because:
error: attribute 'installer' in selection path 'installer.simpleUefiSystemdBoot' not found

@GrahamcOfBorg
Copy link

No attempt on x86_64-linux (full log)

The following builds were skipped because they don't evaluate on x86_64-linux: installer.simpleUefiSystemdBoot

Partial log (click to expand)

Cannot nix-instantiate `installer.simpleUefiSystemdBoot' because:
error: attribute 'installer' in selection path 'installer.simpleUefiSystemdBoot' not found

@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Attempted: tests.installer.simpleUefiSystemdBoot

Partial log (click to expand)

machine: exit status 1
machine: output:
error: command `nixos-install < /dev/null >&2' did not succeed (exit code 1)
command `nixos-install < /dev/null >&2' did not succeed (exit code 1)
cleaning up
killing machine (pid 627)
vde_switch: EOF on stdin, cleaning up and exiting
vde_switch: Could not remove ctl dir '/build/vde1.ctl': Directory not empty
builder for '/nix/store/az4d2jdb77rsid9w8qfwdg9rgv3lix0n-vm-test-run-installer-simpleUefiSystemdBoot.drv' failed with exit code 255
error: build of '/nix/store/az4d2jdb77rsid9w8qfwdg9rgv3lix0n-vm-test-run-installer-simpleUefiSystemdBoot.drv' failed

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: tests.installer.simpleUefiSystemdBoot

Partial log (click to expand)

machine# [    7.510805] systemd-shutdown[1]: All loop devices detached.
machine# [    7.511324] systemd-shutdown[1]: Detaching DM devices.
machine# [    7.514048] ACPI: Preparing to enter system sleep state S5
machine# [    7.514553] reboot: Power down
collecting coverage data
syncing
test script finished in 368.15s
vde_switch: EOF on stdin, cleaning up and exiting
cleaning up
/nix/store/9g7i8j0c8isrxkj1h9fq8l7x17iswybm-vm-test-run-installer-simpleUefiSystemdBoot

@matthewbauer
Copy link
Member

Looks good to me! It would also be nice to have an extraConfig option to put into loader.conf.

@infinisil
Copy link
Member Author

Maybe eventually, when the need arises. Can this be merged like this for now?

@infinisil infinisil merged commit 31dda06 into NixOS:master Aug 4, 2018
@infinisil infinisil deleted the systemd-boot/consoleMode branch August 4, 2018 21:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@matthewbauer matthewbauer matthewbauer approved these changes

Assignees
No one assigned
Labels
6.topic: nixos 8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@infinisil @davidtwco @Mic92 @GrahamcOfBorg @matthewbauer