From 30a680ceaa6dbc1708935a807d14fbf56adc40cf 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: Wed, 9 Sep 2009 12:08:16 +0400
Subject: [PATCH] =?UTF-8?q?=D1=81=D0=B1=D0=BE=D1=80=D0=BA=D0=B0=20=D1=81?=
 =?UTF-8?q?=20aufs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../etc/portage/package.keywords/default      |  1 +
 install/calculate                             | 23 +++++++++++++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/install/builder/profile/0builder/etc/portage/package.keywords/default b/install/builder/profile/0builder/etc/portage/package.keywords/default
index 7bf3c03..2560750 100644
--- a/install/builder/profile/0builder/etc/portage/package.keywords/default
+++ b/install/builder/profile/0builder/etc/portage/package.keywords/default
@@ -5,6 +5,7 @@ media-libs/mesa #-unmask-#
 sys-apps/openrc #-unmask-#
 sys-apps/baselayout #-unmask-#
 sys-apps/sysvinit #-unmask-#
+sys-fs/aufs2 #-unmask-#
 sys-fs/cryptsetup #-unmask-#
 ~sys-fs/udev-141 #-unmask-#
 =sys-kernel/gentoo-sources-2.6.30-r6 #-unmask-#
diff --git a/install/calculate b/install/calculate
index a7c236a..464c2cb 100755
--- a/install/calculate
+++ b/install/calculate
@@ -3993,7 +3993,7 @@ sub configure{
 		system "$data{path} cp '$data{kernel_config_loadpath}/$data{kernel_config_name}' '$data{kernel_config_build}'";
 	}
 
-	#выполним  make oldconfig если система собирается не из CLS
+	#выполним  make oldconfig и make modules_prepare если система собирается не из CLS
 	if($data{stage} !~m/iso$/){
 		printmes("  ".gettext('Execute')); printmes(" make oldconfig...\n");
 		if(system qq|$data{path} chroot $data{chroot} /usr/calculate/install/calculate --chroot="cd /usr/src/linux && make oldconfig"|){
@@ -4001,7 +4001,16 @@ sub configure{
 			umountbuild(); return '';
 		}else{
 			printmes(" ".gettext('done').".\n");
-	}	}
+		}
+
+		printmes("  ".gettext('Execute')); printmes(" make modules_prepare...\n");
+		if(system qq|$data{path} chroot $data{chroot} /usr/calculate/install/calculate --chroot="cd /usr/src/linux && make modules_prepare"|){
+			printmes(" ".gettext('error')."!\n");
+			umountbuild(); return '';
+		}else{
+			printmes(" ".gettext('done').".\n");
+		}
+	}
 
 	#выполним  make menuconfig
 	if($data{menuconfig} eq 'on'){
@@ -4048,7 +4057,17 @@ sub configure{
 		}else{
 			printmes(" ".gettext('done').".\n");
 		}
+
+		#chroot emerge sys-fs/aufs2
+		printmes("  ".gettext('Execute')); printmes(" emerge sys-fs/aufs2...");
+		if(system "$data{emergerun1} sys-fs/aufs2 $data{emergerun2} &>/dev/null"){
+			printmes(" ".gettext('error')."!\n");
+			umountbuild(); return '';
+		}else{
+			printmes(" ".gettext('done').".\n");
+		}
 	}
+	
 	#удалим ссылку net.eth0, т.к. во всех десктопах, кроме CLS будет использоваться networkmanager
 	if($data{calculate} ne "CDS" && $data{calculate} ne "CLS"){system "$data{path} rm -f $data{chroot}/etc/init.d/net.eth0";}