changes from samual to make it all work

[autopkgtest.git] / xen / fixups-inside

diff --git a/xen/fixups-inside b/xen/fixups-inside
index 4bee8d8cc8e8c0ee460d8a505c67a4d3be5efced..2a38051e2d70ecbd437708996340c305ebd36f3d 100755 (executable)
--- a/xen/fixups-inside
+++ b/xen/fixups-inside
@@ -1,25 +1,29 @@
-#!/bin/sh
-set -ex
+#!/bin/bash
+set -e${ADT_SHELLX}
 
 adt_host_hostname=$1
 adt_guest_hostname=$2
 adt_host_ipaddr=$3
 adt_guest_ipaddr=$4
+adt_fs_type=$5
 
 echo '(---'
 
 cd /root
 
-perl -i~ -pe 's/ main$/ main universe/ if m/^deb http/' /etc/apt/sources.list
-apt-get update
-
-apt-get -y --force-yes install libc6-xen || ./xen-divert-tls-libc do
+if test -f /etc/lsb-release; then
+       . /etc/lsb-release
+       if [ "x$DISTRIB_ID" = xUbuntu ]; then
+               perl -i~ -pe 's/ main$/ main universe/ if m/^deb http/' \
+                       /etc/apt/sources.list
+       fi
+fi
 
 ldconfig
 
 cat >/etc/fstab <<END
 proc /proc proc defaults 0 0
-/dev/hda1 / ext3 defaults,errors=remount-ro 0 1
+/dev/hda1 / $adt_fs_type defaults,errors=remount-ro 0 1
 END
 
 mkdir -p /etc/network
@@ -38,9 +42,6 @@ END
 
 echo $adt_guest_hostname >/etc/hostname
 
-apt-get -y --force-yes install \
-       openssh-server ed build-essential
-
 perl -i~ -wne '
     BEGIN {
         $pep= PermitEmptyPasswords;