From 618719d7362149c7fdc919b4fee8ec95553d5ac6 Mon Sep 17 00:00:00 2001
From: Josip Rodin <joy@numa-ubuntu-vm.(none)>
Date: Sun, 13 Sep 2009 16:16:15 +0200
Subject: [PATCH] bridge l3 case fixup; tidyup

---
 linux/exec.tcl | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/linux/exec.tcl b/linux/exec.tcl
index 98f8461..a322158 100755
--- a/linux/exec.tcl
+++ b/linux/exec.tcl
@@ -491,7 +491,7 @@ proc l3node.start { eid node } {
     puts "bootcfg=$bootcfg i bootcmd=$bootcmd"
     if { ! $remote_exec } {
         if { $bootcmd != "/bin/sh" } {
-        	puts "  would write $node_dir/boot.conf"
+        	puts "  writing $node_dir/boot.conf"
         	set fileId [open $node_dir/boot.conf w]
         	foreach line $bootcfg {
         	    puts $fileId $line
@@ -755,6 +755,7 @@ proc deployCfg {} {
         }
 
 		upvar 0 ::cf::[set ::curcfg]::bridges bridges
+		set bridges {}
         
         # TODO Ovo bi trebalo elegantnije rjesiti.
         # Naredba pokusava utvrditi da li vec postoji bridge pod tim imenom,
@@ -799,7 +800,8 @@ proc deployCfg {} {
         # Slucaj kad se radi link izmedju dva L3 uredjaja (standardno)
         set host_if_a $ngpeer1
         set host_if_b $ngpeer2
-        set bridge $lname
+		set bridge "b$eid$lname"
+        set bridge_node $lname
 
         puts "\nCreating bridge $bridge"    
 
-- 
2.39.5