ts-debian-fixup: Install the overlays

We want debootstrap-installed guests to get these overlays too.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
---
v2: Use a tmpfile rather than a stashfile for the tarball.

diff --git a/ts-debian-fixup b/ts-debian-fixup
index 6d2458737f76dd62421b9763f5df22e59fd85cf5..75c93e3c9459eec711ded0050542ec873effbf1f 100755 (executable)
--- a/ts-debian-fixup
+++ b/ts-debian-fixup
@@ -19,6 +19,7 @@ use strict qw(vars);
 use DBI;
 use Osstest;
 use Osstest::TestSupport;
+use Osstest::Debian;
 
 tsreadconfig();
 
@@ -64,6 +65,17 @@ sub access () {
 END
 }
 
+sub overlay ($$) {
+    my ($srcdir, $tfilename) = @_;
+
+    my $fh = IO::File::new_tmpfile() or die $!;
+    contents_make_cpio($fh,'ustar',$srcdir);
+    seek $fh,0,0 or die "$!";
+    target_cmd_inputfh_root($ho, $fh, <<END);
+        tar -C $mountpoint -xf -
+END
+}
+
 our $extra;
 
 sub console () {
@@ -175,6 +187,7 @@ savecfg();
 ether();
 target_kernkind_check($gho);
 access();
+debian_overlays(\&overlay);
 console();
 filesystems();
 otherfixupcfg();