summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-09-25 00:03:54 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-09-25 00:07:35 +0200
commit0a967b926871af2eb8a5098d85a519a4922c56e7 (patch)
treed61b0a7e9a0015ac7b712f4cb6a80d1c2f1afbb3 /nixos
parent51c349d0cc39fa8f692386e3f6d25653a91e17db (diff)
downloadnixlib-0a967b926871af2eb8a5098d85a519a4922c56e7.tar
nixlib-0a967b926871af2eb8a5098d85a519a4922c56e7.tar.gz
nixlib-0a967b926871af2eb8a5098d85a519a4922c56e7.tar.bz2
nixlib-0a967b926871af2eb8a5098d85a519a4922c56e7.tar.lz
nixlib-0a967b926871af2eb8a5098d85a519a4922c56e7.tar.xz
nixlib-0a967b926871af2eb8a5098d85a519a4922c56e7.tar.zst
nixlib-0a967b926871af2eb8a5098d85a519a4922c56e7.zip
Installer test: Use the minimal ISO
So we don't depend on KDE etc. (which we don't even test here).
Diffstat (limited to 'nixos')
-rw-r--r--nixos/tests/installer.nix7
1 files changed, 4 insertions, 3 deletions
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 3e29bc2a45b0..138a81ad8075 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -6,13 +6,13 @@ with pkgs.lib;
 
 let
 
-  # Build the ISO.  This is the regular installation CD but with test
-  # instrumentation.
+  # Build the ISO.  This is the regular minimal installation CD but
+  # with test instrumentation.
   iso =
     (import ../lib/eval-config.nix {
       inherit system;
       modules =
-        [ ../modules/installer/cd-dvd/installation-cd-graphical.nix
+        [ ../modules/installer/cd-dvd/installation-cd-minimal.nix
           ../modules/testing/test-instrumentation.nix
           { key = "serial";
             boot.loader.grub.timeout = mkOverride 0 0;
@@ -43,6 +43,7 @@ let
       { imports =
           [ ./hardware-configuration.nix
             <nixpkgs/nixos/modules/testing/test-instrumentation.nix>
+            <nixpkgs/nixos/modules/profiles/minimal.nix>
           ];
 
         ${if useEFI then ''