ovo je bilo nepotrebno ovdje jer ne radimo dodatni l2 bridging za rj45 vec ga direktn...

diff --git a/linux/exec.tcl b/linux/exec.tcl
index a7a7d290eb35549581537632898f40ca4e03ea06..14e8057e8f43f131c0846cfe9d7fe3103b13f845 100755 (executable)
--- 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