diff options
| author | Eelco Dolstra | 2016-03-30 22:21:56 +0200 |
|---|---|---|
| committer | Eelco Dolstra | 2016-03-31 13:32:56 +0200 |
| commit | a2b526d41a1bba39528a97a1403b7b0e0d96cded (patch) | |
| tree | fb05822ba7aa66e96ed36a2bfe4e7cf85bc738f8 | |
| parent | daf0729f3adc9a902ccdea54b16e5b6aa03d990d (diff) | |
Fix the boot-ec2-config test
(cherry picked from commit 1783e33b060abce8471219b582195b30eee6e9c9)
| -rw-r--r-- | nixos/modules/profiles/headless.nix | 3 | ||||
| -rw-r--r-- | nixos/tests/ec2.nix | 8 |
2 files changed, 11 insertions, 0 deletions
diff --git a/nixos/modules/profiles/headless.nix b/nixos/modules/profiles/headless.nix index 4be0fb442161..67f8d633bab5 100644 --- a/nixos/modules/profiles/headless.nix +++ b/nixos/modules/profiles/headless.nix @@ -20,4 +20,7 @@ with lib; # Don't allow emergency mode, because we don't have a console. systemd.enableEmergencyMode = false; + + # Being headless, we don't need a GRUB splash image. + boot.loader.grub.splashImage = null; } diff --git a/nixos/tests/ec2.nix b/nixos/tests/ec2.nix index 597bfe89fb02..e1f7143e3a95 100644 --- a/nixos/tests/ec2.nix +++ b/nixos/tests/ec2.nix @@ -20,6 +20,14 @@ let ln -s vda /dev/xvda ln -s vda1 /dev/xvda1 ''; + + # Needed by nixos-rebuild due to the lack of network + # access. Mostly copied from + # modules/profiles/installation-device.nix. + system.extraDependencies = + [ pkgs.stdenv pkgs.busybox pkgs.perlPackages.ArchiveCpio + pkgs.unionfs-fuse pkgs.mkinitcpio-nfs-utils + ]; } ]; }).config.system.build.amazonImage; |