From 703787221e20f5173dadb083982d72d1cc0da42e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D1=80=D0=B0=D1=86=D0=B5=D0=B2=D1=81=D0=BA=D0=B8?= =?UTF-8?q?=D0=B9=20=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80?= Date: Thu, 10 Jun 2010 13:32:00 +0400 Subject: [PATCH] Fix build without memtest. --- install/calculate | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/install/calculate b/install/calculate index bc9d076..279215e 100755 --- a/install/calculate +++ b/install/calculate @@ -5453,10 +5453,16 @@ sub createiso{ } #перенесем ядро и меню на флешку + my $addsoft; + { + my $mempath = "$data{tmpdir}/livecd/calculate/boot/memtest86plus/memtest.bin"; + if(-e $mempath){$addsoft .= "cp -a $mempath $target/$isolinux/memtest &&";} + } + if(-e /livecd/calculate/boot/memtest86plus/memtest.bin if(system(qq| cp $data{tmpdir}/livecd/calculate/boot/vmlinuz $target/boot/vmlinuz && cp $data{tmpdir}/livecd/calculate/boot/initrd $target/boot/ && - cp -a $data{tmpdir}/livecd/calculate/boot/memtest86plus/memtest.bin $target/$isolinux/memtest && + $addsoft cp -a $data{tmpdir}/livecd/calculate/usr/share/syslinux/isolinux.bin $target/$isolinux/ && cp -a $data{tmpdir}/livecd/calculate/usr/share/syslinux/calcmenu.c32 $target/$isolinux/ && cp $data{tmpdir}/livecd/calculate/boot/boot.jpg $target/$isolinux/ $copyflash