From edee37088309079ed3a3139a26a9b133f822ec5e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 16 May 2010 19:02:45 +0000
Subject: [PATCH] * The default action for `udevadm trigger' changed from `add'
to `change'. At boot time, however, we want an `add' event to trigger
certain rules (e.g. LVM and mdadm).
svn path=/nixos/trunk/; revision=21804
---
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 9c1e863d76c..0088072121e 100644
--- a/modules/services/hardware/udev.nix
+++ b/modules/services/hardware/udev.nix
@@ -193,7 +193,7 @@ in
# the LVM rules to create device nodes. See
# 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 trigger --action=add
${udev}/sbin/udevadm settle # wait for udev to finish
${udev}/sbin/udevadm control --env=STARTUP=
diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index 5f882f67aa0..aead7573161 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -115,7 +115,7 @@ export UDEV_CONFIG_FILE=@udevConf@
mkdir -p /dev/.udev # !!! bug in udev?
udevd --daemon
udevadm control --env=STARTUP=1
-udevadm trigger
+udevadm trigger --action=add
udevadm settle
udevadm control --env=STARTUP=