From b3a322689f1464e09ac820f9685336fb381d129a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A2=D1=80=D0=B0=D1=86=D0=B5=D0=B2=D1=81=D0=BA=D0=B8?=
 =?UTF-8?q?=D0=B9=20=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80?=
 <atratsevskiy@atratsevskiy.local.calculate.ru>
Date: Tue, 18 May 2010 16:04:07 +0400
Subject: [PATCH] Migrate to /var/calculate/remote in the build system

---
 install/calculate | 31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/install/calculate b/install/calculate
index 9e506a7..7997cc1 100755
--- a/install/calculate
+++ b/install/calculate
@@ -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"){