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.

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 basic test #85029

Merged
merged 1 commit into from May 5, 2020
Merged

nixos/systemd-boot: Add basic test #85029

merged 1 commit into from May 5, 2020

Conversation

danielfullmer
Copy link
Contributor

Motivation for this change

I extracted this from a more complicated PR testing systemd-boot functionality: #84204

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@danielfullmer danielfullmer mentioned this pull request Apr 11, 2020
Closed
@flokli flokli added this to To Do in systemd via automation May 4, 2020
flokli
flokli reviewed May 4, 2020
View reviewed changes
Copy link
Contributor

@flokli flokli left a comment

Choose a reason for hiding this comment

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

Sorry, this fell off my radar. Some comments.

nixos/modules/virtualisation/qemu-vm.nix Outdated Show resolved Hide resolved
nixos/modules/virtualisation/qemu-vm.nix Show resolved Hide resolved
nixos/modules/virtualisation/qemu-vm.nix Outdated Show resolved Hide resolved
nixos/tests/all-tests.nix Show resolved Hide resolved
nixos/tests/systemd-boot.nix Show resolved Hide resolved
@danielfullmer
Copy link
Contributor Author

danielfullmer commented May 4, 2020 •
edited

@flokli Just added a new commit addressing the feedback. I also got rid of SYSTEMD_RELAX_ESP_CHECKS by instead adding a link for /dev/block/254:2 so systemd-boot can detect the ESP partition and properly set up the vars needed for EFI boot. (It was also needed for the tests I've been working on for secure boot).

I can squash these commits before merging if you'd like.

@flokli
Copy link
Contributor

flokli commented May 5, 2020

@danielfullmer can you squash the two commits into one? Otherwise, this LGTM.

@danielfullmer
Copy link
Contributor Author

@flokli OK. Squashed, rebased against master, and tested building nixosTests.systemd-boot.

@flokli flokli merged commit cc91092 into NixOS:master May 5, 2020
systemd automation moved this from To Do to Done May 5, 2020
@flokli
Copy link
Contributor

flokli commented May 5, 2020

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@flokli flokli flokli approved these changes

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

Successfully merging this pull request may close these issues.

None yet
2 participants
@danielfullmer @flokli