--- trunk/installer-simple/bin/installer.sh.in	2014/01/07 14:56:12	2446
+++ trunk/installer-simple/bin/installer.sh.in	2014/01/08 12:11:44	2487
@@ -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,30 @@
 	return 0
 }
 
-dialog_main()
+mount_rootfs()
 {
-	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
+	if is_mounted --location "${INSTALLROOT}"
+	then
+		echo $"${INSTALLROOT} already mounted" >&2
+	else
+		mount "${ROOTHDD}" "${INSTALLROOT}" || dialog_die $"Could not mount rootfs - drive'${ROOTHDD}' -> '${INSTALLROOT}'"
+	fi
+	[[ -d ${INSTALLROOT}/boot ]] || install -d ${INSTALLROOT}/boot
+}
+
+umount_rootfs()
+{
+	is_mounted --location ${INSTALLROOT}/boot && umount ${INSTALLROOT}/boot
+	is_mounted --location ${INSTALLROOT} && umount ${INSTALLROOT}
+}
+
+install_do_reboot()
+{
+	reboot
 }
 
-#################################################
-#		Install Komandos		#
-#################################################
 run_hardware_detection()
 {
 	local hwinfo
@@ -348,24 +197,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"
@@ -455,12 +286,6 @@
 	mkfs."${FORMAT_FILESYSTEM}" -q "${ROOTHDD}" || dialog_die
 }
 
-install_mount_rootfs()
-{
-	is_mounted --location "${INSTALLROOT}" || mount "${ROOTHDD}" "${INSTALLROOT}"
-	install -d ${INSTALLROOT}/boot || dialog_die
-}
-
 install_system_image()
 {
 	pushd ${INSTALLROOT} > /dev/null
@@ -468,164 +293,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
@@ -660,29 +327,169 @@
 	fi
 }
 
-install_umount_rootfs()
+
+### installer dialogs ###
+
+dialog_die()
 {
-	is_mounted --location ${INSTALLROOT}/boot && umount ${INSTALLROOT}/boot
-	is_mounted --location ${INSTALLROOT} && umount ${INSTALLROOT}
+	ERROR="$1"
+	RETVAL="$?"
+	dialog_install_failure
+	exit 1
 }
 
-install_do_reboot()
+dialog_warning()
 {
-	reboot
+	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
 }
 
-#################################################
-#	     Install Ablauf Scripte		#
-#################################################
+
+### installer tasks ###
+
+task_setup_system_menu()
+{
+	local mode
+	local retval
+
+	mode="$(dialog_setup_system_menu)"
+	retval=$?
+	[[ ${retval} -eq 1 ]] && return 1
+	if [[ ${retval} -eq 0 ]]
+	then
+		case "${mode}" in
+			"1") run_install_auto ;;
+			"2") run_install_normal ;;
+			"") task_setup_system_menu;;
+		esac
+	fi
+}
+
+task_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 12 -h $"Detected hardware:" "${message}"
+}
+
+task_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
+}
+
+task_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
+}
+
+task_main()
+{
+	local method=0
+	local retval
+
+	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
+}
 
 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
+	mount_rootfs
 	(install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | install_meter | dialog_install_system_image
 
 	dialog_install_settings
@@ -699,18 +506,18 @@
 	bootloader_config
 	bootloader_install
 
-	install_umount_rootfs
+	umount_rootfs
 	dialog_install_successful
 }
 
 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
+	mount_rootfs
 	(install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | install_meter | dialog_install_system_image
 
 	dialog_install_settings
@@ -727,13 +534,13 @@
 	bootloader_config
 	bootloader_install
 
-	install_umount_rootfs
+	umount_rootfs
 	dialog_install_successful
 }
 
 # set some proper traps
 trap "trap_exit" SIGINT SIGQUIT
 
-dialog_main
+task_main
 
 exit 0