From 1783e33b060abce8471219b582195b30eee6e9c9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 30 Mar 2016 22:21:56 +0200
Subject: [PATCH] Fix the boot-ec2-config test

---
 nixos/modules/profiles/headless.nix | 3 +++
 nixos/tests/ec2.nix                 | 8 ++++++++
 2 files changed, 11 insertions(+)

diff --git a/nixos/modules/profiles/headless.nix b/nixos/modules/profiles/headless.nix
index 4be0fb44216..67f8d633bab 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 597bfe89fb0..e1f7143e3a9 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;