--- trunk/installer-simple/bin/installer.sh.in	2014/01/07 14:20:31	2434
+++ trunk/installer-simple/bin/installer.sh.in	2014/01/08 10:36:44	2483
@@ -7,8 +7,10 @@
 # Niels Rogalla <niro@magellan-linux.de>
 #
 
-# ignore the environment
-LC_ALL=C
+# setup locales
+TEXTDOMAIN=installer
+LC_MESSAGES=C
+
 # include dir
 INSTALLER_LIBDIR="%LIBDIR%"
 
@@ -70,9 +72,8 @@
 FORMFACTOR="${DEFAULT_FORMFACTOR}"
 FORMAT_FILESYSTEM="${DEFAULT_FILESYSTEM}"
 
-#################################################
-#		  DIALOG BOXEN			#
-#################################################
+
+### helper scripts ###
 
 trap_exit()
 {
@@ -86,153 +87,6 @@
 	exit 1
 }
 
-dialog_die()
-{
-	ERROR="$1"
-	RETVAL="$?"
-	dialog_install_failure
-	exit 1
-}
-
-dialog_warning()
-{
-	local retval
-
-	yesnobox $"\Z1 !!! Warning !!! \Zn\n\n\This harddrive will be irreversibly erased.\n\n\Do you want to continue ?"
-	retval=$?
-	if [[ ${retval} -eq 1 ]]
-	then
-		clear
-		echo $"The process was aborted."
-		exit 1
-	fi
-}
-
-dialog_setup_hdd_info()
-{
-	local SHDD="${HDD//\/dev\/}"
-
-	messagebox -h $"[ Harddrive partitioning ]" \
-		$"\nPlease create 1 partition.\n\n\[ \Z3${SHDD}1\Zn ] type: \Z3linux\Zn with the whole diskspace\n\Please mark ${SHDD}1 \Z3bootable\Zn."
-}
-
-dialog_setup_hdd_info_auto()
-{
-	local SHDD="${HDD//\/dev\/}"
-
-	messagebox -h $"[ Harddrive partitioning ]" \
-		$"\Z1Warning!\Zn\n\nAll data on disk [ \Z3${HDD}\Zn ] will be erased!"
-}
-
-dialog_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)")
-	retval=$?
-	[[ ${retval} -eq 1 ]] && return 1
-	if [[ ${retval} -eq 0 ]]
-	then
-		case "${mode}" in
-			"1") run_install_auto ;;
-			"2") run_install_normal ;;
-			"") dialog_setup_system_menu;;
-		esac
-	fi
-}
-
-dialog_hardware_detection()
-{
-	local message
-
-	run_hardware_detection_disks
-
-	message+=$"Harddrives:\n"
-
-	if [[ ! -z ${ALL_DISKS} ]]
-	then
-		for i in ${ALL_DISKS}
-		do
-			message+="\Z3${i}\Zn "
-		done
-		message+="\n"
-	fi
-
-	if [[ ! -z ${ALL_CDROMS} ]]
-	then
-		message+="\n"
-		message+=$"Optical disk drives:\n"
-		for i in ${ALL_CDROMS}
-		do
-			message+="\Z3${i}\Zn"
-		done
-		message+="\n"
-	fi
-
-	# other devices
-	run_hardware_detection
-	case "${SPECIALDEVICE}" in
-		zotac*) message+=$"\n\Z2Zotac device detected.\Zn" ;;
-		rangee) message+=$"\n\Z2Rangee device detected.\Zn" ;;
-		maxdata) message+=$"\n\Z2Maxdata device detected.\Zn" ;;
-		*) message+=$"\n \\ZnCommon device detected.\Zn" ;;
-	esac
-	if [[ ${FORMFACTOR} = laptop ]]
-	then
-		message+=$"\n\ZnFormfactor Laptop, activating 'ondemand' powersaving  mode.\Zn"
-	fi
-
-	messagebox -y 15 -h $"Detected hardware:" "${message}"
-}
-
-dialog_setup_hdd_partitions_manual()
-{
-	local i
-	local retval
-
-	if [[ -z ${ALL_DISKS} ]]
-	then
-		dialog_no_harddrive_found
-		exit 1
-	else
-		HDD=$(dialog_select_target_harddrive)
-		retval=$?
-		[[ ${retval} -eq 1 ]] && return 1
-		if [[ ${retval} -eq 0 ]]
-		then
-			dialog_setup_hdd_info
-			setup_hdd_partitions_manual
-		fi
-	fi
-}
-
-dialog_setup_hdd_partitions_auto()
-{
-	local i
-	local retval
-
-	if [[ -z ${ALL_DISKS} ]]
-	then
-		dialog_no_harddrive_found
-		exit 1
-	else
-		HDD=$(dialog_select_target_harddrive)
-		retval=$?
-		[[ ${retval} -eq 1 ]] && return 1
-		if [[ ${retval} -eq 0 ]]
-		then
-			dialog_setup_hdd_info_auto
-			dialog_setup_hdd_create_partitions
-			setup_hdd_partitions_auto
-		fi
-	fi
-}
-
 install_meter()
 {
 	while [[ ${CURRENTLINE} != ${TOTALLINES} ]]
@@ -246,35 +100,6 @@
 	return 0
 }
 
-dialog_main()
-{
-	local method=0
-	local retval
-
-	while [[ ${method} -le 2 ]]
-	do
-		method=$(menubox $"Configuration:" \
-			$"1:Install system" \
-			$"2:Show detected harddrives" \
-			$"3:Exit and reboot" \
-			$"4:Exit and drop into a shell")
-		retval=$?
-		[[ ${retval} -eq 1 ]] && exit 1
-		if [[ ${retval} -eq 0 ]]
-		then
-			case ${method} in
-				"1") dialog_setup_system_menu ;;
-				"2") dialog_hardware_detection ;;
-				"3") install_do_reboot ;;
-				"4") /bin/bash --login -i ;;
-			esac
-		fi
-	done
-}
-
-#################################################
-#		Install Komandos		#
-#################################################
 run_hardware_detection()
 {
 	local hwinfo
@@ -348,28 +173,17 @@
 	export ALL_CDROMS="$(get_hwinfo cdrom)"
 }
 
-hdd_size_below_256mb()
+setup_hdd_partitions_auto()
 {
-	local hdd="$1"
-	local size
-	local retval
-	[[ -z ${hdd} ]] && dialog_die "Error: get_hdd_size() no \$hdd given!"
+	ROOTHDD="${HDD}1"
 
-	size=$(fdisk -l ${hdd} | grep "Disk.*${hdd}" | sed 's:.*,\ \(.*\)\ byte.*:\1:')
-	if [[ ${size} -le 257000000 ]]
+	# sanity check - should not happen
+	if is_mounted --device "${ROOTHDD}"
 	then
-		retval="0"
-	else
-		retval="1"
+		echo "partition: device ${ROOTHDD} is already mounted, umount it" >&2
+		umount "${ROOTHDD}"
 	fi
 
-	return "${retval}"
-}
-
-setup_hdd_partitions_auto()
-{
-	ROOTHDD="${HDD}1"
-
 	# run this only if FDISKPARTITIONBELOW256MB is not already 1
 	if [[ ${FDISKPARTIONBELOW256MB} != 1 ]]
 	then
@@ -431,19 +245,26 @@
 setup_hdd_partitions_manual()
 {
 	ROOTHDD="${HDD}1"
-
-	## hdds partitionieren manual
+	SWAPHDD=""
+	BOOTHDD=""
 	cfdisk ${HDD} || dialog_die
 }
 
 setup_hdd_format()
 {
+	# sanity check - should not happen
+	if is_mounted --device "${ROOTHDD}"
+	then
+		echo "format: device ${ROOTHDD} is already mounted, umount it" >&2
+		umount "${ROOTHDD}"
+	fi
+
 	mkfs."${FORMAT_FILESYSTEM}" -q "${ROOTHDD}" || dialog_die
 }
 
 install_mount_rootfs()
 {
-	mount ${ROOTHDD} ${INSTALLROOT} || dialog_die
+	is_mounted --location "${INSTALLROOT}" || mount "${ROOTHDD}" "${INSTALLROOT}"
 	install -d ${INSTALLROOT}/boot || dialog_die
 }
 
@@ -454,262 +275,211 @@
 	popd > /dev/null
 }
 
-install_bootsector_chroot()
+install_system_settings()
 {
-	local my_roothdd
-	local grubconf=${INSTALLROOT}/boot/grub/grub.conf
-	local grub2conf=/boot/grub/grub.cfg
+	local CONFIG
+
+	# write fstab
+	CONFIG="${INSTALLROOT}/etc/fstab"
+	clearconfig
+	addconfig -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1"
+	addconfig -e "proc\t/proc\tproc\tdefaults\t0 0"
+	addconfig -e "shm\t/dev/shm\ttmpfs\tdefaults\t0 0"
 
-	# check for grub2
-	if [[ -f ${INSTALLROOT}/sbin/grub-mkconfig ]]
+	# install network config skeleton
+	CONFIG="${INSTALLROOT}/etc/conf.d/net.eth0"
+	clearconfig
+	addconfig 'ONBOOT="yes"'
+	addconfig 'NETWORKING="dhcp"'
+
+	# intel framebuffer quirk
+	if [ -e ${INSTALLROOT}/etc/splash/splash.conf ]
 	then
-		# needed by grub-mkconfig on the first run
-		if [[ ! -f ${INSTALLROOT}/boot/grub/video.lst ]]
+		if [ -e /proc/fb ]
 		then
-			install -m0644 ${INSTALLROOT}/lib/grub/*/video.lst ${INSTALLROOT}/boot/grub/video.lst || dialog_die
+			if [[ ! -z $(grep 'inteldrmfb' /proc/fb) ]]
+			then
+				fbdev=$(grep 'inteldrmfb' /proc/fb | sed 's:\([0-9]\).*:\1:')
+				if [[ ${fbdev} != 0 ]]
+				then
+					sed -i "s:^\(SPLASH_DEV=\).*:\1\"/dev/fb${fbdev}\":" ${INSTALLROOT}/etc/splash/splash.conf || dialog_die
+				fi
+			fi
 		fi
+	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
-			echo "export GRUB_CMDLINE_LINUX_DEFAULT=\"${KERNELOPTS}\"" >  ${INSTALLROOT}/etc/conf.d/grub || dialog_die
-		fi
-		echo 'grub-mkdevicemap' > ${INSTALLROOT}/root/.installrc || dialog_die
-		echo "LC_ALL=C grub-mkconfig -o ${grub2conf}  &> /dev/null" >> ${INSTALLROOT}/root/.installrc || dialog_die
-		echo "grub-install --no-floppy ${HDD} &> /dev/null" >> ${INSTALLROOT}/root/.installrc || dialog_die
-		echo "exit 0" >> ${INSTALLROOT}/root/.installrc || dialog_die
+install_umount_rootfs()
+{
+	is_mounted --location ${INSTALLROOT}/boot && umount ${INSTALLROOT}/boot
+	is_mounted --location ${INSTALLROOT} && umount ${INSTALLROOT}
+}
 
-	# grub-legacy
-	else
-		### grubconf schreiben
-		source ${INSTALLROOT}/boot/kernelversion
+install_do_reboot()
+{
+	reboot
+}
 
-		#for alx only
-		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"
+### installer dialogs ###
 
-		# uuid support
-		if is_uuid_supported
-		then
-			my_roothdd="UUID=$(get_uuid ${ROOTHDD})"
-		else
-			my_roothdd="${ROOTHDD}"
-		fi
+dialog_die()
+{
+	ERROR="$1"
+	RETVAL="$?"
+	dialog_install_failure
+	exit 1
+}
 
-		: > ${grubconf} || dialog_die
-		echo "default 0" >> ${grubconf} || dialog_die
-		echo "timeout 3" >> ${grubconf} || dialog_die
-		# using current root password
-		echo "password --md5 $(cat ${INSTALLROOT}/etc/shadow | grep root | cut -d: -f2)"  >> ${grubconf} || dialog_die
-
-		echo  >> ${grubconf} || dialog_die
-		echo "# normal boot" >> ${grubconf} || dialog_die
-		echo "title ${KRNVER}" >> ${grubconf} || dialog_die
-		echo "root (hd0,0)" >> ${grubconf} || dialog_die
-		echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS}" >> ${grubconf} || dialog_die
-		if is_initrd_supported
-		then
-			echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || dialog_die
-		fi
+dialog_warning()
+{
+	local retval
 
-		echo >> ${grubconf} || dialog_die
-		echo "# admin boot" >> ${grubconf} || dialog_die
-		echo "title ${KRNVER} - Re-run hardware-detection" >> ${grubconf} || dialog_die
-		echo "lock"  >> ${grubconf} || dialog_die
-		echo "root (hd0,0)" >> ${grubconf} || dialog_die
-		echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS} hardware-auto-detection" >> ${grubconf} || dialog_die
-		if is_initrd_supported
-		then
-			echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || dialog_die
-		fi
+	yesnobox $"\Z1 !!! Warning !!! \Zn\n\n\This harddrive will be irreversibly erased.\n\n\Do you want to continue ?"
+	retval=$?
+	if [[ ${retval} -eq 1 ]]
+	then
+		clear
+		echo $"The process was aborted."
+		exit 1
+	fi
+}
 
-		echo >> ${grubconf} || dialog_die
-		echo "title ${KRNVER} - Reset *all* local settings" >> ${grubconf} || dialog_die
-		echo "lock"  >> ${grubconf} || dialog_die
-		echo "root (hd0,0)" >> ${grubconf} || dialog_die
-		echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS} alx-reset-settings" >> ${grubconf} || dialog_die
-		if is_initrd_supported
-		then
-			echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || dialog_die
-		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
+### installer tasks ###
 
-	## enter chroot
-	mount -t proc proc ${INSTALLROOT}/proc
-	mount -t sysfs sysfs ${INSTALLROOT}/sys
-	mount -o bind /dev ${INSTALLROOT}/dev
-	chroot ${INSTALLROOT} /bin/bash --rcfile /root/.installrc -i
-	umount ${INSTALLROOT}/proc
-	umount ${INSTALLROOT}/sys
-	umount ${INSTALLROOT}/dev
-	rm ${INSTALLROOT}/root/.installrc
-}
-
-is_initrd_supported()
-{
-	# only generate initrds if the cmd exists
-	[[ -x ${INSTALLROOT}/sbin/mkinitrd ]] && return 0
-	return 1
-}
-
-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
+task_setup_system_menu()
+{
+	local mode
+	local retval
 
-	if [[ ${FORMFACTOR} = laptop ]]
+	mode="$(dialog_setup_system_menu)"
+	retval=$?
+	[[ ${retval} -eq 1 ]] && return 1
+	if [[ ${retval} -eq 0 ]]
 	then
-		OTHERMODS="acpi-cpufreq cpufreq_ondemand cpufreq_conservative cpufreq_powersave"
+		case "${mode}" in
+			"1") run_install_auto ;;
+			"2") run_install_normal ;;
+			"") task_setup_system_menu;;
+		esac
 	fi
+}
 
-	# install an appropriate uvesafb.conf
-	install -d ${INSTALLROOT}/etc/modprobe.d || dialog_die
-	echo "options uvesafb mode_option=1024x768-32@60 scroll=ywrap" > ${INSTALLROOT}/etc/modprobe.d/uvesafb.conf || dialog_die
+task_hardware_detection()
+{
+	local message
 
-	# install an appropriate viafb.conf
-	echo "options viafb viafb_mode=1024x768 viafb_refresh=60" > ${INSTALLROOT}/etc/modprobe.d/viafb.conf || dialog_die
+	run_hardware_detection_disks
 
-	# install an appropriate i810fb.conf
-	echo "options i810fb xres=1024 yres=768 bpp=16 mtrr=1 hsync1=30 hsync2=62 vsync1=30 vsync2=60"  > ${INSTALLROOT}/etc/modprobe.d/i810fb.conf || dialog_die
+	message+=$"Harddrives:\n"
 
-	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
+	if [[ ! -z ${ALL_DISKS} ]]
+	then
+		for i in ${ALL_DISKS}
+		do
+			message+="\Z3${i}\Zn "
+		done
+		message+="\n"
+	fi
 
-	## enters chroot
-	mount -t proc proc ${INSTALLROOT}/proc
-	mount -t sysfs sysfs ${INSTALLROOT}/sys
-	mount -o bind /dev ${INSTALLROOT}/dev
-	chroot ${INSTALLROOT} /bin/bash --rcfile /root/.installrc -i
-	umount ${INSTALLROOT}/proc
-	umount ${INSTALLROOT}/sys
-	umount ${INSTALLROOT}/dev
-	rm ${INSTALLROOT}/root/.installrc
-}
+	if [[ ! -z ${ALL_CDROMS} ]]
+	then
+		message+="\n"
+		message+=$"Optical disk drives:\n"
+		for i in ${ALL_CDROMS}
+		do
+			message+="\Z3${i}\Zn"
+		done
+		message+="\n"
+	fi
 
-is_uuid_supported()
-{
-	if [[ -x $(type -P busybox.mkinitrd) ]]
+	# other devices
+	run_hardware_detection
+	case "${SPECIALDEVICE}" in
+		zotac*) message+=$"\n\Z2Zotac device detected.\Zn" ;;
+		rangee) message+=$"\n\Z2Rangee device detected.\Zn" ;;
+		maxdata) message+=$"\n\Z2Maxdata device detected.\Zn" ;;
+		*) message+=$"\n\ZnCommon device detected.\Zn" ;;
+	esac
+	if [[ ${FORMFACTOR} = laptop ]]
 	then
-		# only detect uuids if supported
-		if [[ ! -z $(busybox.mkinitrd | grep blkid) ]]
-		then
-			return 0
-		fi
+		message+=$"\n\ZnFormfactor Laptop, activating 'ondemand' powersaving mode.\Zn"
 	fi
 
-	return 1
+	messagebox -y 12 -h $"Detected hardware:" "${message}"
 }
 
-get_uuid()
+task_setup_hdd_partitions_manual()
 {
-	local UUID
-	local SEC_TYPE
-	local TYPE
-
-	local dev="$1"
-	[[ -z ${dev} ]] && dialog_die "no dev given"
+	local i
+	local retval
 
-	# check if given device is already an UUID
-	if [[ ${dev/UUID=/}x != ${dev}x ]]
+	if [[ -z ${ALL_DISKS} ]]
 	then
-		eval "${dev}"
+		dialog_no_harddrive_found
+		exit 1
 	else
-		eval $(busybox.mkinitrd blkid ${dev} | grep "${dev}:" | sed 's/.*:\ //')
+		HDD=$(dialog_select_target_harddrive)
+		retval=$?
+		[[ ${retval} -eq 1 ]] && return 1
+		if [[ ${retval} -eq 0 ]]
+		then
+			dialog_setup_hdd_info
+			setup_hdd_partitions_manual
+		fi
 	fi
-	echo "${UUID}"
 }
 
-install_system_settings()
+task_setup_hdd_partitions_auto()
 {
-	# schreibe fstab
-	if is_uuid_supported
-	then
-		echo -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLROOT}/etc/fstab || dialog_die
-	else
-		echo -e "${ROOTHDD}\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLROOT}/etc/fstab || dialog_die
-	fi
-	# not needed busybox loads all with swapon -a, even if not mentioned in fstab
-	#echo -e "UUID='$(get_uuid ${SWAPHDD})'\tswap\tswap\tpri=1\t0 0" >> ${INSTALLROOT}/etc/fstab || dialog_die
-	echo -e "proc\t/proc\tproc\tdefaults\t0 0" >> ${INSTALLROOT}/etc/fstab || dialog_die
-	echo -e "shm\t/dev/shm\ttmpfs\tdefaults\t0 0" >> ${INSTALLROOT}/etc/fstab || dialog_die
-
-	# install network config skeleton
-	install -m0644 ${INSTALLROOT}/etc/alxconfig-ng/skel/net/net.eth0 ${INSTALLROOT}/etc/conf.d/ || dialog_die
+	local i
+	local retval
 
-	# intel framebufer quirk
-	if [[ -e /proc/fb ]]
+	if [[ -z ${ALL_DISKS} ]]
 	then
-		if [[ ! -z $(grep 'inteldrmfb' /proc/fb) ]]
+		dialog_no_harddrive_found
+		exit 1
+	else
+		HDD=$(dialog_select_target_harddrive)
+		retval=$?
+		[[ ${retval} -eq 1 ]] && return 1
+		if [[ ${retval} -eq 0 ]]
 		then
-			fbdev=$(grep 'inteldrmfb' /proc/fb | sed 's:\([0-9]\).*:\1:')
-			if [[ ${fbdev} != 0 ]]
-			then
-				sed -i "s:^\(SPLASH_DEV=\).*:\1\"/dev/fb${fbdev}\":" ${INSTALLROOT}/etc/splash/splash.conf || dialog_die
-			fi
+			dialog_setup_hdd_info_auto
+			dialog_setup_hdd_create_partitions
+			setup_hdd_partitions_auto
 		fi
 	fi
 }
 
-install_umount_rootfs()
+task_main()
 {
-	umount ${INSTALLROOT}/boot || dialog_die
-	umount ${INSTALLROOT} || dialog_die
-}
+	local method=0
+	local retval
 
-install_do_reboot()
-{
-	reboot
+	while [[ ${method} -le 2 ]]
+	do
+		method=$(dialog_main)
+		retval=$?
+		[[ ${retval} -eq 1 ]] && exit 1
+		if [[ ${retval} -eq 0 ]]
+		then
+			case ${method} in
+				"1") task_setup_system_menu ;;
+				"2") task_hardware_detection ;;
+				"3") install_do_reboot ;;
+				"4") /bin/bash --login -i ;;
+			esac
+		fi
+	done
 }
 
-#################################################
-#	     Install Ablauf Scripte		#
-#################################################
-
 run_install_normal()
 {
-	dialog_hardware_detection
+	task_hardware_detection
 
-	dialog_setup_hdd_partitions_manual
+	task_setup_hdd_partitions_manual
 	dialog_setup_hdd_format
 	setup_hdd_format > /dev/null
 	install_mount_rootfs
@@ -718,11 +488,16 @@
 	dialog_install_settings
 	sleep 1
 	install_system_settings
-	dialog_install_initrd	
-	install_initrd_chroot
+	if is_initrd_supported
+	then
+		dialog_install_initrd
+		initrd_config
+		initrd_install
+	fi
 
 	dialog_install_bootsector
-	install_bootsector_chroot
+	bootloader_config
+	bootloader_install
 
 	install_umount_rootfs
 	dialog_install_successful
@@ -730,9 +505,9 @@
 
 run_install_auto()
 {
-	dialog_hardware_detection
+	task_hardware_detection
 
-	dialog_setup_hdd_partitions_auto
+	task_setup_hdd_partitions_auto
 	dialog_setup_hdd_format
 	setup_hdd_format > /dev/null
 	install_mount_rootfs
@@ -741,11 +516,16 @@
 	dialog_install_settings
 	sleep 1
 	install_system_settings
-	dialog_install_initrd	
-	install_initrd_chroot
+	if is_initrd_supported
+	then
+		dialog_install_initrd
+		initrd_config
+		initrd_install
+	fi
 
 	dialog_install_bootsector
-	install_bootsector_chroot
+	bootloader_config
+	bootloader_install
 
 	install_umount_rootfs
 	dialog_install_successful
@@ -754,6 +534,6 @@
 # set some proper traps
 trap "trap_exit" SIGINT SIGQUIT
 
-dialog_main
+task_main
 
 exit 0