Author: eelco
Date: Mon Mar 19 15:10:39 2012
New Revision: 33259
URL: https://nixos.org/websvn/nix/?rev=33259&sc=1
Log:
* Attempt to fix the random "udevadm settle - timeout of 120 seconds
reached, the event queue contains: /sys/devices/virtual/tty/hvc1" VM
failures.
Modified:
nixos/trunk/modules/profiles/qemu-guest.nix
nixos/trunk/modules/services/hardware/udev.nix
nixos/trunk/modules/system/boot/stage-1-init.sh
nixos/trunk/modules/testing/test-instrumentation.nix
Modified: nixos/trunk/modules/profiles/qemu-guest.nix
==============================================================================
--- nixos/trunk/modules/profiles/qemu-guest.nix Mon Mar 19 13:49:39 2012
(r33258)
+++ nixos/trunk/modules/profiles/qemu-guest.nix Mon Mar 19 15:10:39 2012
(r33259)
@@ -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" ];
}
Modified: nixos/trunk/modules/services/hardware/udev.nix
==============================================================================
--- nixos/trunk/modules/services/hardware/udev.nix Mon Mar 19 13:49:39
2012 (r33258)
+++ nixos/trunk/modules/services/hardware/udev.nix Mon Mar 19 15:10:39
2012 (r33259)
@@ -265,7 +265,7 @@
#
http://www.mail-archive.com/[email protected]/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
Modified: nixos/trunk/modules/system/boot/stage-1-init.sh
==============================================================================
--- nixos/trunk/modules/system/boot/stage-1-init.sh Mon Mar 19 13:49:39
2012 (r33258)
+++ nixos/trunk/modules/system/boot/stage-1-init.sh Mon Mar 19 15:10:39
2012 (r33259)
@@ -137,7 +137,7 @@
udevd --daemon
udevadm control --env=STARTUP=1
udevadm trigger --action=add
-udevadm settle
+udevadm settle || true
udevadm control --env=STARTUP=
Modified: nixos/trunk/modules/testing/test-instrumentation.nix
==============================================================================
--- nixos/trunk/modules/testing/test-instrumentation.nix Mon Mar 19
13:49:39 2012 (r33258)
+++ nixos/trunk/modules/testing/test-instrumentation.nix Mon Mar 19
15:10:39 2012 (r33259)
@@ -28,7 +28,7 @@
" {
jobs.backdoor =
- { startOn = "startup";
+ { startOn = "started udev";
stopOn = "";
script =
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
