git-svn-id: http://svn.calculate.ru/calculate/trunk@2252 c91db197-33c1-4113-bf15-f8a5c547ca64

install/calculate

@@ -5264,11 +5264,12 @@ sub createiso{
 
 	#подготовим к упаковке
 	printmes("  ".gettext('Prepare system for packing')); printmes("...");
-	my $target;
-	if(!defined $data{arg}{rescratch}){
-		$target = "$data{tmpdir}/livecd/target";
+	my $target = "$data{tmpdir}/livecd/target";
+	my $copyflash;
+	if(defined $data{arg}{rescratch}){
+		$copyflash = "cp -r $target/* /mnt/scratch/flash/";
 	}else{
-		$target = "/mnt/scratch/flash";
+		$copyflash = 'echo -n';
 	}
 
 	if(system(qq|
@@ -5278,10 +5279,11 @@ sub createiso{
 		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
+		mv `find $target/boot/ -name vmlinuz-*` $target/boot/vmlinuz &&
+		$copyflash
 	|)){
 		printmes(" ".gettext('error').".\n");
-# 		breakiso();
+ 		breakiso();
 		return "";
 	}else{
 		printmes(" ".gettext('done')); printmes(".\n");