|
|
|
@ -1469,10 +1469,13 @@ sub checksystem{
|
|
|
|
|
}elsif(-e "/usr/calculate/share/linux" && $data{load} ne "ram"){
|
|
|
|
|
my $find = "\/".lc($data{'calculate'})."\-.*\-$data{march}\.";
|
|
|
|
|
my $ver = lc($data{'calculate'})."-\([^-]+)-$data{march}"; #шаблон сравнения
|
|
|
|
|
my $mask; if(!defined $data{arg}{iso}){
|
|
|
|
|
$mask = "iso|tar\.7z|tar\.lzma|tar\.bz2";
|
|
|
|
|
}else{
|
|
|
|
|
my $mask;
|
|
|
|
|
if(check_removable($data{rootinstall}) eq 'flash'){
|
|
|
|
|
$mask = "iso";
|
|
|
|
|
}elsif(defined $data{arg}{iso}){
|
|
|
|
|
$mask = "tar\.7z|tar\.lzma|tar\.bz2";
|
|
|
|
|
}else{
|
|
|
|
|
$mask = "iso|tar\.7z|tar\.lzma|tar\.bz2";
|
|
|
|
|
}
|
|
|
|
|
foreach(`$data{path} find "/usr/calculate/share/linux/"`){
|
|
|
|
|
if(/$find($mask)$/){
|
|
|
|
@ -2026,6 +2029,7 @@ sub checksystem{
|
|
|
|
|
elsif($format =~m/reiserfs/){$data{'format'} = 'reiserfs';}
|
|
|
|
|
elsif($format =~m/reiser4/){$data{'format'} = 'reiser4';}
|
|
|
|
|
elsif($format =~m/xfs/){$data{'format'} = 'xfs';}
|
|
|
|
|
elsif(check_removable($data{arg}{'disk'}) eq "flash"){$data{'format'} = 'fat32';}
|
|
|
|
|
else{$data{'format'} = 'reiserfs';}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -2043,6 +2047,7 @@ sub checksystem{
|
|
|
|
|
"reiserfs" => "/sbin/mkfs.reiserfs -f -l",
|
|
|
|
|
"reiser4" => "/sbin/mkfs.reiser4 -y -L",
|
|
|
|
|
"xfs" => "/sbin/mkfs.xfs -f -L",
|
|
|
|
|
"fat32" => "/sbin/mkfs.vfat -F 32 -n",
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
if($formatrun{$data{'format'}} && -e "/sbin/mkfs.$data{'format'}"){
|
|
|
|
@ -2055,6 +2060,7 @@ sub checksystem{
|
|
|
|
|
elsif(-e "/sbin/mkfs.reiserfs"){ $data{'format'} = 'reiserfs'; }
|
|
|
|
|
elsif(-e "/sbin/mkfs.reiser4"){ $data{'format'} = 'reiser4'; }
|
|
|
|
|
elsif(-e "/sbin/mkfs.xfs"){ $data{'format'} = 'xfs'; }
|
|
|
|
|
elsif(-e "/sbin/mkfs.vfat"){ $data{'format'} = 'fat32'; }
|
|
|
|
|
else{ $data{NOMES} = ""; printmes("\n".gettext('Error')."! ".gettext('Formatting utility not found').".\n"); return ""; }
|
|
|
|
|
$data{formatrun} = $formatrun{$data{'format'}};
|
|
|
|
|
}
|
|
|
|
|