* Doh, subtle race condition: STARTUP must be cleared after "udevadm

settle".  Otherwise some rules may be processed with STARTUP
  cleared, causing LVM devices not to be created.

svn path=/nixos/trunk/; revision=19341

modules/services/hardware/udev.nix

@@ -193,8 +193,8 @@ in
             # http://www.mail-archive.com/fedora-devel-list@redhat.com/msg10261.html
             ${udev}/sbin/udevadm control --env=STARTUP=1
             ${udev}/sbin/udevadm trigger
-            ${udev}/sbin/udevadm control --env=STARTUP=
             ${udev}/sbin/udevadm settle # wait for udev to finish
+            ${udev}/sbin/udevadm control --env=STARTUP=
 
             initctl emit -n new-devices
           '';

modules/system/boot/stage-1-init.sh

@@ -116,8 +116,8 @@ mkdir -p /dev/.udev # !!! bug in udev?
 udevd --daemon
 udevadm control --env=STARTUP=1
 udevadm trigger
-udevadm control --env=STARTUP=
 udevadm settle
+udevadm control --env=STARTUP=
 
 echo "starting device mapper and LVM..."
 lvm vgscan