From: Ian Jackson <ian@liberator>
Date: Wed, 11 Jul 2007 16:06:21 +0000 (+0100)
Subject: * Attempt to install libc6-xen in fixups-inside, rather than instructing
X-Git-Tag: converted-from-bzr~49
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=2a1a402e0effd011bdbb266775865ed3020315c9;p=autopkgtest.git

* Attempt to install libc6-xen in fixups-inside, rather than instructing
  debootstrap to install it.  This makes us not mind if it's missing.
---

diff --git a/debian/changelog b/debian/changelog
index 46b3123..4b5f88c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ autopkgtest (0.9.1) gutsy; urgency=low
     /usr/share/doc/autopkgtest-xenlvm).
   * Do not mind if directory named by adt_modules doesn't exist - in
     that case just don't copy any modules.
+  * Attempt to install libc6-xen in fixups-inside, rather than instructing
+    debootstrap to install it.  This makes us not mind if it's missing.
 
  --
 
diff --git a/xen/fixups-inside b/xen/fixups-inside
index 048cd63..5db1a5a 100755
--- a/xen/fixups-inside
+++ b/xen/fixups-inside
@@ -68,6 +68,7 @@ if [ x"$adt_normaluser" != x ]; then
 fi
 
 apt-get update
+apt-get install libc6-xen ||:
 apt-get -y install gdebi-core || apt-get -y install gdebi
 
 echo '---)'
diff --git a/xen/readconfig.in b/xen/readconfig.in
index efb8423..6bb353b 100644
--- a/xen/readconfig.in
+++ b/xen/readconfig.in
@@ -33,7 +33,7 @@ esac
 : ${adt_ssh_keytype:=dsa}
 
 : ${adt_debootstrap_components:='*'}
-: ${adt_debootstrap_include:=libc6-xen,openssh-server,ed}
+: ${adt_debootstrap_include:=openssh-server,ed}
 : ${adt_debootstrap_includemore:=}
 : ${adt_debootstrap_mirrors:=}
 : ${adt_debootstrap_script:=}