From 56c36adad6a8fb0902bb95e279f25c0cbd194ec2 Mon Sep 17 00:00:00 2001
From: daniceexi <daniceexi@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Thu, 7 Jun 2012 06:13:32 +0000
Subject: [PATCH] defect 3524563: We encountered issue in LRZ with the last
 change that keep the udev before the chroot. The problem was IB device which
 started after chroot does not work. The fix was to kill the udevd after the
 starting of net device

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@13017 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/share/xcat/netboot/sles/genimage | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/xCAT-server/share/xcat/netboot/sles/genimage b/xCAT-server/share/xcat/netboot/sles/genimage
index 4e71b92cc..18f75e047 100755
--- a/xCAT-server/share/xcat/netboot/sles/genimage
+++ b/xCAT-server/share/xcat/netboot/sles/genimage
@@ -906,11 +906,6 @@ then
 fi
 EOMS
     
-    # udevd needed by s390x for networking
-#    if ($arch ne "s390x") {
-#        print $inifile "killall -9 udevd\n";
-#    }
-    
     if($mode eq "statelite") {
         print $inifile "echo debug: before netstart\n";
         print $inifile "# check and see if debug is specified on command line\n";
@@ -968,7 +963,16 @@ done
 ip addr add dev lo 127.0.0.1/8
 ip link set lo up
 cd /
+EOMS
 
+# udevd needed by s390x for networking
+# but for other type of machine, udevd will affect the start of devices which detected
+#  after the chroot, so kill it after the working of network device
+if ($arch ne "s390x") {
+    print $inifile "killall -9 udevd\n";
+}
+
+print $inifile <<EOMS;    
 for i in `cat /proc/cmdline`; do
    KEY=`echo \$i |awk -F= '{print \$1}'`
    if [ "\$KEY" == 'imgurl' ]; then
@@ -1037,6 +1041,7 @@ if [ "\$STATELITE" = "1" ]; then
     else
         # for statelite mode on top of the ramdisk
 EOMS
+
     print $inifile "if [ -r /rootimg-statelite.gz ]; then \n";
     print $inifile "echo Setting up RAM-root tmpfs.\n";
     if ($rootlimit) {