Add parameter --set-scheduler=noop|anticipatory|cfq|deadline for select type of elevator.

Change.log

@@ -6,6 +6,7 @@ CHANGE LOG
 * Change creating iso-image for install it to flash by using Universal Netboot Installer.
 * Fix install to USB-HDD.
 * Add parameter --set-uuid=on|off for use UUID label devices.
+* Add parameter --set-scheduler=noop|anticipatory|cfq|deadline for select type of elevator.
 
 1.3.4
 * Add tracking of changes kernel in cl-builder.

install/calculate

@@ -346,6 +346,7 @@ sub getarg{
 			"type",
 			"clock",
 			"composite",
+			"scheduler",
 			"system",
 			"swapon",
 			"sleep",
@@ -375,7 +376,7 @@ sub getarg{
 				$data{$1} = $data{arg}{$_};
 			}
 		}
-		#Допустимые аргументы
+	#Допустимые аргументы
 		my %par = ();
 		#Проверим аргументы
 		foreach(keys %{$data{par}}){
@@ -502,6 +503,7 @@ sub getarg{
 		$data{CHECKSYSTEM_NOMES}++;
 	}
 
+
 	#----------------------------------------------------------------------
 	# Выполним информационные команды
 	#----------------------------------------------------------------------
@@ -812,6 +814,21 @@ sub checkerrors{
 		beep(); return "";
 	}
 
+
+	#перечень возможных планировщиков
+	@{$data{other}}{scheduler} = ['noop', 'anticipatory', 'cfq', 'deadline'];
+	if(
+		$data{scheduler} &&
+		($data{scheduler} ne 'noop' &&
+		 $data{scheduler} ne 'anticipatory' &&
+		 $data{scheduler} ne 'cfq' &&
+		 $data{scheduler} ne 'deadline'
+		)
+	){
+		beep();
+		printmes(gettext('Wrong name of the Scheduler').".\n");
+		return "";
+	}
 	return 1;
 }
 
@@ -2121,6 +2138,20 @@ sub checksystem{
 		$data{uuid} = "off";
 	}
 
+	#----------------------------------------------------------------------
+	# Выбор планировщика
+	#----------------------------------------------------------------------
+	if(!$data{scheduler}){
+		my $scheduler = `cat /sys/block/sda/queue/scheduler`;
+		$scheduler=~m/.*\[([^\]]+)\].*/;
+		$data{scheduler} = $1;
+
+		if($data{'removableload'} eq 'on' || !$data{scheduler}){
+			if($data{system} eq 'server'){ $data{scheduler} = 'elevator'; }
+			else{ $data{scheduler} = 'cfq'; }
+		}
+	}
+
 	#----------------------------------------------------------------------
 	# Считаем uuid загрузочного диска, определим его метку
 	# $data{uuid_load}, $data{root_load_set}
@@ -2773,7 +2804,10 @@ sub checksystem{
 	if(!$data{gentoo_mirrors}){
 		if($data{language} eq 'ru'){
 			$data{gentoo_mirrors} = "http://mirror.yandex.ru/gentoo-distfiles http://distfiles.gentoo.org http://distro.ibiblio.org/pub/linux/distributions/gentoo";
-	}	}
+		}else{
+			$data{gentoo_mirrors} = '';
+		}
+	}
 
 	#----------------------------------------------------------------------
 	# Определим USB устройства

install/i18n/ru_RU/LC_MESSAGES/calculate.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: support.ru\n"
-"POT-Creation-Date: 2010-01-25 16:07+0300\n"
+"POT-Creation-Date: 2010-02-01 14:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -847,6 +847,9 @@ msgstr "Пропишем устройства в автозагрузку"
 msgid "Written by"
 msgstr "Автор программы --"
 
+msgid "Wrong name of the Scheduler"
+msgstr "Неверное имя Scheduler"
+
 msgid "You can install in Scratch mode Calculate Linux versions 9.8 or higher"
 msgstr ""
 "Вы можете установить в Scratch режиме Calculate Linux версии 9.8 или выше"

install/profile/1default/boot/grub/grub.conf?pass=install

@@ -30,10 +30,10 @@ title #-calculatename-# #-linuxver-# #-march-#
 #system#
 root (#-grubinstall-#)
 #?system=desktop#
-kernel /boot/vmlinuz root=#-root_install_set-# video=uvesafb:ywrap,1024x768-32@60,mtrr:3,splash=silent,theme:tty1 CONSOLE=/dev/tty1 udev quiet #-swap_resume-# doscsi#-grub_delay-#
+kernel /boot/vmlinuz root=#-root_install_set-# video=uvesafb:ywrap,1024x768-32@60,mtrr:3,splash=silent,theme:tty1 CONSOLE=/dev/tty1 udev quiet #-swap_resume-# elevator=#-elevator-# doscsi#-grub_delay-#
 #system#
 #?system=server#
-kernel /boot/vmlinuz root=#-root_install_set-# video=uvesafb:ywrap,1024x768-32@60,mtrr:3,splash=silent,theme:tty1 CONSOLE=/dev/tty1 udev quiet #-swap_resume-# elevator=deadline doscsi#-grub_delay-#
+kernel /boot/vmlinuz root=#-root_install_set-# video=uvesafb:ywrap,1024x768-32@60,mtrr:3,splash=silent,theme:tty1 CONSOLE=/dev/tty1 udev quiet #-swap_resume-# elevator=#-elevator-# doscsi#-grub_delay-#
 #system#
 initrd /boot/initrd
 #-grub_another-#