From ee005424bf57df6bcba873c0de3980ea41390172 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 10 Jan 2010 20:08:35 +0000 Subject: [PATCH] * 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 | 2 +- modules/system/boot/stage-1-init.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/services/hardware/udev.nix b/modules/services/hardware/udev.nix index af653f59c888..e7c9d84033c9 100644 --- a/modules/services/hardware/udev.nix +++ b/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 ''; diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh index 76c2be8a048c..5f882f67aa08 100644 --- a/modules/system/boot/stage-1-init.sh +++ b/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