public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Another attempt to fix the installer test

Browse Source 
http://hydra.nixos.org/build/9904133
This commit is contained in:
Eelco Dolstra 2014-03-30 16:52:56 +02:00
parent c394d4079d
commit 1c192e1fea
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nixos/modules/profiles/qemu-guest.nix
View File

@ -5,5 +5,13 @@
{ {
boot.initrd.availableKernelModules = [ "virtio_net" "virtio_pci" "virtio_blk" "9p" "9pnet_virtio" ]; boot.initrd.availableKernelModules = [ "virtio_net" "virtio_pci" "virtio_blk" "9p" "9pnet_virtio" ];
boot.kernelModules = [ "virtio_balloon" "virtio_console" ]; boot.initrd.kernelModules = [ "virtio_balloon" "virtio_console" ];
boot.initrd.postDeviceCommands =
''
# Set the system time from the hardware clock to work around a
# bug in qemu-kvm > 1.5.2 (where the VM clock is initialised
# to the *boot time* of the host).
hwclock -s
'';
} }

5
nixos/modules/virtualisation/qemu-vm.nix
View File

@ -291,11 +291,6 @@ in
if test -z "$FSTYPE"; then if test -z "$FSTYPE"; then
mke2fs -t ext4 /dev/vda mke2fs -t ext4 /dev/vda
fi fi
# Set the system time from the hardware clock to work around a
# bug in qemu-kvm > 1.5.2 (where the VM clock is initialised
# to the *boot time* of the host).
hwclock -s
''; '';
boot.initrd.postMountCommands = boot.initrd.postMountCommands =

4
nixos/tests/installer.nix
View File

@ -39,7 +39,8 @@ let
{ imports = { imports =
[ ./hardware-configuration.nix [ ./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}; boot.loader.grub.version = ${toString grubVersion};
@ -48,7 +49,6 @@ let
''} ''}
boot.loader.grub.device = "${grubDevice}"; boot.loader.grub.device = "${grubDevice}";
boot.loader.grub.extraConfig = "serial; terminal_output.serial"; boot.loader.grub.extraConfig = "serial; terminal_output.serial";
boot.initrd.kernelModules = [ "virtio_console" ];
environment.systemPackages = [ ${optionalString testChannel "pkgs.rlwrap"} ]; environment.systemPackages = [ ${optionalString testChannel "pkgs.rlwrap"} ];
} }