|
|
|
@ -1503,7 +1503,7 @@ sub checksystem{
|
|
|
|
|
} }
|
|
|
|
|
$data{linux} = lc($data{'calculate'})."-$data{linuxver}-$data{march}.tar.bz2";
|
|
|
|
|
#установка системы
|
|
|
|
|
}elsif(-e "/usr/calculate/share/linux" && $data{load} ne "ram"){
|
|
|
|
|
}elsif(-e "/usr/calculate/share/linux" && $data{load} ne "ram" && $data{load} ne "scratch"){
|
|
|
|
|
my $find = "\/".lc($data{'calculate'})."\-.*\-$data{march}\.";
|
|
|
|
|
my $ver = lc($data{'calculate'})."-\([^-]+)-$data{march}"; #шаблон сравнения
|
|
|
|
|
my $mask;
|
|
|
|
@ -1542,6 +1542,9 @@ sub checksystem{
|
|
|
|
|
){
|
|
|
|
|
$data{linuxver} = $data{os};
|
|
|
|
|
$data{linux} = "livecd";
|
|
|
|
|
}elsif($data{load} eq "scratch"){
|
|
|
|
|
$data{linuxver} = $data{os};
|
|
|
|
|
$data{linux} = "scratch";
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#----------------------------------------------------------------------
|
|
|
|
|