ovaj whereis se vrti u hostu sto je pod OpenVZom krivo, a ionako je beskorisno jer...

diff --git a/linux/host.tcl b/linux/host.tcl
index 83dd8cc9edf801064eee58efffd2420b9f975bdf..ee1a46c2af30f030fdfb97c6210de0f54036e4e2 100755 (executable)
--- 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 1965d7fd7c1e51487b3e44e2dab551880425f957..65c91995685688f159a8db87808b59141a510b5a 100755 (executable)
--- 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