* Truncate files when writing them (copyup, copydown, etc) (!)

[autopkgtest.git] / xen / fixups

diff --git a/xen/fixups b/xen/fixups
index 3ab114c0d1d2481665a8c458c6d28709c7a9350c..1382a63b29516026a6b71dd3e06f9909e09e951a 100755 (executable)
--- a/xen/fixups
+++ b/xen/fixups
@@ -1,5 +1,5 @@
-#!/bin/sh
-set -ex
+#!/bin/bash
+set -e
 . ${ADT_XENLVM_SHARE:=/usr/share/autopkgtest/xenlvm}/readconfig
 
 dest=$adt_play/base
@@ -11,6 +11,8 @@ cp ${ADT_XENLVM_SHARE}/fixups-inside $dest/root/
 mkdir -p $dest/lib/modules
 cp -a "${adt_modules}" $dest/lib/modules/.
 
+echo xennet >>$dest/etc/modules
+
 if ! test -f "${adt_ssh_pubkey}"; then
        if [ "x${adt_ssh_pubkey}" != "x${adt_ssh_privkey}.priv" ]; then
                fail "cannot generate keypair automatically because adt_ssh_privkey \`$adt_ssh_privkey' and adt_ssh_pubkey \`$adt_ssh_pubkey' do not match up in the way required by ssh-keygen (<pubkey> must be <privkey>.pub>"
@@ -42,7 +44,7 @@ ln -s ../init.d/xenethtoolk $dest/etc/rc2.d/S21xenethtoolk
 chroot $dest root/fixups-inside \
        "$adt_host_hostname" "$adt_guest_hostname" \
        "$adt_host_ipaddr" "$adt_guest_ipaddr" \
-       "$adt_fs_type"
+       "$adt_fs_type" "$adt_normaluser"
 
 kh=/etc/ssh/ssh_known_hosts
 test ! -f $kh || cp $kh $kh.new