Merge pull request #169842 from K900/unbreak-tests
nixos/tests/installer: unbreak, optimize
This commit is contained in:
commit
900a440492
|
@ -299,6 +299,13 @@ let
|
||||||
virtualisation.qemu.diskInterface =
|
virtualisation.qemu.diskInterface =
|
||||||
if grubVersion == 1 then "scsi" else "virtio";
|
if grubVersion == 1 then "scsi" else "virtio";
|
||||||
|
|
||||||
|
# We don't want to have any networking in the guest whatsoever.
|
||||||
|
# Also, if any vlans are enabled, the guest will reboot
|
||||||
|
# (with a different configuration for legacy reasons),
|
||||||
|
# and spend 5 minutes waiting for the vlan interface to show up
|
||||||
|
# (which will never happen).
|
||||||
|
virtualisation.vlans = [];
|
||||||
|
|
||||||
boot.loader.systemd-boot.enable = mkIf (bootLoader == "systemd-boot") true;
|
boot.loader.systemd-boot.enable = mkIf (bootLoader == "systemd-boot") true;
|
||||||
|
|
||||||
hardware.enableAllFirmware = mkForce false;
|
hardware.enableAllFirmware = mkForce false;
|
||||||
|
@ -313,6 +320,7 @@ let
|
||||||
docbook5
|
docbook5
|
||||||
docbook_xsl_ns
|
docbook_xsl_ns
|
||||||
kmod.dev
|
kmod.dev
|
||||||
|
libarchive.dev
|
||||||
libxml2.bin
|
libxml2.bin
|
||||||
libxslt.bin
|
libxslt.bin
|
||||||
nixos-artwork.wallpapers.simple-dark-gray-bottom
|
nixos-artwork.wallpapers.simple-dark-gray-bottom
|
||||||
|
|
Loading…
Reference in a new issue