ts-host-install, Debian: improvements for standalone mode

Add a per-host option to not use serial, in case the test box only
has VGA.

Also allow the user to configure which Debian Installer frontend to
use, again useful in standalone mode (where you might actually be
watching it)

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>

diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm
index 157f666981c8532d13ce300027bfd7e6e670c1a3..8df3d3b14336acfc10e2c80f159bbeb986a8f418 100644 (file)
--- a/Osstest/Debian.pm
+++ b/Osstest/Debian.pm
@@ -281,9 +281,10 @@ sub di_installcmdline_core ($$;@) {
                auto=true preseed
                hw-detect/load_firmware=false
                DEBCONF_DEBUG=5
-               DEBIAN_FRONTEND=text
                );
+    my $difront = get_host_property($tho,'DIFrontend','text');
     push @cl, (
+               "DEBIAN_FRONTEND=$difront",
                "hostname=$tho->{Name}",
                "url=$ps_url",
                "netcfg/dhcp_timeout=150",

diff --git a/README b/README
index ce1e48044ffccacc1ea3bb9cbe3f0ac461f7d797..e75b7adf479fd3faeb08f555f6889a8980572213 100644 (file)
--- a/README
+++ b/README
@@ -87,10 +87,19 @@ 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
+   instead.
+
+HostProp_<testbox>_DIFrontend
+   Configure the frontend used by Debian installer. Default in osstest
+   is a very basic "text" interface but for standalone configurations,
+   especially on VGA, "newt" might be preferred.
+
 DebianPreseed
-  Text to add to the debian-installer preseed file.  Optional
-  but you will need to set some NTP servers here if your firewall
-  doesn't permit NTP to Debian's pool.ntp.org servers.
+   Text to add to the debian-installer preseed file.  Optional
+   but you will need to set some NTP servers here if your firewall
+   doesn't permit NTP to Debian's pool.ntp.org servers.
 
 DebianNonfreeFirmware
   List of debs of non-free firmware to include in the massaged

diff --git a/ts-host-install b/ts-host-install
index 95cefa1c5cbe14d8127f3a79f9fdd4f62e47a226..af9524dbf8f2804785964724340c306bae1f359e 100755 (executable)
--- a/ts-host-install
+++ b/ts-host-install
@@ -162,7 +162,8 @@ END
         get_host_property($ho, "install-append $ho->{Suite}", '');
 
     push @installcmdline, qw(--);
-    push @installcmdline, "console=ttyS0,$c{Baud}n8";
+    push @installcmdline, "console=ttyS0,$c{Baud}n8"
+       unless get_host_property($ho, "NoSerial", "0");
 
     my $installcmdline= join ' ', @installcmdline;