From 4cdc5445b65e62d3df25cb12b9df8daca687f111 Mon Sep 17 00:00:00 2001
From: Josip Rodin <joy@numa-ubuntu-vm.(none)>
Date: Sun, 13 Sep 2009 19:22:53 +0200
Subject: [PATCH] ovaj whereis se vrti u hostu sto je pod OpenVZom krivo, a
 ionako je beskorisno jer se popis shellova ionako ne mijenja non-stop;
 napravio jednostavno da se makne sve osim vzctl enter

---
 linux/host.tcl | 17 +++--------------
 linux/pc.tcl   | 17 +++--------------
 2 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/linux/host.tcl b/linux/host.tcl
index 83dd8cc..ee1a46c 100755
--- a/linux/host.tcl
+++ b/linux/host.tcl
@@ -162,20 +162,9 @@ proc $MODULE.bootcmd { node } {
 #****
 
 proc $MODULE.shellcmd { node } {
-    set ret [nexec whereis -b bash]
-    # OpenVZ, $ret ce biti bash: /bin/bash /etc/bash.bashrc
-    # duljina je uvijek 3
-
-    if { [llength $ret] == 3 } {
-	    return [lindex $ret 1]
-    } else {
-	    set ret [nexec whereis -b tcsh]
-	    if { [llength $ret] == 2 } {
-	        return [lindex $ret 1]
-	    } else {
-	        return "/bin/sh"
-	    }
-    }
+    # OpenVZ template sami podesavamo, pa ovo mozemo i hardkodirati
+    # da ne pokrecemo whereis nonstop
+    return "/bin/sh"
 }
 
 #****f* host.tcl/host.instantiate
diff --git a/linux/pc.tcl b/linux/pc.tcl
index 1965d7f..65c9199 100755
--- a/linux/pc.tcl
+++ b/linux/pc.tcl
@@ -140,20 +140,9 @@ proc $MODULE.bootcmd { node } {
 #****
 
 proc $MODULE.shellcmd { node } {
-    set ret [nexec whereis -b bash]
-    # OpenVZ, $ret ce biti bash: /bin/bash /etc/bash.bashrc
-    # duljina je uvijek 3
-
-    if { [llength $ret] == 3 } {
-	    return [lindex $ret 1]
-    } else {
-	    set ret [nexec whereis -b tcsh]
-	    if { [llength $ret] == 2 } {
-	        return [lindex $ret 1]
-	    } else {
-	        return "/bin/sh"
-	    }
-    }
+    # OpenVZ template sami podesavamo, pa ovo mozemo i hardkodirati
+    # da ne pokrecemo whereis nonstop
+    return "/bin/sh"
 }
 
 #****f* pc.tcl/pc.instantiate
-- 
2.39.5