Arrange for preseed_base to accumulate its result in a variable. This
is going to make it easier to add entries which are determined
programatically.
No functional change.
Signed-off-by: Ian Jackson <ian.jack...@eu.citrix.com>
---
Osstest/Debian.pm | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm
index a044f8f..315d25c 100644
--- a/Osstest/Debian.pm
+++ b/Osstest/Debian.pm
@@ -506,7 +506,7 @@ sub di_installcmdline_core ($$;@) {
sub preseed_base ($$$;@) {
my ($ho,$suite,$extra_packages,%xopts) = @_;
- return <<"END";
+ my $preseed = <<"END";
d-i mirror/suite string $suite
d-i debian-installer/locale string en_GB
@@ -572,10 +572,15 @@ d-i pkgsel/include string openssh-server, ntp, ntpdate,
ethtool, chiark-utils-bi
$xopts{ExtraPreseed}
-### END OF DEBIAN PRESEED BASE
+END
+
+ $preseed .= <<"END";
+### END OF DEBIAN PRESEED BASE
END
-}
+
+ return $preseed;
+}
sub preseed_create ($$;@) {
my ($ho, $sfx, %xopts) = @_;
--
1.7.10.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
