--- trunk/installer-simple/bin/installer.sh.in	2014/01/07 13:56:51	2424
+++ trunk/installer-simple/bin/installer.sh.in	2014/01/07 14:09:01	2427
@@ -246,34 +246,6 @@
 	export ALL_CDROMS="$(get_hwinfo cdrom)"
 }
 
-dialog_setup_hdd_create_partitions()
-{
-	dialog \
-	--backtitle "${TITLE}" \
-	--infobox "Erstelle Disk Partitionen ..." 3 70
-}
-
-dialog_setup_hdd_format()
-{
-	dialog \
-	--backtitle "${TITLE}" \
-	--infobox "Erstelle Datei-Systeme ..." 3 70
-}
-
-dialog_install_settings()
-{
-	dialog \
-	--backtitle "${TITLE}" \
-	--infobox "Speichere System-Einstellungen ..." 3 70
-}
-
-dialog_install_system_image()
-{
-	dialog \
-	--backtitle "${TITLE}" \
-	--gauge "Kopiere System-Image ..." 6 80
-}
-
 install_meter()
 {
 	while [[ ${CURRENTLINE} != ${TOTALLINES} ]]
@@ -287,32 +259,6 @@
 	return 0
 }
 
-
-dialog_install_bootsector()
-{
-	dialog \
-	--backtitle "${TITLE}" \
-	--infobox "Schreibe den Bootsektor ..." 3 70
-}
-
-dialog_install_successful()
-{
-	dialog \
-	--backtitle "${TITLE}" \
-	--colors \
-	--msgbox "Die Installation war \Z2erfolgreich\Zn." 5 81
-}
-
-dialog_install_failure()
-{
-	dialog \
-	--backtitle "${TITLE}" \
-	--colors \
-	--msgbox "Die Installation ist \Z1Fehlgeschlagen\Zn.\n\n\
-		Fehler bei ${ERROR}, RetVal: ${RETVAL} \
-	" 10 81
-}
-
 dialog_main()
 {
 	local method=0
@@ -320,16 +266,11 @@
 
 	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")
+		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 ]]
@@ -774,6 +715,7 @@
 	dialog_install_settings
 	sleep 1
 	install_system_settings
+	dialog_install_initrd	
 	install_initrd_chroot
 
 	dialog_install_bootsector
@@ -796,6 +738,7 @@
 	dialog_install_settings
 	sleep 1
 	install_system_settings
+	dialog_install_initrd	
 	install_initrd_chroot
 
 	dialog_install_bootsector