* adt-xenlvm-with-testbed: sleep 1 after xm destroy, which is racy.

[autopkgtest.git] / xen / fixups

diff --git a/xen/fixups b/xen/fixups
index 151e266bd6cebd051a578a21ce7f371215c5e3f6..c09a5403955db390290bfd17f22f0aaa60e67632 100755 (executable)
--- a/xen/fixups
+++ b/xen/fixups
@@ -8,8 +8,10 @@ echo '---fixups:'
 
 cp ${ADT_XENLVM_SHARE}/fixups-inside $dest/root/
 
-mkdir -p $dest/lib/modules
-cp -a "${adt_modules}" $dest/lib/modules/.
+if test -d "${adt_modules}"; then
+       mkdir -p $dest/lib/modules
+       cp -a "${adt_modules}" $dest/lib/modules/.
+fi
 
 echo xennet >>$dest/etc/modules
 
@@ -47,7 +49,8 @@ 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_normaluser"
+       "$adt_fs_type" "$adt_normaluser" \
+       "$provideswap"
 
 kh=/etc/ssh/ssh_known_hosts
 test ! -f $kh || cp $kh $kh.new