merge from --ubuntu

[autopkgtest.git] / xen / fixups-inside

diff --git a/xen/fixups-inside b/xen/fixups-inside
index a4d4bf4ece9cd004ee4e6522419e44b6f864b478..299f136db9e335a924b1bce429543a948596b285 100755 (executable)
--- a/xen/fixups-inside
+++ b/xen/fixups-inside
@@ -1,26 +1,38 @@
-#!/bin/sh
-set -ex
+#!/bin/bash
+set -e${ADT_SHELLX}
 
-hosthname=$1
-guesthname=$2
-hostaddr=$3
-guestaddr=$4
+adt_host_hostname=$1
+adt_guest_hostname=$2
+adt_host_ipaddr=$3
+adt_guest_ipaddr=$4
+adt_fs_type=$5
+adt_normaluser=$6
+adt_provideswap=$7
 
 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
+
+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
@@ -29,19 +41,17 @@ iface lo inet loopback
 
 auto eth0
 iface eth0 inet static
-       address $guestaddr
-       broadcast $guestaddr
+       address $adt_guest_ipaddr
+       broadcast $adt_guest_ipaddr
        netmask 255.255.255.255
-       pointopoint $hostaddr
-       gateway $hostaddr
+       pointopoint $adt_host_ipaddr
+       gateway $adt_host_ipaddr
 END
 
-echo $guesthname >/etc/hostname
+echo $adt_guest_hostname >/etc/hostname
 
-apt-get -y --force-yes install \
-       openssh-server ed build-essential
-
-perl -i~ -wne '
+essc=/etc/ssh/sshd_config
+perl -wne '
     BEGIN {
         $pep= PermitEmptyPasswords;
        $want= "$pep no\n";
@@ -56,6 +66,16 @@ perl -i~ -wne '
         print $want or die $! unless $done;
         print $o or die $!;
     }
-' /etc/ssh/sshd_config
+' $essc >$essc.new
+mv $essc.new $essc
+
+if [ x"$adt_normaluser" != x ]; then
+       adduser --gecos 'adtxenlvm testing normal user account' \
+               --disabled-password ${adt_normaluser}
+fi
+
+apt-get update
+apt-get install libc6-xen ||:
+apt-get -y install gdebi-core || apt-get -y install gdebi
 
 echo '---)'