From 78cc79d1cd935cc5995207dc2ea290c8cacae66c Mon Sep 17 00:00:00 2001
From: root <root@movie.local.calculate.ru>
Date: Wed, 2 Sep 2009 10:55:01 +0400
Subject: [PATCH] =?UTF-8?q?guest=20=D0=B1=D1=83=D0=B4=D0=B5=D1=82=20=D1=81?=
 =?UTF-8?q?=D0=BE=D0=B7=D0=B4=D0=B0=D0=B2=D0=B0=D1=82=D1=8C=D1=81=D1=8F=20?=
 =?UTF-8?q?=D0=BD=D0=B0=20=D0=B2=D1=81=D0=B5=D1=85=20=D0=B4=D0=B5=D1=81?=
 =?UTF-8?q?=D0=BA=D1=82=D0=BE=D0=BF=D0=B0=D1=85=20=D0=BA=D1=80=D0=BE=D0=BC?=
 =?UTF-8?q?=D0=B5=20CLS?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 install/calculate | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/install/calculate b/install/calculate
index 34101e1..d18060d 100755
--- a/install/calculate
+++ b/install/calculate
@@ -4489,12 +4489,8 @@ sub packsystem{
 	system "$data{path} chroot $data{'chroot'} sed -i -r 's/^root:.*/$data{hash_root}/' /etc/shadow";
 	system "$data{path} chroot $data{'chroot'} sed -i -r 's/^root:.*/$data{hash_root}/' /etc/shadow-";
 
-	#Добавим пользователя guest
-	if((	$data{calculate} eq 'CLS' ||
-		($data{system} eq 'desktop' && $data{stage} !~m/iso$/)
-	   ) &&
-	   !$data{createiso}
-	){
+	#Добавим пользователя guest для десктопа
+	if($data{system} eq 'desktop' && $data{calculate} ne 'CLS' && !$data{createiso}){
 		#Добавим пользователя guest
 		system "$data{path} chroot $data{'chroot'} groupadd --gid 999 guest";
 		system "$data{path} chroot $data{'chroot'} useradd --uid 999 --gid 999 -m --home-dir /home/guest --shell /bin/bash --groups audio,cdrom,plugdev,video,wheel guest";