From 3874bc5d30501fd9fa2e0192b27f6e1cc28e2d33 Mon Sep 17 00:00:00 2001
From: root <root@calculate.local>
Date: Fri, 4 Sep 2009 19:00:19 +0400
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=BE=D0=B4=D0=B4=D0=B5=D1=80?=
 =?UTF-8?q?=D0=B6=D0=BA=D0=B8=20lzma-=D1=81=D0=B6=D0=B0=D1=82=D0=B8=D1=8F?=
 =?UTF-8?q?=20=D0=B4=D0=BB=D1=8F=20initrd?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 install/calculate  | 5 +++--
 install/cl-builder | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/install/calculate b/install/calculate
index bd94c05..40eb446 100755
--- a/install/calculate
+++ b/install/calculate
@@ -6363,13 +6363,14 @@ sub initrd_clean{
 	}
 
 	# извлечем из squash образа конфигурацию ядра
+	my $curkernel;
 	if($data{scratch_ws}){
 		unsquash("/usr/src/linux");
-		my $curkernel = `readlink $chroot$data{scratch_ws}/usr/src/linux`;
+		$curkernel = `readlink $chroot$data{scratch_ws}/usr/src/linux`;
 		chomp($curkernel);
 		unsquash("/usr/src/${curkernel}/.config") if $curkernel;
 	}else{
-		my $curkernel = `readlink $chroot/usr/src/linux`;
+		$curkernel = `readlink $chroot/usr/src/linux`;
 		chomp($curkernel);
 	}
 	# проверим поддерживается ли ядром сжатие lzma и есть ли в наличии утилита lzma
diff --git a/install/cl-builder b/install/cl-builder
index a09e7b2..fa46d6f 100755
--- a/install/cl-builder
+++ b/install/cl-builder
@@ -82,14 +82,14 @@ checkrun() {
 	#не запустим если загрузка не в Scrach режиме
 	if ! mount | grep /mnt/scratch &>/dev/null
 	then
-		echo "This program only works in the system, installed by Calculate with the option '--scratch'."
+		echo "This program only works in the system, installed by Calculate with the option '--build'."
 		exit;
 	fi
 
 	#не запустим второй раз
 	if mount | grep "/dev/pts on /mnt/builder/dev/pts " &>/dev/null
 	then
-		if [ `ps ax | grep -v grep | grep -c "/bin/bash /usr/bin/scratch"` -gt 3 ];
+		if [ `ps ax | grep -v grep | grep -c "/bin/bash /usr/bin/cl-builder"` -gt 3 ];
 		then
 			echo "This program is already run."
 			exit;