bridge l3 case fixup; tidyup

diff --git a/linux/exec.tcl b/linux/exec.tcl
index 98f846108652f2b9fe4b723c5f6efd784e24b04e..a3221587563a82ca7fe432f2e13894e58b03c351 100755 (executable)
--- 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"