diff options
Diffstat (limited to 'nixos/tests/installer.nix')
| -rw-r--r-- | nixos/tests/installer.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index a6afe8a4b72a..c1dae2a34fa3 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -18,6 +18,9 @@ let <nixpkgs/nixos/modules/testing/test-instrumentation.nix> ]; + # To ensure that we can rebuild the grub configuration on the nixos-rebuild + system.extraDependencies = with pkgs; [ stdenvNoCC ]; + ${optionalString (bootLoader == "grub") '' boot.loader.grub.version = ${toString grubVersion}; ${optionalString (grubVersion == 1) '' @@ -71,7 +74,7 @@ let # Make sure that we get a login prompt etc. $machine->succeed("echo hello"); #$machine->waitForUnit('getty@tty2'); - $machine->waitForUnit("rogue"); + #$machine->waitForUnit("rogue"); $machine->waitForUnit("nixos-manual"); # Wait for hard disks to appear in /dev @@ -270,7 +273,7 @@ in { }; # Simple GPT/UEFI configuration using systemd-boot with 3 partitions: ESP, swap & root filesystem - simpleUefiGummiboot = makeInstallerTest "simpleUefiGummiboot" + simpleUefiSystemdBoot = makeInstallerTest "simpleUefiSystemdBoot" { createPartitions = '' $machine->succeed( |