From: Ian Jackson <ian@liberator>
Date: Wed, 11 Jul 2007 16:04:00 +0000 (+0100)
Subject: * Do not mind if directory named by adt_modules doesn't exist - in
X-Git-Tag: converted-from-bzr~50
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=2f58e35068e8fb7eda6c6c90f47e73b0e4653489;p=autopkgtest.git

* 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 d99b25c..46b3123 100644
--- 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 02b1cc4..2e146d8 100644
--- 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 151e266..bcd4969 100755
--- 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