ts-host-install: Split initrd out of @installcmdline

Other bootloaders handle this with an explicit separate option rather
than parsing it out of the command line as pxelinux does. Prepare for
supporting these.

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

diff --git a/ts-host-install b/ts-host-install
index 04d548756f30ad0ff01634330bd3af305b2b76e2..04f065f1512ae7d61b0ad6d96f9efdf69695fd08 100755 (executable)
--- a/ts-host-install
+++ b/ts-host-install
@@ -265,9 +265,7 @@ END
     my $initrd= "$ho->{Tftp}{TmpDir}$ho->{Name}--initrd.gz";
     system_checked("cat -- @initrds >$ho->{Tftp}{Path}$initrd");
     
-    push @installcmdline, ("initrd=/$initrd",
-                           "domain=$c{TestHostDomain}",
-                           );
+    push @installcmdline, "domain=$c{TestHostDomain}";
     push @installcmdline,
         get_host_property($ho, "install-append $ho->{Suite}", ''),
         get_host_property($ho, "install-append $ho->{Suite} $r{arch}", '');
@@ -295,7 +293,7 @@ label overwrite
        menu label ^Overwrite
        menu default
        kernel $kernel
-       append $installcmdline
+       append initrd=/$initrd $installcmdline
        ipappend $ipappend
        $dtbs
 default overwrite