Osstest/Debian: support adding a rootdelay property to bootargs

arndale appears to be quite slow (and asynchronous) at finding it's
scsi controller. rootdelay=3 seems to do the trick.

For the dom0 case this involved refactoring the existing provision of
the commandline to be less open-coded in the boot script here doc.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm
index 1f7a4f02c0cfdae697330adf367d795d2cd137fa..2ea1a7e24bd1b42a58663977ee7c97ab92616e59 100644 (file)
--- a/Osstest/Debian.pm
+++ b/Osstest/Debian.pm
@@ -119,10 +119,12 @@ sub uboot_common_kernel_bootargs ($)
     my ($ho) = @_;
 
     my $root= target_guest_lv_name($ho,"root");
+    my $rootdelay= get_host_property($ho, "rootdelay");
 
     my @bootargs;
     push @bootargs, "ro";
     push @bootargs, "root=$root";
+    push @bootargs, "rootdelay=$rootdelay" if $rootdelay;
 
     return @bootargs;
 }