Debian preseed: Break out debian_overlays

We are going to want to handle the overlays elswhere too, so factor
out the iteration over them.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>

diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm
index a158f34351853eb6c4392eda17dd27c01b5b1cf7..47d1767ef00eff27434e64f6ce0cfb6bf42c20b8 100644 (file)
--- a/Osstest/Debian.pm
+++ b/Osstest/Debian.pm
@@ -34,6 +34,7 @@ BEGIN {
     $VERSION     = 1.00;
     @ISA         = qw(Exporter);
     @EXPORT      = qw(debian_boot_setup
+                      debian_overlays
                       %preseed_cmds
                       preseed_base
                       preseed_create
@@ -775,14 +776,23 @@ echo COMPRESS=/usr/sbin/osstest-initramfs-gzip >> \\
 END
 }
 
+sub debian_overlays ($) {
+    my ($func) = @_;
+    $func->($c{OverlayLocal}, 'overlay-local.tar');
+    $func->('overlay', 'overlay.tar');
+}
+
 sub preseed_base ($$$$;@) {
     my ($ho,$suite,$sfx,$extra_packages,%xopts) = @_;
 
     $xopts{ExtraPreseed} ||= '';
 
     preseed_ssh($ho, $sfx);
-    preseed_hook_overlay($ho, $sfx, $c{OverlayLocal}, 'overlay-local.tar');
-    preseed_hook_overlay($ho, $sfx, 'overlay', 'overlay.tar');
+
+    debian_overlays(sub {
+       my ($srcdir, $tfilename) = @_;
+       preseed_hook_overlay($ho, $sfx, $srcdir, $tfilename);
+    });
 
     my $preseed = <<"END";
 d-i debian-installer/locale string en_GB