diff options
| author | Bernardo Meurer <bernardo@meurer.org> | 2022-04-22 13:16:33 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-22 13:16:33 -0700 |
| commit | 900a4404928950b792fab6df95d1dfb23018f82c (patch) | |
| tree | cd7b920ab48c407c19a196728b50594c79bce339 /nixos | |
| parent | b23ec41f14150780d12917e97fb01dc4bd886559 (diff) | |
| parent | adf3fe6811c62431b6cdbbac5cc7d6497927aa56 (diff) | |
| download | nixlib-900a4404928950b792fab6df95d1dfb23018f82c.tar nixlib-900a4404928950b792fab6df95d1dfb23018f82c.tar.gz nixlib-900a4404928950b792fab6df95d1dfb23018f82c.tar.bz2 nixlib-900a4404928950b792fab6df95d1dfb23018f82c.tar.lz nixlib-900a4404928950b792fab6df95d1dfb23018f82c.tar.xz nixlib-900a4404928950b792fab6df95d1dfb23018f82c.tar.zst nixlib-900a4404928950b792fab6df95d1dfb23018f82c.zip | |
Merge pull request #169842 from K900/unbreak-tests
nixos/tests/installer: unbreak, optimize
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/tests/installer.nix | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 30a5b5c45b36..ea2b2d04ed19 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -299,6 +299,13 @@ let virtualisation.qemu.diskInterface = 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; hardware.enableAllFirmware = mkForce false; @@ -313,6 +320,7 @@ let docbook5 docbook_xsl_ns kmod.dev + libarchive.dev libxml2.bin libxslt.bin nixos-artwork.wallpapers.simple-dark-gray-bottom |