From 3fa2bbd02938d187bbe081a78da1daf417a01c1e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 22 Sep 2011 08:26:58 +0000
Subject: [PATCH] * Properly shut down udevd in stage 1.  Otherwise there is a
 slight   possibility that a udevd process survives, preventing udevd from  
 starting in stage 2:

  machine# udevd[1421]: bind failed: Address already in use
  machine# udevd[1421]: error binding udev control socket

svn path=/nixos/trunk/; revision=29434
---
 modules/system/boot/stage-1-init.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index b2d93a8fd08..a1fcfc164b6 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -293,7 +293,11 @@ done
 
 
 # Stop udevd.
-kill -- -1
+udevadm control --exit
+
+# Kill any remaining processes, just to be sure we're not taking any
+# with us into stage 2.
+kill -9 -- -1
 
 
 if test -n "$debug1mounts"; then fail; fi