Fix actions order of flash rebuilding.

Change.log

@@ -11,6 +11,7 @@ CHANGE LOG
 * Add empty profile route.conf for corrent work of staticroute.
 * Fix double title in grub.conf.
 * Modify patch for alsasound, muting all mics.
+* Fix actions order of flash rebuilding.
 
 1.2.3
 * Использование Calculate Overlay для профилей сборки системы

install/calculate

@@ -5296,8 +5296,37 @@ sub createiso{
 	#преобразуем в sys формат
 	isotosys();
 
+	#delete old squashfs
+	printmes("  ".gettext('Removing old image of system')); printmes("...");
+	if(defined $data{arg}{rebuild} && $data{squash_del}){
+		if(system("rm /mnt/flash/$data{squash_del}")){
+			printmes(" ".gettext('error').".\n");
+			breakiso();
+			return "";
+		}else{
+			printmes(" ".gettext('done')); printmes(".\n");
+		}
+	}
+
+	#создадим livecd.squashfs
+	my $squashfile;
+	if(!defined $data{arg}{rebuild}){
+		$squashfile = "$data{tmpdir}/livecd/target/$data{squash_cur}";
+	}else{
+		$squashfile = "/mnt/flash/$data{squash_cur}"
+	}
+
+	printmes("  ".gettext('Packing system into squashfs format')); printmes("...");
+	if(system("/usr/bin/mksquashfs $data{tmpdir}/livecd/calculate/ $squashfile &>/dev/null")){
+		printmes(" ".gettext('error').".\n");
+		breakiso();
+		return "";
+	}else{
+		printmes(" ".gettext('done')); printmes(".\n");
+	}
+	
 	#подготовим к упаковке
-	printmes("  ".gettext('Prepare system for packing')); printmes("...");
+	printmes("  ".gettext('Prepare syslinux')); printmes("...");
 	my $target = "$data{tmpdir}/livecd/target";
 	my $copyflash;
 	my $isolinux = "isolinux";
@@ -5322,22 +5351,6 @@ sub createiso{
 		printmes(" ".gettext('done')); printmes(".\n");
 	}
 
-	#создадим livecd.squashfs
-	my $squashfile;
-	if(!defined $data{arg}{rebuild}){
-		$squashfile = "$data{tmpdir}/livecd/target/$data{squash_cur}";
-	}else{
-		$squashfile = "/mnt/flash/$data{squash_cur}"
-	}
-
-	printmes("  ".gettext('Packing system into squashfs format')); printmes("...");
-	if(system("/usr/bin/mksquashfs $data{tmpdir}/livecd/calculate/ $squashfile &>/dev/null")){
-		printmes(" ".gettext('error').".\n");
-		breakiso();
-		return "";
-	}else{
-		printmes(" ".gettext('done')); printmes(".\n");
-	}
 
 	#удалим файлы распакованной системы
 	my $deltmp;
@@ -5378,10 +5391,6 @@ sub createiso{
 		breakiso();
 		return "";
 	}else{
-		#delete old squashfs
-		if(defined $data{arg}{rebuild} && $data{squash_del}){
-			`rm /mnt/flash/$data{squash_del}`;
-		}
 		printmes(" ".gettext('done')); printmes(".\n");
 	}