From c378d621fc1217b8ac241fbc35f3563bd02d108d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?=
 =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= <mh@calculate.ru>
Date: Wed, 9 Sep 2009 10:05:51 +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=B0=D1=82=D1=87=D0=B0=20?=
 =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20/etc/init.d/root?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../3patch/etc/init.d/root.diff?scratch_ws!=  | 46 +++++++++++--------
 1 file changed, 27 insertions(+), 19 deletions(-)

diff --git a/install/profile/3patch/etc/init.d/root.diff?scratch_ws!= b/install/profile/3patch/etc/init.d/root.diff?scratch_ws!=
index dd1e1f2..46b9220 100644
--- a/install/profile/3patch/etc/init.d/root.diff?scratch_ws!=
+++ b/install/profile/3patch/etc/init.d/root.diff?scratch_ws!=
@@ -1,19 +1,27 @@
-22c22,37
-< 		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/scratch
-> 				if [[ -n `cat /proc/mounts | grep "none / aufs"` ]];
-> 				then
-> 					mount -n -o remount,rw /
-> 					mount -n -t aufs -o remount,rw none /mnt/builder
-> 				else
-> 					:		
-> 				fi
-> 				mount -o loop -t squashfs /mnt/scratch/livecd.squashfs /mnt/scratch/calculate
-> 			else
-> 				mount -n -o remount,rw /
-> 			fi
-> 			;;
+--- root.orig	2009-09-08 19:06:18.000000000 +0400
++++ root	2009-09-09 10:01:37.000000000 +0400
+@@ -19,7 +19,23 @@
+ 
+ 	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/scratch
++				if [[ -n `cat /proc/mounts | grep "none / aufs"` ]];
++				then
++					mount -n -o remount,rw /
++					mount -n -t aufs -o remount,rw none /mnt/builder
++				else
++					mount -n -t unionfs -o remount,dirs=/mnt/scratch/workspace=rw:/mnt/scratch/delta=ro:/mnt/scratch/calculate=ro unionfs /
++					mount -n -t unionfs -o remount,dirs=/mnt/scratch/delta=rw:/mnt/scratch/calculate=ro unionfs /mnt/builder
++				fi
++				mount -o loop -t squashfs /mnt/scratch/livecd.squashfs /mnt/scratch/calculate
++			else
++				mount -n -o remount,rw /
++			fi
++			;;
+ 		*)	mount -u -o rw /;;
+ 	esac
+ 	if eend $? "Root filesystem could not be mounted read/write"; then