From 41941d5e550d532e649841400b1fcf323e668c45 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, 2 Jun 2010 21:48:53 +0400
Subject: [PATCH] Added Calculate Linux Scratch support.

---
 Change.log        | 1 +
 install/calculate | 9 +++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Change.log b/Change.log
index d970f54..330c7e3 100644
--- a/Change.log
+++ b/Change.log
@@ -3,6 +3,7 @@ CHANGE LOG
 1.4.0
 * Changed path to resources from /usr/calculate to /var/calculate
 * The use of man-db when building systems.
+* Added support Calculate Scratch Server.
 
 1.3.12
 * Fix creating format a digest file.
diff --git a/install/calculate b/install/calculate
index d24ab70..dc3f0e1 100755
--- a/install/calculate
+++ b/install/calculate
@@ -521,7 +521,7 @@ sub getarg{
 		printmes(gettext('Similarly for optional arguments').".\n\n");
 
 		printmes(gettext('Location').":\n");
-		printmes("  -s, --os=[CLD|CLDG|CLDX|CLS|CDS] "); printmes(gettext('select operation system')); printmes(" (Calculate Linux Desktop KDE, Calculate Linux Desktop GNOME, Calculate Linux Desktop XFCE, Calculate Linux Scratch, Calculate Directory Server)\n");
+		printmes("  -s, --os=[CLD|CLDG|CLDX|CLS|CSS|CDS] "); printmes(gettext('select operation system')); printmes(" (Calculate Linux Desktop KDE, Calculate Linux Desktop GNOME, Calculate Linux Desktop XFCE, Calculate Linux Scratch, Calculate Scratch Server, Calculate Directory Server)\n");
 
 		printmes("  -d, --disk=DISK\t"); printmes(gettext('installation or building system volume')."\n");
 		printmes("  -b, --build\t\t"); printmes(gettext('installation for assembling')."\n");
@@ -846,6 +846,7 @@ sub welcome{
 		CLD => "Calculate Linux Desktop",
 		CLDG => "Calculate Linux Desktop",
 		CLDX => "Calculate Linux Desktop",
+		CSS => "Calculate Scratch Server",
 		CDS => "Calculate Directory Server",
 		CLS => "Calculate Linux Scratch",
 		CLSG => "Calculate Linux Scratch",
@@ -2994,6 +2995,8 @@ sub checkready{
 				number_ver($data{linuxver}) > number_ver('10.4.99')) ||
 			($data{calculate} eq "CLSG" &&
 				number_ver($data{linuxver}) > number_ver('10.0.9')) ||
+			($data{calculate} eq "CSS" &&
+				number_ver($data{linuxver}) > number_ver('10.4.99')) ||
 			($data{calculate} eq "CDS" &&
 				number_ver($data{linuxver}) > number_ver('10.4.99'))
 			) && !defined $data{arg}{'force'}
@@ -4236,7 +4239,9 @@ sub configure{
 	}
 	
 	#удалим ссылку 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";}
+	if($data{calculate} ne "CDS" && $data{calculate} ne "CSS" && $data{calculate} ne "CLS"){
+		system "$data{path} rm -f $data{chroot}/etc/init.d/net.eth0";
+	}
 
 	#если система собирается не из CLS
 	if($data{stage} !~m/iso$/){