merge from --ubuntu

[autopkgtest.git] / xen / fixups-inside

diff --git a/xen/fixups-inside b/xen/fixups-inside
index 048cd63de05d4f142e65705e270a94c0a9d04158..299f136db9e335a924b1bce429543a948596b285 100755 (executable)
--- a/xen/fixups-inside
+++ b/xen/fixups-inside
@@ -7,6 +7,7 @@ adt_host_ipaddr=$3
 adt_guest_ipaddr=$4
 adt_fs_type=$5
 adt_normaluser=$6
+adt_provideswap=$7
 
 echo '(---'
 
@@ -27,6 +28,12 @@ proc /proc proc defaults 0 0
 /dev/hda1 / $adt_fs_type defaults,errors=remount-ro 0 1
 END
 
+if $adt_provideswap; then
+       cat >>/etc/fstab <<END
+/dev/hda2 none swap sw 0 0
+END
+fi
+
 mkdir -p /etc/network
 cat >/etc/network/interfaces <<END
 auto lo
@@ -68,6 +75,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 '---)'