b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

* Attempt to fix the random "udevadm settle - timeout of 120 seconds

Browse source 
reached, the event queue contains: /sys/devices/virtual/tty/hvc1" VM
  failures.

svn path=/nixos/trunk/; revision=33259
This commit is contained in:
Eelco Dolstra 2012-03-19 15:10:39 +00:00
parent dde8453a09
commit ebc6d7f435
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
modules/profiles/qemu-guest.nix
View file

@ -4,6 +4,6 @@
{ config, pkgs, ... }:
{
boot.initrd.availableKernelModules = [ "virtio_net" "virtio_pci" "virtio_blk" "virtio_balloon" "virtio_console" ];
boot.initrd.kernelModules = [ "virtio_balloon" ];
boot.initrd.availableKernelModules = [ "virtio_net" "virtio_pci" "virtio_blk" ];
boot.kernelModules = [ "virtio_balloon" "virtio_console" ];
}

2
modules/services/hardware/udev.nix
View file

@ -265,7 +265,7 @@ in
# http://www.mail-archive.com/fedora-devel-list@redhat.com/msg10261.html
udevadm control --env=STARTUP=1
udevadm trigger --action=add
udevadm settle # wait for udev to finish
udevadm settle || true # wait for udev to finish
udevadm control --env=STARTUP=
initctl emit -n new-devices

2
modules/system/boot/stage-1-init.sh
View file

@ -137,7 +137,7 @@ mkdir -p /dev/.mdadm
udevd --daemon
udevadm control --env=STARTUP=1
udevadm trigger --action=add
udevadm settle
udevadm settle || true
udevadm control --env=STARTUP=

2
modules/testing/test-instrumentation.nix
View file

@ -28,7 +28,7 @@ in
" {
jobs.backdoor =
{ startOn = "startup";
{ startOn = "started udev";
stopOn = "";
script =