Migrate to /var/calculate/remote in the build system

master
Трацевский Александр 14 years ago
parent 54f581faf6
commit b3a322689f

@ -4052,7 +4052,6 @@ sub configure{
#printmes(" ".gettext('New release number')); printmes("...");
$data{laymandir} = "/var/lib/layman";
if(!-e $data{laymandir}){$data{laymandir} = "/usr/local/portage/layman";}
#если система собирается не из CLS
if($data{stage} !~m/iso$/){
@ -4089,9 +4088,17 @@ sub configure{
}
printmes(" ".gettext('done').".\n");
#Подмонтируем /dev
printmes(" ".gettext('Mount')); printmes(" /dev...");
if(system "$data{path} mount -o bind /dev $data{chroot}/dev &>/dev/null"){
#Подмонтируем /dev/shm
printmes(" ".gettext('Mount')); printmes(" /dev/shm...");
if(system "$data{path} mount -o bind /dev/shm $data{chroot}/dev/shm &>/dev/null"){
printmes(" ".gettext('error')."!\n");
umountbuild(); return '';
}
printmes(" ".gettext('done').".\n");
#Подмонтируем /dev/pts
printmes(" ".gettext('Mount')); printmes(" /dev/pts...");
if(system "$data{path} mount -o bind /dev/pts $data{chroot}/dev/pts &>/dev/null"){
printmes(" ".gettext('error')."!\n");
umountbuild(); return '';
}
@ -4105,9 +4112,9 @@ sub configure{
my $developer; if($data{linuxver} =~/[0-9]+\.[0-9]+\.[0-9]+/){$developer = "/developer"}
system "$data{path} cd $data{chroot}/etc; rm make.profile; ln -sf ../var/lib/layman/calculate/profiles/calculate/$data{system}/$data{calculate}/$mask$developer make.profile";
#Подмонтируем /usr/calculate/share
printmes(" ".gettext('Mount')); printmes(" /usr/calculate/share...");
if(system "$data{path} mount -o bind /usr/calculate/share $data{chroot}/usr/calculate/share &>/dev/null"){
#Подмонтируем /var/calculate/remote
printmes(" ".gettext('Mount')); printmes(" /var/calculate/remote...");
if(system "$data{path} mount -o bind /var/calculate/remote $data{chroot}/var/calculate/remote &>/dev/null"){
printmes(" ".gettext('error')."!\n");
umountbuild(); return '';
}
@ -4150,16 +4157,6 @@ sub configure{
}
}
# #Скопируем /etc/portage/bashrc
# printmes(" ".gettext('Copy')); printmes(" /etc/portage/bashrc...");
# if(system "$data{path} cp -H --remove-destination /etc/portage/bashrc $data{chroot}/etc/portage/bashrc"
# ){
# beep();
# printmes(" ".gettext('error')."!\n");
# }else{
# printmes(" ".gettext('done').".\n");
# }
#chroot emerge --sync
printmes(" ".gettext('Perform portages update')); printmes("...");
if(system "$data{emergerun1} --sync $data{emergerun2} &>/dev/null"){

Loading…
Cancel
Save