From: marko <marko>
Date: Wed, 13 Jul 2005 22:21:55 +0000 (+0000)
Subject: Back out a bug I previously introduced by removing an "eval" in front
X-Git-Url: https://git.entuzijast.net/?a=commitdiff_plain;h=e594613f48d3dbfaf0d75dad631ac0a4b2d097de;p=imunes.git

Back out a bug I previously introduced by removing an "eval" in front
of exec in proc nexec.

XORP can now be selected as a router model even if xorp is not installed
locally.  Usefull for a) editing a topology on one machine, executing it
on another and b) marketing XORP.  The default router model remains quagga.

Bug found by:
Submitted by:
Requested by:
Reviewed by:
Approved by:
Obtained from:
---

diff --git a/exec.tcl b/exec.tcl
index 7174bb0..8d085be 100755
--- a/exec.tcl
+++ b/exec.tcl
@@ -35,7 +35,7 @@
 
 
 proc nexec { args } {
-    exec $args
+    eval exec $args
 }
 
 
diff --git a/imunes.tcl b/imunes.tcl
index b2f76b2..e6d3dab 100755
--- a/imunes.tcl
+++ b/imunes.tcl
@@ -79,7 +79,6 @@ set nodes {}
 set links {}
 set prefs {}
 
-set def_router_model quagga
 set newlink ""
 set selectbox ""
 set selected ""
@@ -107,10 +106,8 @@ set showIfIPaddrs 1
 set showNodeLabels 1
 set showLinkLabels 1
 
-set supp_router_models "quagga static"
-if { [file exists /usr/local/xorp/bin/xorp_rtrmgr] } {
-    set supp_router_models "xorp $supp_router_models"
-}
+set supp_router_models "xorp quagga static"
+set def_router_model quagga
 
 
 #