From db3cd5cc2fd58baeb3c5cf611351081b5bd10282 Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Thu, 14 Jul 2011 17:37:30 +0000
Subject: [PATCH] Correct bootnic variable in nbroot2

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

diff --git a/xCAT-nbroot2/dhclient-script b/xCAT-nbroot2/dhclient-script
index dc1977fd3..b3cbefc7a 100755
--- a/xCAT-nbroot2/dhclient-script
+++ b/xCAT-nbroot2/dhclient-script
@@ -10,7 +10,7 @@ elif [ $reason = "BOUND" ]; then
 	fi
 	if [ ! -z "$new_host_name" ]; then
 		hostname $new_host_name
-		lldptool -T -i $interface -V 5 enableTx=yes
+		lldptool -T -i $interface -V 5 enableTx=yes 
 	fi
 	if [ ! -z "$new_domain_name" ]; then
 		echo search $new_domain_name >> /etc/resolv.conf
diff --git a/xCAT-nbroot2/xcat-cmdline.sh b/xCAT-nbroot2/xcat-cmdline.sh
index d1c21b45f..4b26afe89 100755
--- a/xCAT-nbroot2/xcat-cmdline.sh
+++ b/xCAT-nbroot2/xcat-cmdline.sh
@@ -12,7 +12,7 @@ if [ ! -z "$BOOTIF" ]; then
 	echo -n "Waiting for device with address $BOOTIF to appear.."
 	gripeiter=300
 	while [ -z "$bootnic" ]; do 
-		bootnic=`ip link show|grep -B1 $BOOTIF|grep mtu|awk '{print $2}'`
+		bootnic=`ip link show|grep -B1 $BOOTIF|grep mtu|awk '{print $2}'|sed -e 's/:$//'`
 		sleep 0.1
 		if [ $gripeiter = 0 ]; then
 			echo "ERROR"