From 461b6943875f864a2d31f1d6103ab1dc67ebd09e Mon Sep 17 00:00:00 2001
From: atratsevskiy <atratsevskiy@c91db197-33c1-4113-bf15-f8a5c547ca64>
Date: Thu, 11 Jun 2009 05:32:20 +0000
Subject: [PATCH] git-svn-id: http://svn.calculate.ru/calculate/trunk@1714
 c91db197-33c1-4113-bf15-f8a5c547ca64

---
 .../builder/profile/ISO/target/boot/docache   |  1 +
 install/calculate                             | 30 +++++++++----------
 2 files changed, 16 insertions(+), 15 deletions(-)
 create mode 100644 install/builder/profile/ISO/target/boot/docache

diff --git a/install/builder/profile/ISO/target/boot/docache b/install/builder/profile/ISO/target/boot/docache
new file mode 100644
index 0000000..aa5672a
--- /dev/null
+++ b/install/builder/profile/ISO/target/boot/docache
@@ -0,0 +1 @@
+#-docache-#
diff --git a/install/calculate b/install/calculate
index 6250d14..11f808c 100755
--- a/install/calculate
+++ b/install/calculate
@@ -1056,20 +1056,11 @@ sub checksystem{
 
 	#выберем язык и раскладку
 	($data{'locale'},
-	 #$data{'keymap'},
-	 #$data{'dumpkeys_charset'},
-	 #$data{'consolefont'},
-	 #$data{'consoletranslation'},
-	 #$data{'xkblayout'},
-	 #$data{'kb_groups'},
-	 #$data{'kb_layout'},
-	 #$data{'country'},
 	 $data{'language'},
-	 $data{'dictionary'}
+	 $data{'dictionary'},
 	) = @{$lang{$data{lang}}}[0,9..10];
 
-	(#$data{'locale'},
-	 $data{'keymap'},
+	($data{'keymap'},
 	 $data{'dumpkeys_charset'},
 	 $data{'consolefont'},
 	 $data{'consoletranslation'},
@@ -1077,8 +1068,6 @@ sub checksystem{
 	 $data{'kb_groups'},
 	 $data{'kb_layout'},
 	 $data{'country'},
-	 #$data{'language'},
-	 #$data{'dictionary'}
 	) = @{$lang{$changekb}}[1..8];
 
 	printmes("  ".gettext('Language')); printmes(": $data{lang}\n");
@@ -1499,6 +1488,17 @@ sub checksystem{
 		$data{linux} = "livecd";
 	}
 
+	#----------------------------------------------------------------------
+	# Определим размер RAM диска для ISO образа при загрузке с docahe
+	#----------------------------------------------------------------------
+	if($data{builder} && $data{linux}){
+		if($data{linux} ne "livecd"){
+			$data{docache} = `du -b /usr/calculate/share/linux/$data{linux}`;
+			$data{docache} =~s/^([0-9])\s.+/$1/;
+			#ISO больше 7z архива на 26% + запас 10%
+			$data{docache} = sprintf("%0.0f",$data{docache} * 1.26 * 1.1);
+	}	}
+
 	#----------------------------------------------------------------------
 	# Определим пакет тем для собираемой системы
 	# $data{themes}
@@ -6385,8 +6385,8 @@ sub makepkg{
 #------------------------------------------------------------------------------
 sub makecalculate{
 	#удалим маски
-	system "$data{path} mkdir -p $data{chroot}/etc/portage/package.keywords/calculate";
-	system "$data{path} mkdir -p $data{chroot}/etc/portage/package.unmask/calculate";
+	system "$data{path} rm -f $data{chroot}/etc/portage/package.keywords/calculate";
+	system "$data{path} rm -f $data{chroot}/etc/portage/package.unmask/calculate";
 	#Установим calculate
 	printmes("  ".gettext('Install the calculate')); printmes("...");
 	if(system "$data{path} chroot $data{chroot} emerge sys-apps/calculate &>/dev/null"){