From: Kosta Pribić <kosta.pribic@gmail.com>
Date: Fri, 16 Oct 2009 11:55:50 +0000 (+0200)
Subject: ovo je bilo nepotrebno ovdje jer ne radimo dodatni l2 bridging za rj45 vec ga direktn... 
X-Git-Url: https://git.entuzijast.net/?a=commitdiff_plain;h=3304b18d9ccbf4c0bfaa17a000f48eae633b93be;p=imunes.git

ovo je bilo nepotrebno ovdje jer ne radimo dodatni l2 bridging za rj45 vec ga direktno bridgeamo s fizickim interfaceom u deployCfg i to radi (pod uvjetom da je l3 ispravno podesen)
---

diff --git a/linux/exec.tcl b/linux/exec.tcl
index a7a7d29..14e8057 100755
--- a/linux/exec.tcl
+++ b/linux/exec.tcl
@@ -419,13 +419,7 @@ proc l3node.start { eid node } {
 
 		puts "  Interface $ifc at $node links to $peer"
 
-		if { [nodeType $peer] == "rj45" } {
-            # TODO: RJ45 nodes zasad ne podrzavamo
-		    set peerifc [getNodeName $peer]
-		    #set ether [nexec ifconfig $peerifc | grep "HWaddr " | cut -c8-]
-		    set ether [nexec ifconfig $peerifc | grep $peerifc | awk {{print $5}}]
-		    puts "  Za RJ45 interface -> MAC(eth0) = $ether"
-		} else {
+
 		    # vzctl ne prima ako nije properly padded
 		    set ether 40:00:aa:aa:[format %02x $mac_byte4]:[format %02x $mac_byte5]
 		    set host_ether 40:00:aa:ff:[format %02x $mac_byte4]:[format %02x $mac_byte5]
@@ -434,7 +428,6 @@ proc l3node.start { eid node } {
 			set mac_byte5 0
 			incr mac_byte4
 		    }
-		}
 #		puts "	nexec vimage $node_id ifconfig $ifc link $ether	"
 		nexec vzctl {set} $node_id --netif_add $ifc,$ether,$ifid,$host_ether
 		set ngnodemap($ifc@$node_id) $ifid