From ed3cc9672ad507ca4d00e15b35f3d24edd1dff6c Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 22 Apr 2022 21:03:46 +0300 Subject: [PATCH 1/2] nixos/tests/installer: add missing dependency to image Unbreaks nixosTests.installer.simple. --- nixos/tests/installer.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 30a5b5c45b3..364c69fcf09 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -313,6 +313,7 @@ let docbook5 docbook_xsl_ns kmod.dev + libarchive.dev libxml2.bin libxslt.bin nixos-artwork.wallpapers.simple-dark-gray-bottom From adf3fe6811c62431b6cdbbac5cc7d6497927aa56 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 22 Apr 2022 22:27:03 +0300 Subject: [PATCH 2/2] nixos/tests/installer: disable vlans for initial VM This saves 10-15 minutes of waiting for things to time out later. --- nixos/tests/installer.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 364c69fcf09..ea2b2d04ed1 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;