diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-03-30 16:52:56 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-03-30 16:53:23 +0200 |
commit | 1c192e1feac0572ecad7801d8b0311dbc7ecbdbc (patch) | |
tree | 088abe206afd0eab23069df6fc4a3821afa7f4c7 /nixos/tests | |
parent | c394d4079d65d9af5145c7d253bb5d18e3c2a451 (diff) | |
download | nixlib-1c192e1feac0572ecad7801d8b0311dbc7ecbdbc.tar nixlib-1c192e1feac0572ecad7801d8b0311dbc7ecbdbc.tar.gz nixlib-1c192e1feac0572ecad7801d8b0311dbc7ecbdbc.tar.bz2 nixlib-1c192e1feac0572ecad7801d8b0311dbc7ecbdbc.tar.lz nixlib-1c192e1feac0572ecad7801d8b0311dbc7ecbdbc.tar.xz nixlib-1c192e1feac0572ecad7801d8b0311dbc7ecbdbc.tar.zst nixlib-1c192e1feac0572ecad7801d8b0311dbc7ecbdbc.zip |
Another attempt to fix the installer test
http://hydra.nixos.org/build/9904133
Diffstat (limited to 'nixos/tests')
-rw-r--r-- | nixos/tests/installer.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index b32012ea0347..7929ef872b5c 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -39,7 +39,8 @@ let { imports = [ ./hardware-configuration.nix - "''${modulesPath}/testing/test-instrumentation.nix" + <nixpkgs/nixos/modules/profiles/qemu-guest.nix> + <nixpkgs/nixos/modules/testing/test-instrumentation.nix> ]; boot.loader.grub.version = ${toString grubVersion}; @@ -48,7 +49,6 @@ let ''} boot.loader.grub.device = "${grubDevice}"; boot.loader.grub.extraConfig = "serial; terminal_output.serial"; - boot.initrd.kernelModules = [ "virtio_console" ]; environment.systemPackages = [ ${optionalString testChannel "pkgs.rlwrap"} ]; } |