mg-hosts serial attach: Provide serial-attach command

This is like running sympathy -r or xenuse by hand, except that it
checks that you have the host allocated, and looks up in the database
what the right rune is.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>

diff --git a/Osstest/Serial/sympathy.pm b/Osstest/Serial/sympathy.pm
index fa34143ce34bb6c0bee93e7ebb3cbbc410537150..0d09576f471ecc0541d20bb506d1c327b603fa9c 100644 (file)
--- a/Osstest/Serial/sympathy.pm
+++ b/Osstest/Serial/sympathy.pm
@@ -82,6 +82,12 @@ sub keys_write {
 sub keys_shutdown {
 }
 
+sub attach_cmd {
+    my ($mo) = @_;
+    my $rcmd = "sympathy -r $mo->{Socket}";
+    return qw(ssh -t), "root\@".$mo->{Server}, "'$rcmd'";
+}
+
 sub fetch_logs {
     my ($mo) = @_;
 

diff --git a/Osstest/Serial/xenuse.pm b/Osstest/Serial/xenuse.pm
index c79d98666ea731a3d4777ab852399fd48472d349..2ea46d67255181c353c9455bc376dd967097656f 100644 (file)
--- a/Osstest/Serial/xenuse.pm
+++ b/Osstest/Serial/xenuse.pm
@@ -62,6 +62,16 @@ sub keys_prepare {
     sleep 5;
 }
 
+sub attach_cmd {
+    my ($mo) = @_;
+
+    my $ho= $mo->{Host};
+
+    my $xenuse= $c{XenUsePath} || "xenuse";
+
+    return ($xenuse, qw(-t), $ho->{Name});
+}
+
 sub keys_write {
     my ($mo, $what,$str,$pause) = @_;
     logm("xenuse sending $what");

diff --git a/mg-hosts b/mg-hosts
index 0d02c569a68cec9f51a1ddd1e13581a2b802f527..f7854549c01b23e7d95714b175a16a5107bbc607 100755 (executable)
--- a/mg-hosts
+++ b/mg-hosts
@@ -156,6 +156,18 @@ sub cmd_power () {
     }
 }
 
+sub cmd_serial_attach () {
+    die unless @ARGV==1;
+    my ($host) = @ARGV;
+    my $ho= selecthost("host=$host");
+    my ($mo,) = @{ $ho->{SerialMethobjs} };
+    my (@cmd) = $mo->attach_cmd();
+    logm("executing @cmd");
+
+    exec @cmd;
+    die "@cmd: $!";
+}
+
 sub cmd_create_like () {
     die unless @ARGV==2;
     my ($src,$dsts) = @ARGV;