From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: [PATCH OSSTEST v2 03/19] ts-host-install: Split initrd out of @installcmdline Date: Thu, 18 Jun 2015 17:24:54 +0100 Message-ID: <1434644710-28881-3-git-send-email-ian.campbell@citrix.com> References: <1434644687.28264.53.camel@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1434644687.28264.53.camel@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: ian.jackson@eu.citrix.com Cc: Ian Campbell , xen-devel@lists.xen.org List-Id: xen-devel@lists.xenproject.org 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 --- ts-host-install | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ts-host-install b/ts-host-install index 04d5487..04f065f 100755 --- 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 -- 2.1.4