From c679010083e122a188cc3675f9c9f1c2590c92b5 Mon Sep 17 00:00:00 2001
From: mhiretskiy <mhiretskiy@c91db197-33c1-4113-bf15-f8a5c547ca64>
Date: Mon, 13 Jul 2009 08:10:43 +0000
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=BE=D0=B4=D0=B4=D0=B5=D1=80=D0=B6?=
 =?UTF-8?q?=D0=BA=D0=B8=20CLS?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://svn.calculate.ru/calculate/trunk@2020 c91db197-33c1-4113-bf15-f8a5c547ca64
---
 Change.log                               |  3 +++
 install/calculate                        |  2 +-
 install/profile/CLS/etc/init.d/root.diff | 20 ++++++++++++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 install/profile/CLS/etc/init.d/root.diff

diff --git a/Change.log b/Change.log
index 9b8a6a1..17b467d 100644
--- a/Change.log
+++ b/Change.log
@@ -1,5 +1,8 @@
 CHANGE LOG
 
+1.1.1 RC1
+* Добавлена поддержка установки CLS
+
 1.1.0
 * В xorg.conf параметр BusID добавляется тольков случае если видеокарт в системе две и более.
 * Добавлен параметр --set-type=flash|hdd|usb-hdd, где можно изменить тип носителя при установке.
diff --git a/install/calculate b/install/calculate
index 48af1f2..16bf60f 100755
--- a/install/calculate
+++ b/install/calculate
@@ -22,7 +22,7 @@ use Time::Local;
 #  along with this program. If not, see <http://www.gnu.org/licenses/>.
 #------------------------------------------------------------------------------
 my %data; #объявим хэш переменных
-$data{"calcver"} = "1.1.0";
+$data{"calcver"} = "1.1.1 RC1";
 
 #Определим путь к программе
 if(!getpath()){exit;};
diff --git a/install/profile/CLS/etc/init.d/root.diff b/install/profile/CLS/etc/init.d/root.diff
new file mode 100644
index 0000000..aa18885
--- /dev/null
+++ b/install/profile/CLS/etc/init.d/root.diff
@@ -0,0 +1,20 @@
+--- root	2009-07-08 04:32:27.000000000 +0000
++++ root	2009-07-10 13:13:06.000000000 +0000
+@@ -19,7 +19,16 @@
+ 
+ 	ebegin "Remounting root filesystem read/write"
+ 	case "${RC_UNAME}" in
+-		Linux)	mount -n -o remount,rw /;;
++		Linux)	SCRATCH_ROOT=`sed -nr 's/(\S+)\s+\/newroot\s+.*/\1/p' /proc/mounts`
++			if [ $SCRATCH_ROOT -a "${SCRATCH_ROOT}" != "tmpfs" ];
++			then
++				mount -n $SCRATCH_ROOT /mnt/calculate
++				mount -n -t squashfs -o remount,dirs=/mnt/calculate/workspace=rw:/mnt/calculate/diff=ro:/mnt/calculate/scratch=ro unionfs /
++				mount -n -t squashfs -o remount,dirs=/mnt/calculate/diff=rw:/mnt/calculate/scratch=ro unionfs /mnt/builder
++			else
++				mount -n -o remount,rw /
++			fi
++			;;
+ 		*)	mount -u -o rw /;;
+ 	esac
+ 	if eend $? "Root filesystem could not be mounted read/write"; then