Поддержка aufs и unionfs для scratch

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

@@ -1,21 +1,19 @@
---- root	2009-07-08 04:32:27.000000000 +0000
-+++ root	2009-07-10 13:13:06.000000000 +0000
-@@ -19,7 +19,17 @@
- 
- 	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
-+				mount -n -o remount,rw /
-+				mount -n -t aufs -o remount,rw none /mnt/builder
-+				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
+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
+> 			;;