From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Jackson Subject: [OSSTEST PATCH 22/26] ts-debian-hvm-install: Use /dev/sda for i386, not /dev/xvda Date: Fri, 18 Sep 2015 18:50:12 +0100 Message-ID: <1442598616-2884-9-git-send-email-ian.jackson@eu.citrix.com> References: <1442598616-2884-1-git-send-email-ian.jackson@eu.citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Zczns-0004GG-Kr for xen-devel@lists.xenproject.org; Fri, 18 Sep 2015 17:50:32 +0000 In-Reply-To: <1442598616-2884-1-git-send-email-ian.jackson@eu.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: xen-devel@lists.xenproject.org Cc: Ian Jackson , Ian Campbell List-Id: xen-devel@lists.xenproject.org Empirically, the device shows up as /dev/sda. Signed-off-by: Ian Jackson --- make-flight | 6 ++++-- ts-debian-hvm-install | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/make-flight b/make-flight index accf922..2552a53 100755 --- a/make-flight +++ b/make-flight @@ -263,10 +263,12 @@ do_hvm_debian_test_one () { stubdom=$5 # '' (or unset) or 'true' local arch=$(branch_debianhvm_arch) + local testvars case "$arch" in amd64) iso_dir='install.amd' ;; - i386) iso_dir='install.386' ;; + i386) iso_dir='install.386' + testvars+=' debianhvm_diskdevice=/dev/sda' ;; *) iso_dir="install.$arch" ;; esac @@ -280,7 +282,7 @@ do_hvm_debian_test_one () { job_create_test test-$xenarch$kern-$dom0arch-$toolstack$qemuu_suffix$stubdom_suffix-$testname-$arch\ test-debianhvm $toolstack $xenarch $dom0arch $qemuu_runvar \ enable_xsm=$xsm \ - $stubdom_runvar \ + $stubdom_runvar $testvars \ debianhvm_image=debian-7.2.0-$arch-CD-1.iso \ debianhvm_iso_kernel=/$iso_dir/vmlinuz \ debianhvm_iso_ramdisk=/$iso_dir/initrd.gz \ diff --git a/ts-debian-hvm-install b/ts-debian-hvm-install index 9bc6cc8..91c7107 100755 --- a/ts-debian-hvm-install +++ b/ts-debian-hvm-install @@ -57,10 +57,12 @@ sub preseed () { my $preseed_file = preseed_base($gho,$gsuite,'','',()); + my $disk = guest_var($gho,'diskdevice','/dev/xvda'); + $preseed_file .= (<