Исправление патча для /etc/init.d/root

install/profile/3patch/etc/init.d/root.diff?scratch_ws!=

@@ -1,19 +1,27 @@
-22c22,37
+--- root.orig	2009-09-08 19:06:18.000000000 +0400
-< 		Linux)	mount -n -o remount,rw /;;
++++ root	2009-09-09 10:01:37.000000000 +0400
----
+@@ -19,7 +19,23 @@
-> 		Linux)	SCRATCH_ROOT=`sed -nr 's/(\S+)\s+\/newroot\s+.*/\1/p' /proc/mounts`
+ 
-> 			if [ "$SCRATCH_ROOT" -a "${SCRATCH_ROOT}" != "tmpfs" ];
+ 	ebegin "Remounting root filesystem read/write"
-> 			then
+ 	case "${RC_UNAME}" in
-> 				mount -n $SCRATCH_ROOT /mnt/scratch
+-		Linux)	mount -n -o remount,rw /;;
-> 				if [[ -n `cat /proc/mounts | grep "none / aufs"` ]];
++		Linux)	SCRATCH_ROOT=`sed -nr 's/(\S+)\s+\/newroot\s+.*/\1/p' /proc/mounts`
-> 				then
++			if [ "$SCRATCH_ROOT" -a "${SCRATCH_ROOT}" != "tmpfs" ];
-> 					mount -n -o remount,rw /
++			then
-> 					mount -n -t aufs -o remount,rw none /mnt/builder
++				mount -n $SCRATCH_ROOT /mnt/scratch
-> 				else
++				if [[ -n `cat /proc/mounts | grep "none / aufs"` ]];
-> 					:		
++				then
-> 				fi
++					mount -n -o remount,rw /
-> 				mount -o loop -t squashfs /mnt/scratch/livecd.squashfs /mnt/scratch/calculate
++					mount -n -t aufs -o remount,rw none /mnt/builder
-> 			else
++				else
-> 				mount -n -o remount,rw /
++					mount -n -t unionfs -o remount,dirs=/mnt/scratch/workspace=rw:/mnt/scratch/delta=ro:/mnt/scratch/calculate=ro unionfs /
-> 			fi
++					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