From: Mathias Klette <mathias.klette@profitbricks.com>
Date: Fri, 20 Jul 2012 13:08:59 +0000 (+0200)
Subject: live_build: do not fail if memtest is not available
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=b25648fa758f81b2618f1a0e991d05e2e7b785a5;p=profitbricks%2Fjenkins-build-scripts.git

live_build: do not fail if memtest is not available
---

diff --git a/live_build.sh b/live_build.sh
index f0e1caa..733d820 100755
--- a/live_build.sh
+++ b/live_build.sh
@@ -68,7 +68,8 @@ mkdir -p $BUILD_TARGET
 
 echo "Finally copying results..."
 # hack to ignore 2.6.32 kernel + initrd
-cp -v tftpboot/debian-live/amd64/initrd.img-3* tftpboot/debian-live/amd64/vmlinuz-3* tftpboot/debian-live/amd64/memtest $BUILD_TARGET/
+cp -v tftpboot/debian-live/amd64/initrd.img-3* tftpboot/debian-live/amd64/vmlinuz-3* $BUILD_TARGET/
+cp -v tftpboot/debian-live/amd64/memtest $BUILD_TARGET/ || true
 cp -v chroot/etc/pserver.version $BUILD_TARGET/
 cp -v binary/live/filesystem.squashfs $BUILD_TARGET/
 sort binary/live/filesystem.packages > $BUILD_TARGET/pserver.packages