From d6845031fb20f11e49e7aaf7141977edacffcc0c Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Fri, 25 Jan 2013 13:43:31 +0000
Subject: [PATCH] Disable new nic element to avoid packet fragmentation, will
 revisit how to do this later

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@14997 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-genesis-scripts/bin/dodiscovery | 74 ++++++++++++++--------------
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/xCAT-genesis-scripts/bin/dodiscovery b/xCAT-genesis-scripts/bin/dodiscovery
index dd409fd37..734b70653 100755
--- a/xCAT-genesis-scripts/bin/dodiscovery
+++ b/xCAT-genesis-scripts/bin/dodiscovery
@@ -138,43 +138,43 @@ for dev in `ip link|grep -B1 ether|grep UP|awk '{print $2}'|sed -e s/://|grep -v
 	fi
 	fi
 	echo "<mac>$DRIVER|$dev|$MAC|$ADDRESS</mac>" >> /tmp/discopacket
-	echo "<nic>" >> /tmp/discopacket
-	echo "	<devname>$dev</devname>" >> /tmp/discopacket
-	echo "	<driver>$DRIVER</driver>" >> /tmp/discopacket
-	if [ ! -z "$ADDRESS" ]; then
-		echo "	<ip4address>$ADDRESS</ip4address>" >> /tmp/discopacket
-	fi
-	echo "	<hwaddr>$MAC</hwaddr>" >> /tmp/discopacket
-	if [ ! -z "$PCI_SLOT" ]; then
-		echo "	<pcidev>$PCI_SLOT</pcidev>" >> /tmp/discopacket
-	fi
-	if [ ! -z "$SLOTNAME" ]; then 
-		echo "	<location>$SLOTNAME</location>" >> /tmp/discopacket
-	fi
-	if [ ! -z "$ONBOARDINDEX" ]; then 
-		echo "	<onboardeth>$ONBOARDINDEX</onboardeth>" >> /tmp/discopacket
-	fi
-	if [ ! -z "$FIRMDESC" ]; then
-		echo "	<firmdesc>$FIRMDESC</firmdesc>" >> /tmp/discopacket
-	fi
-	myswitch=`lldptool -n -i $dev -t -V sysName|grep -v 'System Name TLV'|sed -e 's/^	*//'`
-	if [ ! -z "$myswitch" -a "$myswitch" != "Agent instance for device not found" ]; then
-		echo "	<switchname>$myswitch</switchname>" >> /tmp/discopacket
-	fi
-	for switchaddr in `lldptool -i $dev -n -t -V mngAddr|grep IP|sed -e 's/.*:.//'`; do
-		if [ "$switchaddr" = "Agent instance for device not found" ]; then break; fi
-		echo "	<switchaddr>$switchaddr</switchaddr>" >> /tmp/discopacket
-	done
-	myswitchdesc=`lldptool -n -i $dev -t -V sysDesc|grep -v 'System Description TLV'|sed -e 's/^	*//'`
-	if [ ! -z "$myswitchdesc" -a "$myswitchdesc" != "Agent instance for device not found" ]; then	
-		echo "	<switchdesc>$myswitchdesc</switchdesc>" >> /tmp/discopacket
-	fi
-	myport=`lldptool -n -i $dev -t -V portDesc|grep -v 'Port Description TLV'|sed -e 's/^	*//'`
-	if [ ! -z "$myport" -a "$myswitchdesc" != "Agent instance for device not found" ]; then	
-		echo "	<switchport>$myport</switchport>" >> /tmp/discopacket
-	fi
-		
-	echo "</nic>" >> /tmp/discopacket
+########echo "<nic>" >> /tmp/discopacket
+########echo "	<devname>$dev</devname>" >> /tmp/discopacket
+########echo "	<driver>$DRIVER</driver>" >> /tmp/discopacket
+########if [ ! -z "$ADDRESS" ]; then
+########	echo "	<ip4address>$ADDRESS</ip4address>" >> /tmp/discopacket
+########fi
+########echo "	<hwaddr>$MAC</hwaddr>" >> /tmp/discopacket
+########if [ ! -z "$PCI_SLOT" ]; then
+########	echo "	<pcidev>$PCI_SLOT</pcidev>" >> /tmp/discopacket
+########fi
+########if [ ! -z "$SLOTNAME" ]; then 
+########	echo "	<location>$SLOTNAME</location>" >> /tmp/discopacket
+########fi
+########if [ ! -z "$ONBOARDINDEX" ]; then 
+########	echo "	<onboardeth>$ONBOARDINDEX</onboardeth>" >> /tmp/discopacket
+########fi
+########if [ ! -z "$FIRMDESC" ]; then
+########	echo "	<firmdesc>$FIRMDESC</firmdesc>" >> /tmp/discopacket
+########fi
+########myswitch=`lldptool -n -i $dev -t -V sysName|grep -v 'System Name TLV'|sed -e 's/^	*//'`
+########if [ ! -z "$myswitch" -a "$myswitch" != "Agent instance for device not found" ]; then
+########	echo "	<switchname>$myswitch</switchname>" >> /tmp/discopacket
+########fi
+########for switchaddr in `lldptool -i $dev -n -t -V mngAddr|grep IP|sed -e 's/.*:.//'`; do
+########	if [ "$switchaddr" = "Agent instance for device not found" ]; then break; fi
+########	echo "	<switchaddr>$switchaddr</switchaddr>" >> /tmp/discopacket
+########done
+########myswitchdesc=`lldptool -n -i $dev -t -V sysDesc|grep -v 'System Description TLV'|sed -e 's/^	*//'`
+########if [ ! -z "$myswitchdesc" -a "$myswitchdesc" != "Agent instance for device not found" ]; then	
+########	echo "	<switchdesc>$myswitchdesc</switchdesc>" >> /tmp/discopacket
+########fi
+########myport=`lldptool -n -i $dev -t -V portDesc|grep -v 'Port Description TLV'|sed -e 's/^	*//'`
+########if [ ! -z "$myport" -a "$myswitchdesc" != "Agent instance for device not found" ]; then	
+########	echo "	<switchport>$myport</switchport>" >> /tmp/discopacket
+########fi
+########	
+########echo "</nic>" >> /tmp/discopacket
 done
 echo "<xcatpubkey>$PUBKEY</xcatpubkey>" >> /tmp/discopacket #this is not secure to use by itself, switch sourced pubkey for security
 echo "<sha512sig>" >> /tmp/discopacket