Skip to content

nixos/qemu-vm: declarative drives#55645

Merged
wmertens merged 1 commit intoNixOS:masterfrom
eonpatapon:qemu-vm-drives
Nov 4, 2019
Merged

nixos/qemu-vm: declarative drives#55645
wmertens merged 1 commit intoNixOS:masterfrom
eonpatapon:qemu-vm-drives

Conversation

@eonpatapon
Copy link
Contributor

@eonpatapon eonpatapon commented Feb 12, 2019

Adds virtualisation.qemu.drives option to specify drives to be used by
qemu.

Also fix boot when virtualisation.useBootLoader is set to true. Since
the boot disk is second qemu doesn't boot on it. Added bootindex=1 to
the boot disk device.

Motivation for this change

Wanted to use useBootLoader at first but it's broken. Tried to fix it but it was messy hence I decided to rewrite a bit the drives handling code.

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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@eonpatapon
nixos/qemu-vm: declarative drives
376b2ef 
Adds `virtualisation.qemu.drives` option to specify drives to be used by
qemu.

Also fix boot when `virtualisation.useBootLoader` is set to true. Since
the boot disk is second qemu doesn't boot on it. Added `bootindex=1` to
the boot disk device.
@GrahamcOfBorg GrahamcOfBorg 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/` 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 Feb 12, 2019
@matthewbauer
Copy link
Member

matthewbauer commented Feb 20, 2019

@GrahamcOfBorg test upnp virtualbox installer

@ElvishJerricco
Copy link
Contributor

ElvishJerricco commented Feb 25, 2019

This fixed useBootLoader for me (which consequently also fixed plymouth not working in qemu; for some reason you need grub for that)

@wmertens
Copy link
Contributor

wmertens commented Nov 4, 2019

@GrahamcOfBorg test upnp virtualbox installer

wmertens
wmertens approved these changes Nov 4, 2019
View reviewed changes
Copy link
Contributor

@wmertens wmertens left a comment

Choose a reason for hiding this comment

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

LGTM. Can't think of a reason not to merge this.

@wmertens wmertens merged commit 59e731b into NixOS:master Nov 4, 2019
@chkno chkno mentioned this pull request Jan 29, 2020
Closed
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@wmertens wmertens wmertens approved these changes

@infinisil infinisil Awaiting requested review from infinisil

Assignees

No one assigned

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.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@eonpatapon @matthewbauer @ElvishJerricco @wmertens @GrahamcOfBorg