From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ian Jackson <ian.jackson@eu.citrix.com>
Subject: [OSSTEST PATCH v1.1 7/7] ts-debian-fixup: Install the
	overlays
Date: Tue, 29 Sep 2015 16:24:04 +0100
Message-ID: <1443540244-31039-1-git-send-email-ian.jackson@eu.citrix.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xen.org>
Received: from mail6.bemta5.messagelabs.com ([195.245.231.135])
	by lists.xen.org with esmtp (Exim 4.72)
	(envelope-from <prvs=707268040=Ian.Jackson@citrix.com>)
	id 1ZgwlL-00053s-GP
	for xen-devel@lists.xenproject.org; Tue, 29 Sep 2015 15:24:15 +0000
List-Unsubscribe: <http://lists.xen.org/cgi-bin/mailman/options/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xen.org>
List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help>
List-Subscribe: <http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=subscribe>
Sender: xen-devel-bounces@lists.xen.org
Errors-To: xen-devel-bounces@lists.xen.org
To: xen-devel@lists.xenproject.org
Cc: Ian Jackson <Ian.Jackson@eu.citrix.com>, Ian Campbell <ian.campbell@citrix.com>
List-Id: xen-devel@lists.xenproject.org

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.
---
 ts-debian-fixup |   13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/ts-debian-fixup b/ts-debian-fixup
index 6d24587..75c93e3 100755
--- 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();
-- 
1.7.10.4