X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=linux_usr%2Fv3_console;h=98cf495e969d8fbf1ddf8f16c8d2a86167e190f3;hb=a569df65eac9f48c73e30f85afbb385f65c2eb38;hp=d14979b15993331865e2f0a0b2c17956ee3af727;hpb=9aee4d463c4401f25142ba43ddbb720e4e129340;p=palacios.git

diff --git a/linux_usr/v3_console b/linux_usr/v3_console
index d14979b..98cf495 100755
--- a/linux_usr/v3_console
+++ b/linux_usr/v3_console
@@ -1,15 +1,34 @@
 #!/usr/bin/perl -w
 
+use IPC::Cmd qw/can_run/;
+
 if ($#ARGV!=0) { 
-	print "v3_console /dev/v3-vmXXX\n";
-	print "Use '\\' to escape terminal\n\n";
-	print "Use v3_cons if you are on a raw PC console\n";
-	print "Use v3_vncclient if you are trying to connect to a v3_vncserver\n";
-	exit;
+  print "v3_console /dev/v3-vmXXX\n";
+  print "Use v3_console if you are on a terminal and\n";
+  print "   want to connect to the VM's screen+keybaord\n";
+  print "   in text mode.\n";
+  print "   Use '\\' or 'CTRL-ALT-\\' to escape\n";
+  print "Use v3_cons if you are on a raw PC console and\n";
+  print "   want to connnect to the VM's screen+keyboard\n";
+  print "   in text mode.\n";
+  print "Use v3_vncclient if you want to connect to the\n";
+  print "   VM's screen+keyboard in graphical mode.\n";
+  print "   This requires a v3_vncserver and an correctly\n";
+  print "   configured VM.\n";
+  print "Use v3_stream if you are on a terminal and\n";
+  print "   want to connect to a stream on the VM, \n";
+  print "   for example a serial port.\n";
+  exit;
 }
 
 
 $vm=shift;
 
-system "v3_cons_sc $vm 2>/dev/null";
+if (can_run('v3_cons_tc')) {
+    system "v3_cons_tc $vm 2>/dev/null";
+} elsif (can_run('v3_cons_sc')) {
+    system "v3_cons_sc $vm 2>/dev/null";
+} else {
+    print "You have no console program on your path\n";
+}