Osstest/Debian: Refactor setting of dom0 kernel command line.

This will make it easier to make components optional in the future.

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 8b70442d1798d16c47ce4c948f40372ab9726c3d..0b047df338050dc797a778927e9d813a84cfee5d 100644 (file)
--- a/Osstest/Debian.pm
+++ b/Osstest/Debian.pm
@@ -136,6 +136,13 @@ sub setupboot_uboot ($$$) {
 
        my $root= target_guest_lv_name($ho,"root");
 
+       my @xenkopt;
+       push @xenkopt, $xenkopt;
+       push @xenkopt, "ro";
+       push @xenkopt, "root=$root";
+
+       $xenkopt = join ' ', @xenkopt;
+
        logm("Xen options: $xenhopt");
        logm("Linux options: $xenkopt");
 
@@ -177,9 +184,9 @@ ext2load scsi 0 \\\${kernel_addr_r} $kern
 fdt mknod /chosen module\@0
 fdt set /chosen/module\@0 compatible "xen,linux-zimage" "xen,multiboot-module"
 fdt set /chosen/module\@0 reg <\\\${kernel_addr_r} \\\${filesize}>
-fdt set /chosen/module\@0 bootargs "$xenkopt ro root=$root"
+fdt set /chosen/module\@0 bootargs "$xenkopt"
 echo Loaded $kern to \\\${kernel_addr_r} (\\\${filesize})
-echo command line: $xenkopt ro root=$root
+echo command line: $xenkopt
 
 ext2load scsi 0 \\\${ramdisk_addr_r} $initrd
 fdt mknod /chosen module\@1