* 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 46b312357508f0b3048047ac640e9041469d6407..4b5f88c77d301b4c3908ba8f854fe3b3bdf76ca6 100644 (file)
--- 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 048cd63de05d4f142e65705e270a94c0a9d04158..5db1a5a37f2eb0bf059a7e3e15121b3ea14e0c90 100755 (executable)
--- 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 efb8423af937e674d63e379f4f479241698ccf96..6bb353ba32a0ea0fd1f18d3841d5aa32543ce02a 100644 (file)
--- 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:=}