From b9d93e3a46ad53e39667de43248a120237d97bef Mon Sep 17 00:00:00 2001
From: atratsevskiy <atratsevskiy@c91db197-33c1-4113-bf15-f8a5c547ca64>
Date: Thu, 30 Jul 2009 16:52:20 +0000
Subject: [PATCH] git-svn-id: http://svn.calculate.ru/calculate/trunk@2256
 c91db197-33c1-4113-bf15-f8a5c547ca64

---
 install/calculate | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/install/calculate b/install/calculate
index 82a47e0..5c10cc3 100755
--- a/install/calculate
+++ b/install/calculate
@@ -5284,17 +5284,19 @@ sub createiso{
 	printmes("  ".gettext('Prepare system for packing')); printmes("...");
 	my $target = "$data{tmpdir}/livecd/target";
 	my $copyflash;
+	my $isolinux = "isolinux";
 	if(defined $data{arg}{rescratch}){
 		$copyflash = "&& cp -r $target/* /mnt/scratch/flash/";
+		$isolinux = "syslinux";
 	}
 
 	if(system(qq|
 		cp -a $data{tmpdir}/livecd/calculate/boot/vmlinuz-* $target/boot/ &&
 		cp -a $data{tmpdir}/livecd/calculate/boot/initrd $target/boot/ &&
-		cp -a $data{tmpdir}/livecd/calculate/boot/memtest86plus/memtest.bin $target/isolinux/memtest &&
-		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/ &&
+		cp -a $data{tmpdir}/livecd/calculate/boot/memtest86plus/memtest.bin $target/$isolinux/memtest &&
+		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/ &&
 		mv `find $target/boot/ -name vmlinuz-*` $target/boot/vmlinuz $copyflash
 	|)){
 		printmes(" ".gettext('error').".\n");