|
|
|
@ -674,6 +674,27 @@ sub checkerrors{
|
|
|
|
|
beep(); return "";
|
|
|
|
|
} }
|
|
|
|
|
|
|
|
|
|
#----------------------------------------------------------------------
|
|
|
|
|
# Установим значение переменной в ram, в случае если установка профиля
|
|
|
|
|
# производится в оперативную память (настройка сеанса CDROM), а также
|
|
|
|
|
# load - носитель в значение ram в случае загрузки с CD/DVD
|
|
|
|
|
# $data{location}
|
|
|
|
|
# $data{scratch}
|
|
|
|
|
#----------------------------------------------------------------------
|
|
|
|
|
$data{location} = "";
|
|
|
|
|
$data{load} = "";
|
|
|
|
|
if(`mount | grep "/dev/loop/0 on / type"` ||
|
|
|
|
|
`mount | grep "/dev/loop0 on / type"` ||
|
|
|
|
|
`mount | grep "/dev/loop0 on /newroot/mnt/livecd type"`
|
|
|
|
|
){
|
|
|
|
|
if(defined $data{arg}{'profile'}){
|
|
|
|
|
$data{location} = "ram";
|
|
|
|
|
}
|
|
|
|
|
$data{load} = "ram";
|
|
|
|
|
}
|
|
|
|
|
if(`mount | grep /mnt/scratch`){$data{scratch} = "on";}
|
|
|
|
|
else{$data{scratch} = "off"}
|
|
|
|
|
|
|
|
|
|
#----------------------------------------------------------------------
|
|
|
|
|
# Путь к архиву образа
|
|
|
|
|
#----------------------------------------------------------------------
|
|
|
|
@ -896,27 +917,6 @@ sub checksystem{
|
|
|
|
|
$data{squash_cur} = "livecd.squashfs.".$revsquash;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#----------------------------------------------------------------------
|
|
|
|
|
# Установим значение переменной в ram, в случае если установка профиля
|
|
|
|
|
# производится в оперативную память (настройка сеанса CDROM), а также
|
|
|
|
|
# load - носитель в значение ram в случае загрузки с CD/DVD
|
|
|
|
|
# $data{location}
|
|
|
|
|
# $data{scratch}
|
|
|
|
|
#----------------------------------------------------------------------
|
|
|
|
|
$data{location} = "";
|
|
|
|
|
$data{load} = "";
|
|
|
|
|
if(`mount | grep "/dev/loop/0 on / type"` ||
|
|
|
|
|
`mount | grep "/dev/loop0 on / type"` ||
|
|
|
|
|
`mount | grep "/dev/loop0 on /newroot/mnt/livecd type"`
|
|
|
|
|
){
|
|
|
|
|
if(defined $data{arg}{'profile'}){
|
|
|
|
|
$data{location} = "ram";
|
|
|
|
|
}
|
|
|
|
|
$data{load} = "ram";
|
|
|
|
|
}
|
|
|
|
|
if(`mount | grep /mnt/scratch`){$data{scratch} = "on";}
|
|
|
|
|
else{$data{scratch} = "off"}
|
|
|
|
|
|
|
|
|
|
#----------------------------------------------------------------------
|
|
|
|
|
# Считаем параметры ядра
|
|
|
|
|
#----------------------------------------------------------------------
|
|
|
|
@ -4705,54 +4705,6 @@ sub update_profile{
|
|
|
|
|
$data{'chroot'} = "";
|
|
|
|
|
foreach(@{$data{setprof}}){profile($_);}
|
|
|
|
|
|
|
|
|
|
# #обновим конфигурацию
|
|
|
|
|
# printmes(gettext('Update modules')); printmes("\n");
|
|
|
|
|
#
|
|
|
|
|
# printmes(" ".gettext('Run')); printmes(" env-update...");
|
|
|
|
|
# if(system "/usr/sbin/env-update &>/dev/null"){
|
|
|
|
|
# printmes(" ".gettext('error').".\n"); return "";
|
|
|
|
|
# }else{
|
|
|
|
|
# printmes(" ".gettext('done')); printmes(".\n");
|
|
|
|
|
# }
|
|
|
|
|
# printmes(" ".gettext('Run')); printmes(" source /etc/profile...");
|
|
|
|
|
# if(system "source /etc/profile &>/dev/null"){
|
|
|
|
|
# printmes(" ".gettext('error').".\n"); return "";
|
|
|
|
|
# }else{
|
|
|
|
|
# printmes(" ".gettext('done')); printmes(".\n");
|
|
|
|
|
# }
|
|
|
|
|
# printmes(" ".gettext('Run')); printmes(" update-modules...");
|
|
|
|
|
# if(system "/sbin/update-modules &>/dev/null"){
|
|
|
|
|
# printmes(" ".gettext('error').".\n"); return "";
|
|
|
|
|
# }else{
|
|
|
|
|
# printmes(" ".gettext('done')); printmes(".\n");
|
|
|
|
|
# }
|
|
|
|
|
# if($ENV{TERM} eq 'linux'){
|
|
|
|
|
# printmes(" ".gettext('Run')); printmes(" keymaps restart...");
|
|
|
|
|
# if(system "/etc/init.d/keymaps restart &>/dev/null"){
|
|
|
|
|
# printmes(" ".gettext('error').".\n"); return "";
|
|
|
|
|
# }else{
|
|
|
|
|
# printmes(" ".gettext('done')); printmes(".\n");
|
|
|
|
|
# }
|
|
|
|
|
# }
|
|
|
|
|
# printmes(" ".gettext('Run')); printmes(" consolefont restart...");
|
|
|
|
|
# if(system "/etc/init.d/consolefont restart &>/dev/null"){
|
|
|
|
|
# printmes(" ".gettext('error').".\n"); return "";
|
|
|
|
|
# }else{
|
|
|
|
|
# printmes(" ".gettext('done')); printmes(".\n");
|
|
|
|
|
# }
|
|
|
|
|
|
|
|
|
|
# printmes(gettext('All done')); printmes("!\n");
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#наложим πатч
|
|
|
|
|
if(
|
|
|
|
|
$data{linuxver} eq '9.6' &&
|
|
|
|
|
$data{load} eq 'ram' &&
|
|
|
|
|
$data{calculate} eq 'CLD'
|
|
|
|
|
){
|
|
|
|
|
system "sed -i 's/kwrapper4 ksmserver \$KDEWM/ksmserver \$KDEWM/' /usr/bin/startkde";
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|