From 3b9308c286a07d691de0c6cac835924c96e154db Mon Sep 17 00:00:00 2001
From: Josip Rodin <joy@numa-ubuntu-vm.(none)>
Date: Sun, 13 Sep 2009 14:35:27 +0200
Subject: [PATCH] pojednostavio sad kad vise nije u common kodu, dodao komentar
 za vzctl enter

---
 linux/appstart.tcl | 30 ++++++++++++------------------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/linux/appstart.tcl b/linux/appstart.tcl
index 3666e01..2802fbd 100644
--- a/linux/appstart.tcl
+++ b/linux/appstart.tcl
@@ -13,12 +13,12 @@
 #****
 proc spawnShell { node cmd } {
     upvar 0 ::cf::[set ::curcfg]::eid eid
-    global remote_exec exec_host gui_unix gui_freebsd gui_linux
+    global remote_exec exec_host gui_unix
 
     set node_id $eid\.$node
 
     if { $remote_exec } {
-	nexec vimageShellServer.sh $node_id 1234 $cmd &
+		nexec vimageShellServer.sh $node_id 1234 $cmd &
     	if { $gui_unix } {
     	    exec xterm -sb -rightbar \
     		-T "IMUNES: [getNodeName $node] (console)" \
@@ -27,15 +27,12 @@ proc spawnShell { node cmd } {
     	    exec cmd /c nc $exec_host 1234 &
     	}
     } else {
-        if { $gui_freebsd } {
-	        set shellcommand "vimage $node_id $cmd"
-    	} elseif { $gui_linux } {
-    	    if { $cmd == "enter" } {
-        	    set shellcommand "vzctl enter $node"
-        	} else {
-        	    set shellcommand "vzctl exec $node $cmd"
-            }
-    	}
+		# OpenVZ vzctl enter mod support, inace shell nema $PROMPT
+		if { $cmd == "enter" } {
+        	set shellcommand "vzctl enter $node"
+        } else {
+			set shellcommand "vzctl exec $node $cmd"
+		}
     	nexec xterm -sb -rightbar \
        	    -T "IMUNES: [getNodeName $node] (console)" \
 	        -e "$shellcommand" &
@@ -58,14 +55,11 @@ proc spawnShell { node cmd } {
 #****
 proc startethereal { node iface } {
     upvar 0 ::cf::[set ::curcfg]::eid eid
-    global gui_unix gui_linux
+    global gui_unix
     
-    #OpenVZ - lokalni interface-i za VE-ve, imaju drukciju nomenklaturu
-    if { $gui_unix && $gui_linux } {
-        set interface "to_[set node]_[set iface]"
-    } else {
-        set interface "$iface@$eid\.$node"
-    }
+	# set interface "$iface@$eid\.$node"
+    # OpenVZ - lokalna sucelja u VE imaju drukciju nomenklaturu
+	set interface "to_[set node]_[set iface]"
     
     nexec wireshark -i $interface -f " " &
 }
-- 
2.39.5