--- trunk/installer-simple/bin/installer.sh.in	2014/01/07 13:44:59	2419
+++ trunk/installer-simple/bin/installer.sh.in	2014/01/07 13:57:40	2425
@@ -191,34 +191,17 @@
 dialog_setup_hdd_partitions_manual()
 {
 	local i
+	local retval
 
 	if [[ -z ${ALL_DISKS} ]]
 	then
-		dialog \
-		--backtitle "${TITLE}" \
-		--ok-label "Beenden" \
-		--msgbox "Kein geeignetes Laufwerk gefunden.\nDie Installation ist fehlgeschlagen." 6 70
+		dialog_no_harddrive_found
 		exit 1
 	else
-
-		echo "dialog \\" > /tmp/hddtmp.sh
-		echo "--backtitle \"${TITLE}\" \\" >> /tmp/hddtmp.sh
-		echo "--ok-label \"Weiter\" \\" >> /tmp/hddtmp.sh
-		echo "--cancel-label \"Beenden\" \\" >> /tmp/hddtmp.sh
-		echo "--stdout \\" >> /tmp/hddtmp.sh
-		echo "--menu \"Installations Laufwerk auswaehlen:\" 10 70 3 \\" >> /tmp/hddtmp.sh
-
-		for i in ${ALL_DISKS}
-		do
-			echo "\"${i}\" \"\" \\" >> /tmp/hddtmp.sh
-		done
-		echo -e "\n" >> /tmp/hddtmp.sh
-
-		chmod a+x /tmp/hddtmp.sh
-		HDD="$(/tmp/hddtmp.sh)"
-		RES=$?
-		[[ ${RES} -eq 1 ]] && return 1
-		if [[ ${RES} -eq 0 ]]
+		HDD=$(dialog_select_target_harddrive)
+		retval=$?
+		[[ ${retval} -eq 1 ]] && return 1
+		if [[ ${retval} -eq 0 ]]
 		then
 			dialog_setup_hdd_info
 			setup_hdd_partitions_manual
@@ -229,34 +212,17 @@
 dialog_setup_hdd_partitions_auto()
 {
 	local i
+	local retval
 
 	if [[ -z ${ALL_DISKS} ]]
 	then
-		dialog \
-		--backtitle "${TITLE}" \
-		--ok-label "Beenden" \
-		--msgbox "Kein geeignetes Laufwerk gefunden.\nDie Installation ist fehlgeschlagen." 6 70
+		dialog_no_harddrive_found
 		exit 1
 	else
-
-		echo "dialog \\" > /tmp/hddtmp.sh
-		echo "--backtitle \"${TITLE}\" \\" >> /tmp/hddtmp.sh
-		echo "--ok-label \"Weiter\" \\" >> /tmp/hddtmp.sh
-		echo "--cancel-label \"Beenden\" \\" >> /tmp/hddtmp.sh
-		echo "--stdout \\" >> /tmp/hddtmp.sh
-		echo "--menu \"Installations Laufwerk auswaehlen:\" 10 70 3 \\" >> /tmp/hddtmp.sh
-
-		for i in ${ALL_DISKS}
-		do
-			echo "\"${i}\" \"\" \\" >> /tmp/hddtmp.sh
-		done
-		echo -e "\n" >> /tmp/hddtmp.sh
-
-		chmod a+x /tmp/hddtmp.sh
-		HDD="$(/tmp/hddtmp.sh)"
-		RES=$?
-		[[ ${RES} -eq 1 ]] && return 1
-		if [[ ${RES} -eq 0 ]]
+		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
@@ -308,7 +274,7 @@
 	--gauge "Kopiere System-Image ..." 6 80
 }
 
-dialog_install_meter()
+install_meter()
 {
 	while [[ ${CURRENTLINE} != ${TOTALLINES} ]]
 	do
@@ -349,25 +315,21 @@
 
 dialog_main()
 {
-	METHOD=0
+	local method=0
+	local retval
 
-	while [[ ${METHOD} -le 2 ]]
+	while [[ ${method} -le 2 ]]
 	do
-		METHOD=$(dialog \
-		--backtitle "${TITLE}" \
-		--no-cancel \
-		--ok-label "Weiter" \
-		--stdout \
-		--menu "Konfiguration" 14 70 5 \
-		"1" "AutoSta_LX installieren" \
-		"2" "Uebersicht gefundener Laufwerke" \
-		"3" "Beenden und neustarten" \
-		"4" "Beenden und eine Shell starten")
-		RES=$?
-		[[ ${RES} -eq 1 ]] && exit 1
-		if [[ ${RES} -eq 0 ]]
+		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
+			case ${method} in
 				"1") dialog_setup_system_menu ;;
 				"2") dialog_hardware_detection ;;
 				"3") install_do_reboot ;;
@@ -802,7 +764,7 @@
 	dialog_setup_hdd_format
 	setup_hdd_format > /dev/null
 	install_mount_rootfs
-	(install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | dialog_install_meter | dialog_install_system_image
+	(install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | install_meter | dialog_install_system_image
 
 	dialog_install_settings
 	sleep 1
@@ -824,7 +786,7 @@
 	dialog_setup_hdd_format
 	setup_hdd_format > /dev/null
 	install_mount_rootfs
-	(install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | dialog_install_meter | dialog_install_system_image
+	(install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | install_meter | dialog_install_system_image
 
 	dialog_install_settings
 	sleep 1