[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [OSSTEST PATCH 22/26] ts-debian-hvm-install: Use /dev/sda for i386, not /dev/xvda
Empirically, the device shows up as /dev/sda. Signed-off-by: Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx> --- 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 .= (<<END.($bootfile =~ m/\.efi/ ? <<END : '').<<END); d-i netcfg/get_hostname string $gn -d-i partman-auto/disk string /dev/xvda +d-i partman-auto/disk string $disk d-i partman-auto/method string regular d-i partman-auto/expert_recipe string \\ -- 1.7.10.4 _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxx http://lists.xen.org/xen-devel
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |