* Do not mind if directory named by adt_modules doesn't exist - in

  that case just don't copy any modules.

diff --git a/debian/changelog b/debian/changelog
index d99b25caa34a4af77c455b30200289c031853fda..46b312357508f0b3048047ac640e9041469d6407 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ autopkgtest (0.9.1) gutsy; urgency=low
   * New `console' mode for userv service.
   * Move README.userv to autopkgtest-xenlvm package (and hence to
     /usr/share/doc/autopkgtest-xenlvm).
+  * Do not mind if directory named by adt_modules doesn't exist - in
+    that case just don't copy any modules.
 
  --
 

diff --git a/xen/README b/xen/README
index 02b1cc431fa3b817c5dcf6c91da28258f40bcfd7..2e146d8c1cdf7acf9f40b7d17ef539e4a78967cd 100644 (file)
--- a/xen/README
+++ b/xen/README
@@ -135,6 +135,7 @@ adt_ramdisk         initrd.img-* where <kernel> is vmlinuz-*
 
 adt_modules            /lib/modules/`uname -r`
        Directory with modules to be copied into the testbed.
+       If this directory does not exist, no modules will be copied.
 
 adt_lvm_vg             the system's LVM volume group if there is only one
        LVM volume group to create base filesystem image in.

diff --git a/xen/fixups b/xen/fixups
index 151e266bd6cebd051a578a21ce7f371215c5e3f6..bcd49697a77e1c8eaf5574e18dce8d2c2642bf6f 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