Добавлен вариант загрузки RAM в меню ISO

Если система загружена из RAM вытаскивать диск


git-svn-id: http://svn.calculate.ru/calculate/trunk@1721 c91db197-33c1-4113-bf15-f8a5c547ca64

install/builder/profile/ISO/calculate/etc/init.d/calculate

@@ -20,6 +20,19 @@ start() {
 	then
 		/usr/bin/nspluginwrapper -v -i /usr/lib32/nsbrowser/plugins/libflashplayer.so &>/dev/null && /usr/bin/nspluginwrapper -a
 	fi
+	# searching in cmdline using cdroot_type
+	for x in `cat /proc/cmdline`;do
+		case ${x} in
+			cdroot_type\=*)
+			# if found caching image on RAM - eject CD
+			if [ -f /mnt/livecd.* ];
+			then
+				eject
+				break
+			fi
+			;;
+		esac
+	done
 }
 
 #stop() {

install/builder/profile/ISO/target/isolinux/isolinux.cfg

@@ -9,6 +9,11 @@ LABEL cld
 	KERNEL /boot/vmlinuz
 	APPEND root=/dev/ram0 initrd=/boot/initrd init=/linuxrc looptype=squashfs unionfs doload=squashfs,unionfs loop=/livecd.squashfs nodevfs cdroot video=uvesafb:ywrap,1024x768-32@60,mtrr:3,splash=silent,theme:tty1 CONSOLE=/dev/tty1 udev quiet noresume doscsi
 
+LABEL cld-docache
+	MENU LABEL #-calculatename-# #-march-# #-linuxver-# #-calculatesubname-# LiveDVD (RAM)
+	KERNEL /boot/vmlinuz
+	APPEND root=/dev/ram0 initrd=/boot/initrd init=/linuxrc looptype=squashfs unionfs doload=squashfs,unionfs loop=/livecd.squashfs nodevfs cdroot video=uvesafb:ywrap,1024x768-32@60,mtrr:3,splash=silent,theme:tty1 CONSOLE=/dev/tty1 udev quiet noresume doscsi docache
+
 LABEL cld-nox
 	MENU LABEL #-calculatename-# #-march-# #-linuxver-# #-calculatesubname-# LiveDVD (No-X)
 	KERNEL /boot/vmlinuz
@@ -21,6 +26,11 @@ LABEL cds
 	KERNEL /boot/vmlinuz
 	APPEND root=/dev/ram0 initrd=/boot/initrd init=/linuxrc looptype=squashfs unionfs doload=squashfs,unionfs loop=/livecd.squashfs nodevfs cdroot video=uvesafb:ywrap,1024x768-32@60,mtrr:3,splash=silent,theme:tty1 CONSOLE=/dev/tty1 udev quiet noresume elevator=deadline
 
+LABEL cds-docache
+	MENU LABEL #-calculatename-# #-linuxver-# #-march-# LiveDVD (RAM)
+	KERNEL /boot/vmlinuz
+	APPEND root=/dev/ram0 initrd=/boot/initrd init=/linuxrc looptype=squashfs unionfs doload=squashfs,unionfs loop=/livecd.squashfs nodevfs cdroot video=uvesafb:ywrap,1024x768-32@60,mtrr:3,splash=silent,theme:tty1 CONSOLE=/dev/tty1 udev quiet noresume elevator=deadline docache
+
 LABEL cds-nox
 	MENU LABEL #-calculatename-# #-linuxver-# #-march-# LiveDVD (No-FB)
 	KERNEL /boot/vmlinuz