From 233971b6041a41c01201739ca3278cabfc42384f Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Thu, 28 Jul 2011 18:31:30 +0000
Subject: [PATCH] Fix logging and dhclient script in nbroot2

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@10187 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-nbroot2/dhclient-script | 5 +++--
 xCAT-nbroot2/xcat-cmdline.sh | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/xCAT-nbroot2/dhclient-script b/xCAT-nbroot2/dhclient-script
index 38f296aaf..652ae266b 100755
--- a/xCAT-nbroot2/dhclient-script
+++ b/xCAT-nbroot2/dhclient-script
@@ -25,13 +25,14 @@ elif [ $reason = "BOUND" ]; then
 	for gw in $new_routers; do
 		ip route add default via $gw
 	done
-        if [ ! -z "$new_log_servers" ]; do
+        if [ ! -z "$new_log_servers" ]; then
 		head -n -1 /etc/rsyslog.conf > /etc/rsyslog.conf.new
 		cp /etc/rsyslog.conf.new /etc/rsyslog.conf
-	done
+	fi
         for ls in $new_log_servers; do
 		echo *.* @$ls >> /etc/rsyslog.conf
 	done
+	kill -1 `cat /var/run/syslogd.pid`
 
 	if [ ! -z "$new_tcode" -a -r "/usr/share/zoneinfo/posix/$new_tcode" ]; then
 		cp "/usr/share/zoneinfo/posix/$new_tcode" /etc/localtime
diff --git a/xCAT-nbroot2/xcat-cmdline.sh b/xCAT-nbroot2/xcat-cmdline.sh
index 46cbb68fe..7b44b91b0 100755
--- a/xCAT-nbroot2/xcat-cmdline.sh
+++ b/xCAT-nbroot2/xcat-cmdline.sh
@@ -63,6 +63,7 @@ openssl genrsa -out /etc/xcat/privkey.pem 1024
 PUBKEY=`openssl rsa -in /etc/xcat/privkey.pem -pubout|grep -v "PUBLIC KEY"`
 PUBKEY=`echo $PUBKEY|sed -e 's/ //g'`
 export PUBKEY
+/sbin/rsyslogd -c4
 mkdir -p /var/lib/lldpad
 echo 'lldp :' >> /var/lib/lldpad/lldpad.conf
 echo '{' >> /var/lib/lldpad/lldpad.conf