|
|
|
@ -120,7 +120,7 @@ if(defined $data{arg}{'vars'}){
|
|
|
|
|
|
|
|
|
|
#Соберем новый дистрибутив
|
|
|
|
|
if(!checkready()){system "$data{path} rmdir $data{mount}";} #Выполним проверки перед установкой
|
|
|
|
|
elsif(!extract()){system "$data{path} rmdir $data{mount}";} #Распакуем систему
|
|
|
|
|
elsif(!extract()){system "$data{path} rmdir $data{mount}";} #Распакуем stage
|
|
|
|
|
elsif(!configure()){} #Подготовим систему к сборке
|
|
|
|
|
}
|
|
|
|
|
#Выполним установку новой системы
|
|
|
|
@ -3678,19 +3678,19 @@ sub configure{
|
|
|
|
|
printmes(" ".gettext('done').".\n");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#chroot update overlay
|
|
|
|
|
printmes(" ".gettext('Perform calculate overlay update')); printmes("...");
|
|
|
|
|
if(
|
|
|
|
|
system("$data{exec_wget} --quiet -r --level=6 --no-parent --reject index.html --directory-prefix=/tmp http://svn.calculate.ru/overlay/") ||
|
|
|
|
|
system("rm -rf $data{chroot}/usr/local/overlays/calculate") ||
|
|
|
|
|
system("mkdir $data{chroot}/usr/local/overlays") ||
|
|
|
|
|
system("mv /tmp/svn.calculate.ru/overlay $data{chroot}/usr/local/overlays/calculate") ||
|
|
|
|
|
system("rmdir /tmp/svn.calculate.ru")
|
|
|
|
|
){
|
|
|
|
|
printmes(" ".gettext('error').".\n");
|
|
|
|
|
}else{
|
|
|
|
|
printmes(" ".gettext('done').".\n");
|
|
|
|
|
}
|
|
|
|
|
# #chroot update overlay
|
|
|
|
|
# printmes(" ".gettext('Perform calculate overlay update')); printmes("...");
|
|
|
|
|
# if(
|
|
|
|
|
# system("$data{exec_wget} --quiet -r --level=6 --no-parent --reject index.html --directory-prefix=/tmp http://svn.calculate.ru/overlay/") ||
|
|
|
|
|
# system("rm -rf $data{chroot}/usr/local/overlays/calculate") ||
|
|
|
|
|
# system("mkdir $data{chroot}/usr/local/overlays") ||
|
|
|
|
|
# system("mv /tmp/svn.calculate.ru/overlay $data{chroot}/usr/local/overlays/calculate") ||
|
|
|
|
|
# system("rmdir /tmp/svn.calculate.ru")
|
|
|
|
|
# ){
|
|
|
|
|
# printmes(" ".gettext('error').".\n");
|
|
|
|
|
# }else{
|
|
|
|
|
# printmes(" ".gettext('done').".\n");
|
|
|
|
|
# }
|
|
|
|
|
|
|
|
|
|
#chroot emerge sys-apps/portage
|
|
|
|
|
printmes(" ".gettext('Execute')); printmes(" emerge sys-apps/portage...");
|
|
|
|
|