public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/qemu-vm: Refactor: Combine duplicate disk definitions

Browse Source
This commit is contained in:
Chuck 2020-01-28 13:54:46 -08:00
parent 83eb5ed90c
commit 800639f287
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
nixos/modules/virtualisation/qemu-vm.nix
View File

@ -542,25 +542,18 @@ in
]; ];
virtualisation.qemu.drives = mkMerge [ virtualisation.qemu.drives = mkMerge [
[{
file = "$NIX_DISK_IMAGE";
driveExtraOpts.cache = "writeback";
driveExtraOpts.werror = "report";
}]
(mkIf cfg.useBootLoader [ (mkIf cfg.useBootLoader [
{
file = "$NIX_DISK_IMAGE";
driveExtraOpts.cache = "writeback";
driveExtraOpts.werror = "report";
}
{ {
file = "$TMPDIR/disk.img"; file = "$TMPDIR/disk.img";
driveExtraOpts.media = "disk"; driveExtraOpts.media = "disk";
deviceExtraOpts.bootindex = "1"; deviceExtraOpts.bootindex = "1";
} }
]) ])
(mkIf (!cfg.useBootLoader) [
{
file = "$NIX_DISK_IMAGE";
driveExtraOpts.cache = "writeback";
driveExtraOpts.werror = "report";
}
])
(imap0 (idx: _: { (imap0 (idx: _: {
file = "$(pwd)/empty${toString idx}.qcow2"; file = "$(pwd)/empty${toString idx}.qcow2";
driveExtraOpts.werror = "report"; driveExtraOpts.werror = "report";