|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [OSSTEST PATCH 5/9] Debian.pm: Pass $ho/$gho to preseed_base
This is going to be useful soon.
Signed-off-by: Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
---
Osstest/Debian.pm | 6 +++---
ts-debian-hvm-install | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm
index e3e1c90..a044f8f 100644
--- a/Osstest/Debian.pm
+++ b/Osstest/Debian.pm
@@ -503,8 +503,8 @@ sub di_installcmdline_core ($$;@) {
return @cl;
}
-sub preseed_base ($$;@) {
- my ($suite,$extra_packages,%xopts) = @_;
+sub preseed_base ($$$;@) {
+ my ($ho,$suite,$extra_packages,%xopts) = @_;
return <<"END";
d-i mirror/suite string $suite
@@ -813,7 +813,7 @@ END
my $extra_packages = join(",",@extra_packages);
- my $preseed_file= preseed_base($suite,$extra_packages,%xopts);
+ my $preseed_file= preseed_base($ho,$suite,$extra_packages,%xopts);
$preseed_file .= (<<END);
d-i partman-auto/method string lvm
diff --git a/ts-debian-hvm-install b/ts-debian-hvm-install
index 449b96c..cfd5144 100755
--- a/ts-debian-hvm-install
+++ b/ts-debian-hvm-install
@@ -43,7 +43,7 @@ our $gho;
sub preseed () {
- my $preseed_file = preseed_base('wheezy','',());
+ my $preseed_file = preseed_base($gho,'wheezy','',());
my $authkeys = join('\\n', split(/\n/, authorized_keys()));
$preseed_file .= (<<END);
--
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 |