--- trunk/installer-simple/bin/installer.sh.in	2014/01/08 08:55:40	2474
+++ trunk/installer-simple/bin/installer.sh.in	2014/01/08 10:25:50	2480
@@ -110,16 +110,12 @@
 	fi
 }
 
-dialog_setup_system_menu()
+task_setup_system_menu()
 {
 	local mode
 	local retval
 
-	mode=$(menubox -h $"[ Harddrive partitioning ]" $"\nSelect an installation mode" \
-		$"1:Automatic setup (recommended)" \
-		":" \
-		$":\Z1Expert modes:\Zn" \
-		$"2:Common IDE-disk (manual setup)")
+	mode="$(dialog_setup_system_menu)"
 	retval=$?
 	[[ ${retval} -eq 1 ]] && return 1
 	if [[ ${retval} -eq 0 ]]
@@ -127,7 +123,7 @@
 		case "${mode}" in
 			"1") run_install_auto ;;
 			"2") run_install_normal ;;
-			"") dialog_setup_system_menu;;
+			"") task_setup_system_menu;;
 		esac
 	fi
 }
@@ -176,7 +172,7 @@
 	messagebox -y 12 -h $"Detected hardware:" "${message}"
 }
 
-dialog_setup_hdd_partitions_manual()
+task_setup_hdd_partitions_manual()
 {
 	local i
 	local retval
@@ -197,7 +193,7 @@
 	fi
 }
 
-dialog_setup_hdd_partitions_auto()
+task_setup_hdd_partitions_auto()
 {
 	local i
 	local retval
@@ -232,24 +228,20 @@
 	return 0
 }
 
-dialog_main()
+task_main()
 {
 	local method=0
 	local retval
 
 	while [[ ${method} -le 2 ]]
 	do
-		method=$(CANCEL_LABEL=$"Exit" menubox $"Configuration:" \
-			$"1:Install system" \
-			$"2:Show detected harddrives" \
-			$"3:Exit and reboot" \
-			$"4:Exit and drop into a shell")
+		method=$(dialog_main)
 		retval=$?
 		[[ ${retval} -eq 1 ]] && exit 1
 		if [[ ${retval} -eq 0 ]]
 		then
 			case ${method} in
-				"1") dialog_setup_system_menu ;;
+				"1") task_setup_system_menu ;;
 				"2") dialog_hardware_detection ;;
 				"3") install_do_reboot ;;
 				"4") /bin/bash --login -i ;;
@@ -334,24 +326,6 @@
 	export ALL_CDROMS="$(get_hwinfo cdrom)"
 }
 
-hdd_size_below_256mb()
-{
-	local hdd="$1"
-	local size
-	local retval
-	[[ -z ${hdd} ]] && dialog_die "Error: get_hdd_size() no \$hdd given!"
-
-	size=$(fdisk -l ${hdd} | grep "Disk.*${hdd}" | sed 's:.*,\ \(.*\)\ byte.*:\1:')
-	if [[ ${size} -le 257000000 ]]
-	then
-		retval="0"
-	else
-		retval="1"
-	fi
-
-	return "${retval}"
-}
-
 setup_hdd_partitions_auto()
 {
 	ROOTHDD="${HDD}1"
@@ -454,164 +428,6 @@
 	popd > /dev/null
 }
 
-disabled_install_bootsector_chroot()
-{
-	local my_roothdd
-	local grubconf="${INSTALLROOT}/boot/grub/grub.conf"
-	local grub2conf="/boot/grub/grub.cfg"
-
-	# check for grub2
-	if [[ -f ${INSTALLROOT}/sbin/grub-mkconfig ]]
-	then
-		# needed by grub-mkconfig on the first run
-		if [[ ! -f ${INSTALLROOT}/boot/grub/video.lst ]]
-		then
-			install -m0644 ${INSTALLROOT}/lib/grub/*/video.lst ${INSTALLROOT}/boot/grub/video.lst || dialog_die
-		fi
-
-		# set kernelopts
-		if [[ -f ${INSTALLROOT}/etc/conf.d/grub ]]
-		then
-			sed -i "s:^\(export GRUB_CMDLINE_LINUX_DEFAULT=\).*:\1\"${KERNELOPTS}\":" ${INSTALLROOT}/etc/conf.d/grub || dialog_die
-		else
-			CONFIG="${INSTALLROOT}/etc/conf.d/grub"
-			clearconfig
-			addconfig "export GRUB_CMDLINE_LINUX_DEFAULT=\"${KERNELOPTS}\""
-		fi
-		CONFIG="${INSTALLROOT}/root/.installrc"
-		clearconfig
-		# only grub 1.99
-		addconfig 'type -P grub-mkdevicemap && grub-mkdevicemap'
-		addconfig "grub-install --no-floppy ${HDD} &> /dev/null"
-		addconfig "LC_ALL=C grub-mkconfig -o ${grub2conf}  &> /dev/null"
-		addconfig "exit 0"
-
-	# grub-legacy
-	else
-		source ${INSTALLROOT}/boot/kernelversion
-
-		if [ -e ${INSTALLROOT}/etc/alx_version ]
-		then
-			OLD_ALXVER="${ALXVER}"
-			source ${INSTALLROOT}/etc/alx_version
-			KRNVER="ALX-${ALXVER}"
-			ALXVER="${OLD_ALXVER}"
-		fi
-
-		[[ -z ${KRNVER} ]] && KRNVER="AutoSta_LX"
-		[[ -z ${KRNINITRD} ]] && KRNINITRD="initrd"
-		[[ -z ${KRNIMG} ]] && KRNIMG="vmlinuz"
-
-		# uuid support
-		my_roothdd="UUID=$(get_uuid ${ROOTHDD})"
-
-		CONFIG="${grubconf}"
-		clearconfig
-		addconfig "default 0"
-		addconfig "timeout 3"
-		# using current root password
-		addconfig "password --md5 $(cat ${INSTALLROOT}/etc/shadow | grep root | cut -d: -f2)"
-
-		addconfig
-		addconfig "# normal boot"
-		addconfig "title ${KRNVER}"
-		addconfig "root (hd0,0)"
-		addconfig "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS}"
-		if is_initrd_supported
-		then
-			addconfig "initrd /boot/${KRNINITRD}"
-		fi
-
-		addconfig
-		addconfig "# admin boot"
-		addconfig "title ${KRNVER} - Re-run hardware-detection"
-		addconfig "lock"
-		addconfig "root (hd0,0)"
-		addconfig "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS} hardware-auto-detection"
-		if is_initrd_supported
-		then
-			addconfig "initrd /boot/${KRNINITRD}"
-		fi
-
-		addconfig
-		addconfig "title ${KRNVER} - Reset *all* local settings"
-		addconfig "lock"
-		addconfig "root (hd0,0)"
-		addconfig "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS} alx-reset-settings"
-		if is_initrd_supported
-		then
-			addconfig "initrd /boot/${KRNINITRD}"
-		fi
-
-		# bootsector schreiben chrooted schreiben (lfs/magellan)
-		cat > ${INSTALLROOT}/root/.installrc << CHROOTEOF
-/usr/sbin/grub --no-floppy --batch << "EOF" 1> /dev/null 2> /dev/null
-root (hd0,0)
-setup (hd0)
-quit
-EOF
-exit 0
-CHROOTEOF
-	fi
-
-	# run installrc
-	chrooted /bin/bash --rcfile /root/.installrc -i
-	rm ${INSTALLROOT}/root/.installrc
-}
-
-disabled_install_initrd_chroot()
-{
-	# only generate initrds if the cmd exists
-	is_initrd_supported || return 0
-
-	DISKMODS="sd_mod"
-	OLDPATAMODS="amd74xx piix sis5513 via82cxxx"
-	PATAMODS="ata_piix pata_amd pata_mpiix pata_oldpiix pata_sis pata_via"
-	SATAMODS="sata_via sata_sis sata_nv"
-	DRMMODS="i915 mga nouveau r128 radeon savage sis tdfx ttm via"
-	OTHERMODS=""
-	case ${SPECIALDEVICE} in
-		zotac_intel) FBMODS=""; DRMMODS="i915" ;;
-		zotac_nvidia) FBMODS=""; DRMMODS="nouveau" ;;
-		rangee) FBMODS="" ;; ## fallback to vesafb, viafb does not run on all CLE266 boards
-		# not working with kms enabled drivers -> segfaults
-		#maxdata) FBMODS="i810fb" ;; ## check for maxdata / i810/ i815 Chipsets and disable KMS and use i810fb frambuffer
-		maxdata) FBMODS="" ;;
-		*) FBMODS="uvesafb" ;;
-	esac
-
-	if [[ ${FORMFACTOR} = laptop ]]
-	then
-		OTHERMODS="acpi-cpufreq cpufreq_ondemand cpufreq_conservative cpufreq_powersave"
-	fi
-
-	# install an appropriate uvesafb.conf
-	install -d ${INSTALLROOT}/etc/modprobe.d || dialog_die
-	CONFIG="${INSTALLROOT}/etc/modprobe.d/uvesafb.conf"
-	clearconfig
-	addconfig "options uvesafb mode_option=1024x768-32@60 scroll=ywrap"
-
-	# install an appropriate viafb.conf
-	CONFIG="${INSTALLROOT}/etc/modprobe.d/viafb.conf"
-	clearconfig
-	addconfig "options viafb viafb_mode=1024x768 viafb_refresh=60"
-
-	# install an appropriate i810fb.conf
-	CONFIG="${INSTALLROOT}/etc/modprobe.d/i810fb.conf"
-	clearconfig
-	addconfig "options i810fb xres=1024 yres=768 bpp=16 mtrr=1 hsync1=30 hsync2=62 vsync1=30 vsync2=60"
-
-	cat > ${INSTALLROOT}/root/.installrc << CHROOTEOF
-echo "MODULES=\"${FORMAT_FILESYSTEM} ${DISKMODS} ${OLDATAMODS} ${PATAMODS} ${SATAMODS} ${DRMMODS} ${FBMODS} ${OTHERMODS}\"" > /etc/conf.d/mkinitrd
-mkinitrd -f /boot/$(readlink /boot/initrd) $(readlink /boot/vmlinuz | sed "s:kernel-::g") > /dev/null
-exit 0
-CHROOTEOF
-
-	# run installrc
-	chrooted /bin/bash --rcfile /root/.installrc -i
-	rm ${INSTALLROOT}/root/.installrc
-}
-
 install_system_settings()
 {
 	local CONFIG
@@ -665,7 +481,7 @@
 {
 	dialog_hardware_detection
 
-	dialog_setup_hdd_partitions_manual
+	task_setup_hdd_partitions_manual
 	dialog_setup_hdd_format
 	setup_hdd_format > /dev/null
 	install_mount_rootfs
@@ -693,7 +509,7 @@
 {
 	dialog_hardware_detection
 
-	dialog_setup_hdd_partitions_auto
+	task_setup_hdd_partitions_auto
 	dialog_setup_hdd_format
 	setup_hdd_format > /dev/null
 	install_mount_rootfs
@@ -720,6 +536,6 @@
 # set some proper traps
 trap "trap_exit" SIGINT SIGQUIT
 
-dialog_main
+task_main
 
 exit 0