ts-host-install: Support for different console devices

Subsumes NoSerial host property as well.

diff --git a/README b/README
index d92afeaed619edbf2c62134e58e9534c2047dcb3..4bf3b2646f529f692a4cd56212e1995bb97167cb 100644 (file)
--- a/README
+++ b/README
@@ -88,8 +88,9 @@ HostProp_<testbox>_Ether
    MAC address of the box <testbox>.  Only needed if you want
    to use the osstest host and Xen installer.
 
-HostProp_<testbox>_NoSerial
-   Set to 1 if <testbox> has no serial, system will use VGA console
+HostProp_<testbox>_SerialConsole
+   Set to the serial console device on the platform. Defaults to
+   ttyS0. If set to "NONE" then the system will use VGA console
    instead.
 
 HostProp_<testbox>_DIFrontend

diff --git a/ts-host-install b/ts-host-install
index b7257d7519bb367ded4b4c0aa473151396f3e09b..b974365e01b033a6b8c61d43ce5456fdd5081b65 100755 (executable)
--- a/ts-host-install
+++ b/ts-host-install
@@ -177,8 +177,10 @@ END
         get_host_property($ho, "install-append $ho->{Suite}", '');
 
     push @installcmdline, qw(--);
-    push @installcmdline, "console=ttyS0,$c{Baud}n8"
-       unless get_host_property($ho, "NoSerial", "0");
+
+    my $console = get_host_property($ho, "SerialConsole", "ttyS0");
+    push @installcmdline, "console=$console,$c{Baud}n8"
+        unless $console eq "NONE";
 
     my $installcmdline= join ' ', @installcmdline;