]> Frank Brehm's Git Trees - profitbricks/jenkins-build-scripts.git/commitdiff
live_build: do not fail if memtest is not available
authorMathias Klette <mathias.klette@profitbricks.com>
Fri, 20 Jul 2012 13:08:59 +0000 (15:08 +0200)
committerMathias Klette <mathias.klette@profitbricks.com>
Fri, 20 Jul 2012 13:08:59 +0000 (15:08 +0200)
live_build.sh

index f0e1caa6bec3325607525cada1d1a37ea3e7102b..733d8200dee661d2a3a9480805468472be7067e8 100755 (executable)
@@ -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