|
|
|
@ -2149,9 +2149,11 @@ sub checksystem{
|
|
|
|
|
# Выбор планировщика
|
|
|
|
|
#----------------------------------------------------------------------
|
|
|
|
|
if(!$data{scheduler}){
|
|
|
|
|
my $scheduler = `cat /sys/block/sda/queue/scheduler`;
|
|
|
|
|
$scheduler=~m/.*\[([^\]]+)\].*/;
|
|
|
|
|
$data{scheduler} = $1;
|
|
|
|
|
if( -e "/sys/block/sda/queue/scheduler" ) {
|
|
|
|
|
my $scheduler = `cat /sys/block/sda/queue/scheduler`;
|
|
|
|
|
$scheduler=~m/.*\[([^\]]+)\].*/;
|
|
|
|
|
$data{scheduler} = $1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if($data{'removableload'} eq 'on' || !$data{scheduler}){
|
|
|
|
|
if($data{system} eq 'server'){ $data{scheduler} = 'elevator'; }
|
|
|
|
@ -3138,8 +3140,8 @@ sub extract{
|
|
|
|
|
}
|
|
|
|
|
# проверим нужно ли менять id для раздела
|
|
|
|
|
my $changeid=1;
|
|
|
|
|
foreach(`fdisk -l`) {
|
|
|
|
|
if(m/^$data{partitions_dev}5\s+[*]?\s+\d+\s+\d+\s+\d+\s+$data{disktypeid}/) {
|
|
|
|
|
foreach(`fdisk -l 2>&1`) {
|
|
|
|
|
if(m/^$data{partitions_dev}5\s+[*]?\s+\d+\s+\d+\s+\d+\s+$data{disktypeid}|GPT.*detected/) {
|
|
|
|
|
$changeid=0;
|
|
|
|
|
last;
|
|
|
|
|
}
|
|
|
|
@ -3192,11 +3194,12 @@ sub extract{
|
|
|
|
|
my $devicenumber = $2;
|
|
|
|
|
# проверим нужно ли менять id для раздела
|
|
|
|
|
my $changeid=1;
|
|
|
|
|
foreach(`fdisk -l`) {
|
|
|
|
|
if(m/^$data{rootinstall}\s+[*]?\s+\d+\s+\d+\s+\d+\s+$data{disktypeid}/) {
|
|
|
|
|
foreach(`fdisk -l 2>&1`) {
|
|
|
|
|
if(m/^$data{rootinstall}\s+[*]?\s+\d+\s+\d+\s+\d+\s+$data{disktypeid}|GPT.*detected/) {
|
|
|
|
|
$changeid=0;
|
|
|
|
|
last;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
system("echo -e \"t\n${devicenumber}\n$data{disktypeid}\nw\n\" | fdisk ${device} &>/dev/null") if $changeid;
|
|
|
|
|
}
|
|
|
|
|