--- alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh.in	2013/08/07 10:58:37	5005
+++ alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh.in	2015/07/23 14:03:36	6848
@@ -1,55 +1,60 @@
 #!/bin/sh
-#
-# $Header: /home/cvsd/alx-cvs/alx-src/alxinstall-ng/bin/alxinstall-ng.sh,v 1.15 2008-06-28 00:37:45 niro Exp $
-#
-# AutoSta_LX Installation Script
-#
-# Niels Rogalla <niro@magellan-linux.de>
-#		<rogalla@augusta-bochum.de>
-#
-#
-# Install Navigation Gui
-#
+# $Id$
 
-#images: (get ${CDIMAGENAME})
+# ignore environment!
+LC_ALL=C
+
+MLIBDIR="/usr/lib/alxinstall-ng"
+
+# images: (get ${CDIMAGENAME})
 source /mnt/cdrom/system/images.conf
 
-#Includes
-source /usr/lib/alxinstall-ng/functions/findhdd.sh > /dev/null
-### bugfix ###############################
-cdromdev="$(echo ${cdromdev} | sed 's/ //')"
-########################################
+# includes
+source ${MLIBDIR}/functions/generic.sh
+source ${MLIBDIR}/functions/hwdetection.sh
 
 ### System/Config Version
-VERSION="%VERSIONTAG%"
+VERSION="@@VERSION@@"
 TITLE="alxinstall-ng - ${VERSION}"
 
+# locations
 CDPATH="/mnt/cdrom"
-INSTALLPATH="/mnt/magellan"
-
-### WICHTIG: anzahl lines in der autosta_lx.tar.gz -1
-CURRENTLINE=0
-#TOTALLINES=11072 # -> now in images.conf
+INSTALL_ROOT="/mnt/magellan"
 
+# default system settings
 # standard kernel opts
-KERNELOPTS="quiet video=1024x768"
+DEFAULT_KERNELOPTS="quiet video=1024x768"
 
 # grub options
-GRUBLEGACYOPTS=""
-GRUB2OPTS=""
-
-# fdisk options
-FDISKPARTIONBELOW256MB=0
+DEFAULT_GRUBLEGACYOPTS=""
+DEFAULT_GRUB2OPTS=""
+DEFAULT_GRUB2GFXPAYLOAD="1024x768x16,1024x768"
 
 # default specialdevices
-SPECIALDEVICE=""
-FORMFACTOR="desktop"
+DEFAULT_FORMFACTOR="desktop"
 
 # target filesystem
-FORMAT_FILESYSTEM="ext4"
+DEFAULT_FORMAT_FILESYSTEM="ext4"
+
+# initialize global variables so they are exportable
+INSTALL_METHOD=""
+KERNELOPTS=""
+GRUBLEGACYOPTS=""
+GRUB2OPTS=""
+GRUB2GFXPAYLOAD=""
+FORMFACTOR=""
+FORMAT_FILESYSTEM=""
+FORMAT_FILESYSTEM_BOOTHDD=""
+FORMAT_FILESYSTEM_ROOTHDD=""
+FDISKPARTIONBELOW256MB=0
+SPECIALDEVICE=""
+FLASHDISK=0
+### linecount of system.tar.gz -1 !
+CURRENTLINE=0
+#TOTALLINES=11072 # -> now in images.conf
 
 #################################################
-#		  DIALOG BOXEN			#
+#		  DIALOG BOXES			#
 #################################################
 
 die()
@@ -57,6 +62,7 @@
 	ERROR=$1
 	RETVAL=$?
 	dialog_install_failure
+	trap_exit
 	exit 1
 }
 
@@ -80,6 +86,19 @@
 
 dialog_setup_hdd_info()
 {
+	case "${INSTALL_METHOD}" in
+		auto)
+			dialog_setup_hdd_info_auto
+			dialog_setup_hdd_create_partitions
+			;;
+		normal) dialog_setup_hdd_info_normal ;;
+		single) dialog_setup_hdd_info_single ;;
+		flash) dialog_setup_hdd_info_flash ;;
+	esac
+}
+
+dialog_setup_hdd_info_normal()
+{
 	local SHDD="$(echo ${HDD} | sed 's/\/dev\///')"
 
 	dialog \
@@ -94,7 +113,7 @@
 		Bitte ${SHDD}1 als \Z3bootable\Zn markieren." 12 81
 }
 
-dialog_setup_hdd_info_flash()
+dialog_setup_hdd_info_single()
 {
 	local SHDD="$(echo $HDD | sed 's/\/dev\///')"
 
@@ -108,6 +127,21 @@
 		Bitte ${SHDD}1 als \Z3bootable\Zn markieren." 12 81
 }
 
+dialog_setup_hdd_info_flash()
+{
+	local SHDD="$(echo ${HDD} | sed 's/\/dev\///')"
+
+	dialog \
+	--colors \
+	--title "[ Festplatten Partitionierung ]" \
+	--backtitle "${TITLE}" \
+	--ok-label "Weiter" \
+	--msgbox "\nBitte legen Sie 2 Partitionen an.\n\n\
+		[ \Z3${SHDD}1\Zn ] Typ: \Z3Linux\Zn mit ca. 50MB\n\
+		[ \Z3${SHDD}2\Zn ] Typ: \Z3Linux \Zn mit dem Rest (min. 256MB)\n\n\
+		Bitte ${SHDD}1 als \Z3bootable\Zn markieren." 12 81
+}
+
 dialog_setup_hdd_info_auto()
 {
 	local SHDD="$(echo $HDD | sed 's/\/dev\///')"
@@ -132,20 +166,22 @@
 	--ok-label "Weiter" \
 	--stdout \
 	--colors \
-	--menu "\nWaehlen Sie die Installations-Methode" 14 70 5 \
+	--menu "\nWaehlen Sie die Installations-Methode" 14 70 6 \
 	"1" "Automatisches Setup (Empfohlen)" \
 	"" "" \
 	"" "\Z1Experten Modi:\Zn" \
 	"2" "Normale IDE-Disk (Manuell)" \
-	"3" "Flash-Speicher (Manuell)")
+	"3" "Normale IDE Disk (Single)" \
+	"4" "Flash SDHC/NAND oder USBStick (Manuell)")
 	RES=$?
 	[[ ${RES} -eq 1 ]] && return 1
 	if [[ ${RES} -eq 0 ]]
 	then
 		case "${i}" in
-			"1") run_install_auto ;;
-        		"2") run_install_normal ;;
-			"3") run_install_flash ;;
+			"1") run_install auto ;;
+			"2") run_install normal ;;
+			"3") run_install single ;;
+			"4") run_install flash ;;
 			"") dialog_setup_system_menu;;
 		esac
 	fi
@@ -156,14 +192,14 @@
 	local i
 	local hwtmp
 
-	if [ -x $(which mktemp &> /dev/null) ]
+	if [ -x $(type -P mktemp) ]
 	then
 		hwtmp="$(mktemp)"
 	else
 		hwtmp="/tmp/hwtmp.sh"
 	fi
 
-	[[ ! -z ${installdevs} ]] && installdevs=""
+	run_hardware_detection_disks
 
 	echo "dialog \\"  > ${hwtmp}
 	echo "--backtitle \"${TITLE}\" \\" >> ${hwtmp}
@@ -173,51 +209,43 @@
 	echo "--msgbox \"Gefundene Hardware:\n\n \\" >> ${hwtmp}
 	echo "	Festplatten:\n \\" >> ${hwtmp}
 
-	if [[ ! -z ${scsidisks} ]]
+	if [[ ! -z ${ALL_DISKS} ]]
 	then
-		for i in ${scsidisks}
+		for i in ${ALL_DISKS}
 		do
-			if [[ ${i} != ${cdromdev} ]]
-			then
-				echo "		\\Z7SCSI: \\Z3${i}\\Zn\n \\" >> ${hwtmp}
-				installdevs="${installdevs} ${i}"
-			fi
+			echo "		\\Z3${i}\\Zn\n \\" >> ${hwtmp}
 		done
 	fi
 
-	if [[ ! -z ${idedisks} ]]
+	if [[ ! -z ${ALL_CDROMS} ]]
 	then
-		for i in ${idedisks}
+		echo "	\n \\" >> ${hwtmp}
+		echo "	CDROM Laufwerke:\n \\" >> ${hwtmp}
+		for i in ${ALL_CDROMS}
 		do
-			if [[ ${i} != ${cdromdev} ]]
-			then
-				echo "		\\Z7IDE:  \\Z3${i}\\Zn\n \\" >> ${hwtmp}
-				installdevs="${installdevs} ${i}"
-			fi
+			echo "		\\Z3${i}\\Zn\n \\" >> ${hwtmp}
 		done
 	fi
 
-	if [[ ! -z ${cdromdev} ]]
-	then
-		echo "	\n \\" >> ${hwtmp}
-		echo "	\\Z7andere Laufwerke:\n \\" >> ${hwtmp}
-		echo "		CDROM: \\Z3${cdromdev}\\Zn\n \\" >> ${hwtmp}
-	fi
-
 	# other devices
 	run_hardware_detection
 	case "${SPECIALDEVICE}" in
-		zotac*) echo "	\n\n\n \\Z2Zotac Device erkannt!\\Zn \\" >> ${hwtmp} ;;
-		rangee) echo "	\n\n\n \\Z2Rangee Device erkannt!\\Zn \\" >> ${hwtmp} ;;
-		maxdata) echo "	\n\n\n \\Z2Maxdata Device erkannt!\\Zn \\" >> ${hwtmp} ;;
-		*) echo "	\n\n\n \\ZnStandard Device erkannt!\\Zn \\" >> ${hwtmp} ;;
+		zotac*) echo "	\n \\Z2Zotac Device erkannt.\\Zn \\" >> ${hwtmp} ;;
+		rangee) echo "	\n \\Z2Rangee Device erkannt.\\Zn \\" >> ${hwtmp} ;;
+		maxdata) echo "	\n \\Z2Maxdata Device erkannt.\\Zn \\" >> ${hwtmp} ;;
+		i845) echo "	\n \\Z2Intel i845 Device erkannt.\\Zn \\" >> ${hwtmp} ;;
+		*) echo "	\n \\ZnStandard Device erkannt.\\Zn \\" >> ${hwtmp} ;;
 	esac
 	if [[ ${FORMFACTOR} = laptop ]]
 	then
-		echo "	\n \\ZnFormfactor Laptop, Powersave Modus 'ondemand' wird aktiviert!\\Zn \\" >> ${hwtmp}
+		echo "	\n \\ZnFormfactor Laptop, Powersave Modus 'ondemand' wird aktiviert.\\Zn \\" >> ${hwtmp}
+	fi
+	if [[ ${FLASHDISK} = 1 ]]
+	then
+		echo "	\n \\ZnFlash Speicher erkannt, F2FS wird als Dateisystem benutzt.\\Zn \\" >> ${hwtmp}
 	fi
 
-	echo "	\" 13 70" >> ${hwtmp}
+	echo "	\" 14 70" >> ${hwtmp}
 	chmod a+x ${hwtmp}
 	${hwtmp}
 
@@ -228,11 +256,11 @@
 	fi
 }
 
-dialog_setup_hdd_partitions_manuell()
+dialog_setup_hdd_partitions()
 {
 	local i
 
-	if [[ -z ${installdevs} ]]
+	if [[ -z ${ALL_DISKS} ]]
 	then
 		dialog \
 		--backtitle "${TITLE}" \
@@ -248,7 +276,7 @@
 		echo "--stdout \\" >> /tmp/hddtmp.sh
 		echo "--menu \"Installations Laufwerk auswaehlen:\" 10 70 3 \\" >> /tmp/hddtmp.sh
 
-		for i in ${installdevs}
+		for i in ${ALL_DISKS}
 		do
 			echo "\"${i}\" \"\" \\" >> /tmp/hddtmp.sh
 		done
@@ -261,84 +289,7 @@
 		if [[ ${RES} -eq 0 ]]
 		then
 			dialog_setup_hdd_info
-			setup_hdd_partitions_manuell
-		fi
-	fi
-}
-
-dialog_setup_hdd_partitions_manuell_flash()
-{
-	local i
-
-	if [[ -z ${installdevs} ]]
-	then
-		dialog \
-		--backtitle "${TITLE}" \
-		--ok-label "Beenden" \
-		--msgbox "Kein geeignetes Laufwerk gefunden.\nDie Installation ist fehlgeschlagen." 6 70
-		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 ${installdevs}
-		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 ]]
-		then
-			dialog_setup_hdd_info_flash
-			setup_hdd_partitions_manuell_flash
-		fi
-	fi
-}
-
-dialog_setup_hdd_partitions_auto()
-{
-	local i
-
-	if [[ -z ${installdevs} ]]
-	then
-		dialog \
-		--backtitle "${TITLE}" \
-		--ok-label "Beenden" \
-		--msgbox "Kein geeignetes Laufwerk gefunden.\nDie Installation ist fehlgeschlagen." 6 70
-		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 ${installdevs}
-		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 ]]
-		then
-			dialog_setup_hdd_info_auto
-			dialog_setup_hdd_create_partitions
-			setup_hdd_partitions_auto
+			setup_hdd_partitions
 		fi
 	fi
 }
@@ -384,7 +335,6 @@
 	return 0
 }
 
-
 dialog_install_bootsector()
 {
 	dialog \
@@ -421,7 +371,7 @@
 		--no-cancel \
 		--ok-label "Weiter" \
 		--stdout \
-		--menu "Konfiguration" 14 70 5 \
+		--menu "Konfiguration" 14 70 6 \
 		"1" "AutoSta_LX installieren" \
 		"2" "Uebersicht gefundener Laufwerke" \
 		"3" "Beenden und neustarten" \
@@ -431,7 +381,7 @@
 		if [[ ${RES} -eq 0 ]]
 		then
 			case ${METHOD} in
-        			"1") dialog_setup_system_menu ;;
+				"1") dialog_setup_system_menu ;;
 				"2") dialog_hardware_detection ;;
 				"3") install_do_reboot ;;
 				"4") /bin/bash --login -i ;;
@@ -441,12 +391,11 @@
 }
 
 #################################################
-#		Install Komandos		#
+#		Install Commands		#
 #################################################
 run_hardware_detection()
 {
 	local hwinfo
-	
 	hwinfo="$(hwinfo --bios --storage --pci --gfxcard --sys)"
 
 	# check for special devices/clients:
@@ -459,12 +408,14 @@
 			if [[ $(< ${i}) = 1 ]]
 			then
 				removable=1
+				# we assume that all removable disks are flash disks
+				export FLASHDISK=1
 			fi
 		done
 
 		# only add this for grub legacy, grub2 detect these settings on its own
 		export GRUBLEGACYOPTS="rootdelay=8"
-		# there are to zotac types in the wild, nvidia based gfx and intel
+		# there are two zotac types in the wild, nvidia based gfx and intel
 		if [[ ! -z $(echo "${hwinfo}" | grep -i nouveau) ]]
 		then
 			export SPECIALDEVICE="zotac_nvidia"
@@ -491,6 +442,24 @@
 		export GRUBLEGACYOPTS=""
 	fi
 
+	# check for i845 Chipsets and disable KMS and use 915 drm driver
+	if [[ ! -z $(echo "${hwinfo}" | grep -i i845) ]]
+	then
+		export SPECIALDEVICE="i845"
+		# unset default video=1024x768 opt or the drm driver breaks
+		export KERNELOPTS="quiet"
+		export GRUBLEGACYOPTS=""
+		# enable full kms support
+		export GRUB2GFXPAYLOAD="keep"
+	fi
+
+	# check for radeon gfxcards
+	if [[ ! -z $(echo "${hwinfo}" | grep -i radeon) ]]
+	then
+		# enable full kms support
+		export GRUB2GFXPAYLOAD="keep"
+	fi
+
 	# check for special devices/clients:
 	# check for laptops and activate cpufreq scaling
 	if [[ $(echo "${hwinfo}" | grep 'Formfactor:' | sed 's:.*Formfactor\:\ \"\(.*\)\":\1:') = laptop ]]
@@ -500,6 +469,21 @@
 	fi
 }
 
+run_hardware_detection_disks()
+{
+	local bootdev
+
+	# all disks but exclude ramdisks
+	export ALL_DISKS=$(get_hwinfo disk | sed '/\/dev\/ram[0-9].*/d')
+	# remove the boot device from ALL_DISKS if it was an usbstick
+	if [[ $(grep '[[:space:]]/mnt/cdrom[[:space:]]' /proc/mounts | cut -d' ' -f3) != iso9660 ]]
+	then
+		bootdev="$(grep '[[:space:]]/mnt/cdrom[[:space:]]' /proc/mounts | cut -d' ' -f1 | sed 's:[0-9]::g')"
+		export ALL_DISKS=$(echo "${ALL_DISKS}" | grep -v "${bootdev}")
+	fi
+	export ALL_CDROMS="$(get_hwinfo cdrom)"
+}
+
 hdd_size_below_256mb()
 {
 	local hdd="$1"
@@ -518,156 +502,247 @@
 	return "${retval}"
 }
 
-setup_hdd_partitions_auto()
+setup_hdd_partitions()
 {
-	ROOTHDD="${HDD}1"
+	case "${INSTALL_METHOD}" in
+		normal)
+			BOOTHDD="${HDD}1"
+			SWAPHDD="${HDD}2"
+			ROOTHDD="${HDD}3"
+			;;
+
+		single|auto)
+			BOOTHDD=""
+			SWAPHDD=""
+			ROOTHDD="${HDD}1"
+			;;
+
+		flash)
+			BOOTHDD="${HDD}1"
+			SWAPHDD=""
+			ROOTHDD="${HDD}2"
+			;;
+	esac
 
-	# run this only if FDISKPARTITIONBELOW256MB is not already 1
-	if [[ ${FDISKPARTIONBELOW256MB} != 1 ]]
+	if [[ ${INSTALL_METHOD} = auto ]]
 	then
-		if hdd_size_below_256mb ${HDD}
+		# run this only if FDISKPARTITIONBELOW256MB is not already 1
+		if [[ ${FDISKPARTIONBELOW256MB} != 1 ]]
 		then
-			FDISKPARTIONBELOW256MB=1
-		else
-			FDISKPARTIONBELOW256MB=0
+			if hdd_size_below_256mb ${HDD}
+			then
+				FDISKPARTIONBELOW256MB=1
+			else
+				FDISKPARTIONBELOW256MB=0
+			fi
 		fi
-	fi
 
-	## delete disk
-	dd if=/dev/zero of=${HDD} count=1 &> /dev/null || die
+		## delete disk
+		dd if=/dev/zero of=${HDD} count=1 &> /dev/null || die
 
-	if [[ ${FDISKPARTIONBELOW256MB} = 1 ]]
-	then
-		## setup one bootable partition
-		#1. n= new disk
-		#2. p= primary disk
-		#3. 1= first partition
-		#4. 2= default sector start // small disk needs more space for grub2 mbr sector
-		#5. ''= defaul sector end
-		#6. a= bootable flag
-		#7. 1= boot flag for partition 1
-		#8. w= write/quit
-		fdisk ${HDD} &> /dev/null << EOF
+		if [[ ${FLASHDISK} = 1 ]]
+		then
+			if [[ ${FDISKPARTIONBELOW256MB} = 1 ]]
+			then
+				## setup one bootable partition
+				# 1. n= new disk
+				# 2. p= primary disk
+				# 3. 1= first partition
+				# 4. 2= default sector start // small disk needs more space for grub2 mbr sector
+				# 5. ''= defaul sector end
+				# 6. a= bootable flag
+				# 7. 1= boot flag for partition 1
+				# 8. n= new disk
+				#10. p= primary disk
+				#11. 2= second partition
+				#12. ''= default sector start
+				#13. ''= defaul sector end
+				#14. w= write/quit
+				fdisk ${HDD} &> /dev/null << EOF
 n
 p
 1
 2
-
++50M
 a
 1
+n
+p
+2
+
+
 w
 EOF
-	else
-		## setup one bootable partition
-		#1. n= new disk
-		#2. p= primary disk
-		#3. 1= first partition
-		#4. ''= default sector start
-		#5. ''= defaul sector end
-		#6. a= bootable flag
-		#7. 1= boot flag for partition 1
-		#8. w= write/quit
-		fdisk ${HDD} &> /dev/null << EOF
+			else
+				## setup one bootable partition
+				# 1. n= new disk
+				# 2. p= primary disk
+				# 3. 1= first partition
+				# 4. ''= default sector start
+				# 5. ''= defaul sector end
+				# 6. a= bootable flag
+				# 7. 1= boot flag for partition 1
+				# 8. n= new disk
+				#10. p= primary disk
+				#11. 2= second partition
+				#12. ''= default sector start
+				#13. ''= defaul sector end
+				#14. w= write/quit
+				fdisk ${HDD} &> /dev/null << EOF
 n
 p
 1
 
-
++50M
 a
 1
+n
+p
+2
+
+
 w
 EOF
-	fi
-}
-
-setup_hdd_partitions_manuell()
-{
-	BOOTHDD="${HDD}1"
-	SWAPHDD="${HDD}2"
-	ROOTHDD="${HDD}3"
+			fi
+		else
+			if [[ ${FDISKPARTIONBELOW256MB} = 1 ]]
+			then
+				## setup one bootable partition
+				#1. n= new disk
+				#2. p= primary disk
+				#3. 1= first partition
+				#4. 2= default sector start // small disk needs more space for grub2 mbr sector
+				#5. ''= defaul sector end
+				#6. a= bootable flag
+				#7. 1= boot flag for partition 1
+				#8. w= write/quit
+				fdisk ${HDD} &> /dev/null << EOF
+n
+p
+1
+2
 
-	## hdds partitionieren manuell
-	cfdisk ${HDD} || die
-}
+a
+1
+w
+EOF
+			else
+				## setup one bootable partition
+				#1. n= new disk
+				#2. p= primary disk
+				#3. 1= first partition
+				#4. ''= default sector start
+				#5. ''= defaul sector end
+				#6. a= bootable flag
+				#7. 1= boot flag for partition 1
+				#8. w= write/quit
+				fdisk ${HDD} &> /dev/null << EOF
+n
+p
+1
 
-setup_hdd_partitions_manuell_flash()
-{
-	ROOTHDD="${HDD}1"
 
-	## hdds partitionieren manuell
-	cfdisk ${HDD} || die
+a
+1
+w
+EOF
+			fi
+		fi
+	else
+		## hdds partitionieren manuell
+		cfdisk ${HDD} || die
+	fi
 }
 
 setup_hdd_format()
 {
-	mkswap ${SWAPHDD} || die
-	mke2fs -j -q ${BOOTHDD} || die
-	mke2fs -j -q ${ROOTHDD} || die
-}
+	install -d /tmp
+	:> /tmp/format.log
 
-setup_hdd_format_flash()
-{
-	mke2fs -j -q ${ROOTHDD} || die
+	if [[ -n ${SWAPHDD} ]]
+	then
+		mkswap ${SWAPHDD} || die
+	fi
+	if [[ -n ${BOOTHDD} ]]
+	then
+		mkfs.${FORMAT_FILESYSTEM_BOOTHDD} ${BOOTHDD} &> /tmp/format.log || die
+	fi
+	if [[ -n ${ROOTHDD} ]]
+	then
+		mkfs.${FORMAT_FILESYSTEM_ROOTHDD} ${ROOTHDD} &> /tmp/format.log || die
+	fi
 }
 
 install_mount_rootfs()
 {
-	swapon ${SWAPHDD} || die
-	mount ${ROOTHDD} ${INSTALLPATH} || die
-	install -d ${INSTALLPATH}/boot || die
-	mount ${BOOTHDD} ${INSTALLPATH}/boot || die
-	cd ${INSTALLPATH} || die
-}
+	local opts
+
+	if [[ -n ${SWAPHDD} ]]
+	then
+		swapon ${SWAPHDD} || die
+	fi
+	if [[ -n ${ROOTHDD} ]]
+	then
+		mount -t ${FORMAT_FILESYSTEM_ROOTHDD} ${ROOTHDD} ${INSTALL_ROOT} || die
+	fi
+	if [[ -n ${BOOTHDD} ]]
+	then
+		install -d ${INSTALL_ROOT}/boot || die
+		mount -t ${FORMAT_FILESYSTEM_BOOTHDD} ${BOOTHDD} ${INSTALL_ROOT}/boot || die
+	fi
 
-install_mount_rootfs_flash()
-{
-	mount ${ROOTHDD} ${INSTALLPATH} || die
-	install -d ${INSTALLPATH}/boot || die
-	cd ${INSTALLPATH} || die
+	cd ${INSTALL_ROOT} || die
 }
 
 install_system_image()
 {
-	tar xvjpf ${CDPATH}/system/${CDIMAGENAME} -C ${INSTALLPATH}
+	tar xvjpf ${CDPATH}/system/${CDIMAGENAME} -C ${INSTALL_ROOT}
 }
 
 install_bootsector_chroot()
 {
 	local my_roothdd
-	local grubconf=${INSTALLPATH}/boot/grub/grub.conf
+	local grubconf=${INSTALL_ROOT}/boot/grub/grub.conf
 	local grub2conf=/boot/grub/grub.cfg
+	local CONFIG
 
 	# check for grub2
-	if [[ -f ${INSTALLPATH}/sbin/grub-mkconfig ]]
+	if [[ -f ${INSTALL_ROOT}/sbin/grub-mkconfig ]]
 	then
 		# needed by grub-mkconfig on the first run
-		if [[ ! -f ${INSTALLPATH}/boot/grub/video.lst ]]
+		if [[ ! -f ${INSTALL_ROOT}/boot/grub/video.lst ]]
 		then
-			install -m0644 ${INSTALLPATH}/lib/grub/*/video.lst ${INSTALLPATH}/boot/grub/video.lst || die
+			install -m0644 ${INSTALL_ROOT}/lib/grub/*/video.lst ${INSTALL_ROOT}/boot/grub/video.lst || die
 		fi
 
 		# set kernelopts
-		if [[ -f ${INSTALLPATH}/etc/conf.d/grub ]]
+		if [[ -f ${INSTALL_ROOT}/etc/conf.d/grub ]]
 		then
-			sed -i "s:^\(export GRUB_CMDLINE_LINUX_DEFAULT=\).*:\1\"${KERNELOPTS}\":" ${INSTALLPATH}/etc/conf.d/grub || die
+			sed -i "s:^\(export GRUB_CMDLINE_LINUX_DEFAULT=\).*:\1\"${KERNELOPTS}\":" ${INSTALL_ROOT}/etc/conf.d/grub || die
+			sed -i "s:^\(export GRUB_GFXPAYLOAD_LINUX=\).*:\1\"${GRUB2GFXPAYLOAD}\":" ${INSTALL_ROOT}/etc/conf.d/grub || die
 		else
-			echo "export GRUB_CMDLINE_LINUX_DEFAULT=\"${KERNELOPTS}\"" >  ${INSTALLPATH}/etc/conf.d/grub || die
+			CONFIG=${INSTALL_ROOT}/etc/conf.d/grub
+			clearconfig
+			addconfig "export GRUB_CMDLINE_LINUX_DEFAULT=\"${KERNELOPTS}\""
+			addconfig "export GRUB_GFXPAYLOAD_LINUX=\"${GRUB2GFXPAYLOAD}\""
 		fi
-		echo 'grub-mkdevicemap' > ${INSTALLPATH}/root/.installrc || die
-		echo "LC_ALL=C grub-mkconfig -o ${grub2conf}  &> /dev/null" >> ${INSTALLPATH}/root/.installrc || die
-		echo "grub-install --no-floppy ${HDD} &> /dev/null" >> ${INSTALLPATH}/root/.installrc || die
-		echo "exit 0" >> ${INSTALLPATH}/root/.installrc || die
+		CONFIG=${INSTALL_ROOT}/.installrc
+		clearconfig
+		addconfig 'grub-mkdevicemap'
+		addconfig "LC_ALL=C grub-mkconfig -o ${grub2conf}  &> /dev/null"
+		addconfig "grub-install --no-floppy ${HDD} &> /dev/null"
+		addconfig "exit 0"
 
 	# grub-legacy
 	else
 		### grubconf schreiben
-		source ${INSTALLPATH}/boot/kernelversion
+		source ${INSTALL_ROOT}/boot/kernelversion
 
 		#for alx only
-		if [ -e ${INSTALLPATH}/etc/alx_version ]
+		if [ -e ${INSTALL_ROOT}/etc/alx_version ]
 		then
 			OLD_ALXVER="${ALXVER}"
-			source ${INSTALLPATH}/etc/alx_version
+			source ${INSTALL_ROOT}/etc/alx_version
 			KRNVER="ALX-${ALXVER}"
 			ALXVER="${OLD_ALXVER}"
 		fi
@@ -684,77 +759,71 @@
 			my_roothdd="${ROOTHDD}"
 		fi
 
-		: > ${grubconf} || die
-		echo "default 0" >> ${grubconf} || die
-		echo "timeout 3" >> ${grubconf} || die
+		CONFIG="${grubconf}"
+		clearconfig
+		addconfig "default 0"
+		addconfig "timeout 3"
 		# using current root password
-		echo "password --md5 $(cat ${INSTALLPATH}/etc/shadow | grep root | cut -d: -f2)"  >> ${grubconf} || die
-
-		echo  >> ${grubconf} || die
-		echo "# normal boot" >> ${grubconf} || die
-		echo "title ${KRNVER}" >> ${grubconf} || die
-		echo "root (hd0,0)" >> ${grubconf} || die
-		echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS}" >> ${grubconf} || die
+		addconfig "password --md5 $(cat ${INSTALL_ROOT}/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
-			echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || die
+			addconfig "initrd /boot/${KRNINITRD}"
 		fi
-
-		echo >> ${grubconf} || die
-		echo "# admin boot" >> ${grubconf} || die
-		echo "title ${KRNVER} - Re-run hardware-detection" >> ${grubconf} || die
-		echo "lock"  >> ${grubconf} || die
-		echo "root (hd0,0)" >> ${grubconf} || die
-		echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS} hardware-auto-detection" >> ${grubconf} || die
+		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
-			echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || die
+			addconfig "initrd /boot/${KRNINITRD}"
 		fi
-
-		echo >> ${grubconf} || die
-		echo "title ${KRNVER} - Reset *all* local settings" >> ${grubconf} || die
-		echo "lock"  >> ${grubconf} || die
-		echo "root (hd0,0)" >> ${grubconf} || die
-		echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS} alx-reset-settings" >> ${grubconf} || die
+		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
-			echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || die
+			addconfig "initrd /boot/${KRNINITRD}"
 		fi
 
-		# bootsector schreiben chrooted schreiben (lfs/magellan)
-		cat > ${INSTALLPATH}/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
+		# write bootsector chrooted (lfs/magellan)
+		CONFIG=${INSTALL_ROOT}/.installrc
+		clearconfig
+		addconfig '/usr/sbin/grub --no-floppy --batch << "EOF" 1> /dev/null 2> /dev/null'
+		addconfig 'root (hd0,0)'
+		addconfig 'setup (hd0)'
+		addconfig 'quit'
+		addconfig 'EOF'
+		addconfig 'exit 0'
 	fi
 
-	## enters chroot
-	mount -t proc proc ${INSTALLPATH}/proc
-	mount -t sysfs sysfs ${INSTALLPATH}/sys
-	mount -o bind /dev ${INSTALLPATH}/dev
-	chroot ${INSTALLPATH} /bin/bash --rcfile /root/.installrc -i
-	umount ${INSTALLPATH}/proc
-	umount ${INSTALLPATH}/sys
-	umount ${INSTALLPATH}/dev
-	rm ${INSTALLPATH}/root/.installrc
+	## enter chroot
+	enter_chroot_installrc
 }
 
 is_initrd_supported()
 {
 	# only generate initrds if the cmd exists
-	[[ -x ${INSTALLPATH}/sbin/mkinitrd ]] && return 0
+	[[ -x ${INSTALL_ROOT}/sbin/mkinitrd ]] && return 0
 	return 1
 }
 
 install_initrd_chroot()
 {
+	local CONFIG
+
 	# only generate initrds if the cmd exists
 	is_initrd_supported || return 0
 
+	FSMODS="${FORMAT_FILESYSTEM_BOOTHDD} ${FORMAT_FILESYSTEM_ROOTHDD}"
 	DISKMODS="sd_mod"
 	OLDPATAMODS="amd74xx piix sis5513 via82cxxx"
 	PATAMODS="ata_piix pata_amd pata_mpiix pata_oldpiix pata_sis pata_via"
@@ -762,7 +831,7 @@
 	DRMMODS="i915 mga nouveau r128 radeon savage sis tdfx ttm via"
 	OTHERMODS=""
 	case ${SPECIALDEVICE} in
-		zotac_intel) FBMODS=""; DRMMODS="i915" ;;
+		zotac_intel|i845) 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
@@ -777,40 +846,47 @@
 	fi
 
 	# install an appropriate uvesafb.conf
-	install -d ${INSTALLPATH}/etc/modprobe.d || die
-	echo "options uvesafb mode_option=1024x768-32@60 scroll=ywrap" > ${INSTALLPATH}/etc/modprobe.d/uvesafb.conf || die
+	CONFIG=${INSTALL_ROOT}/etc/modprobe.d/uvesafb.conf
+	clearconfig
+	addconfig "options uvesafb mode_option=1024x768-32@60 scroll=ywrap"
 
 	# install an appropriate viafb.conf
-	echo "options viafb viafb_mode=1024x768 viafb_refresh=60" > ${INSTALLPATH}/etc/modprobe.d/viafb.conf || die
+	CONFIG=${INSTALL_ROOT}/etc/modprobe.d/viafb.conf
+	clearconfig
+	addconfig "options viafb viafb_mode=1024x768 viafb_refresh=60"
 
 	# install an appropriate i810fb.conf
-	echo "options i810fb xres=1024 yres=768 bpp=16 mtrr=1 hsync1=30 hsync2=62 vsync1=30 vsync2=60"  > ${INSTALLPATH}/etc/modprobe.d/i810fb.conf || die
-
-	cat > ${INSTALLPATH}/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
-
-	## enters chroot
-	mount -t proc proc ${INSTALLPATH}/proc
-	mount -t sysfs sysfs ${INSTALLPATH}/sys
-	mount -o bind /dev ${INSTALLPATH}/dev
-	chroot ${INSTALLPATH} /bin/bash --rcfile /root/.installrc -i
-	umount ${INSTALLPATH}/proc
-	umount ${INSTALLPATH}/sys
-	umount ${INSTALLPATH}/dev
-	rm ${INSTALLPATH}/root/.installrc
+	CONFIG=${INSTALL_ROOT}/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"
+
+	CONFIG=${INSTALL_ROOT}/.installrc
+	clearconfig
+	addconfig 'echo "MODULES=\"${FSMODS} ${DISKMODS} ${OLDATAMODS} ${PATAMODS} ${SATAMODS} ${DRMMODS} ${FBMODS} ${OTHERMODS}\"" > /etc/conf.d/mkinitrd'
+	addconfig 'mkinitrd -f /boot/$(readlink /boot/initrd) $(readlink /boot/vmlinuz | sed "s:kernel-::g") > /dev/null'
+	addconfig 'exit 0'
+	## enter chroot
+	enter_chroot_installrc
 }
 
 is_uuid_supported()
 {
-	if [[ -x $(which busybox.mkinitrd &> /dev/null) ]]
+	# f2fs needs special treatments as the old busybox does not support this fs
+	# use the blkid from util-linux instead of busybox
+	if [[ ${FORMAT_FILESYSTEM} = f2fs ]]
 	then
-		# only detect uuids if supported
-		if [[ ! -z $(busybox.mkinitrd | grep blkid) ]]
+		if [[ -x $(type -P blkid) ]]
+		then
+				return 0
+		fi
+	else
+		if [[ -x $(type -P busybox.mkinitrd) ]]
 		then
-			return 0
+			# only detect uuids if supported
+			if [[ ! -z $(busybox.mkinitrd | grep blkid) ]]
+			then
+				return 0
+			fi
 		fi
 	fi
 
@@ -822,6 +898,7 @@
 	local UUID
 	local SEC_TYPE
 	local TYPE
+	local blkidcmd
 
 	local dev="$1"
 	[[ -z ${dev} ]] && die "no dev given"
@@ -831,29 +908,55 @@
 	then
 		eval "${dev}"
 	else
-		eval $(busybox.mkinitrd blkid ${dev} | grep "${dev}:" | sed 's/.*:\ //')
+		# f2fs needs special treatments as the old busybox does not support this fs
+		# use the blkid from util-linux instead of busybox
+		if [[ ${FORMAT_FILESYSTEM} = f2fs ]]
+		then
+			blkidcmd="blkid"
+		else
+			blkidcmd="busybox.mkinitrd blkid"
+		fi
+		eval $(${blkidcmd} ${dev} | grep "${dev}:" | sed 's/.*:\ //')
 	fi
 	echo "${UUID}"
 }
 
 install_system_settings()
 {
-	# schreibe fstab
-	if is_uuid_supported
+	local CONFIG
+	local fstype
+
+	# write fstab
+	CONFIG=${INSTALL_ROOT}/etc/fstab
+	clearconfig
+
+	if [[ -n ${BOOTHDD} ]]
 	then
-		echo -e "UUID=$(get_uuid ${BOOTHDD})\t/boot\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1" > ${INSTALLPATH}/etc/fstab || die
-		echo -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLPATH}/etc/fstab || die
-	else
-		echo -e "${BOOTHDD}\t/boot\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1" > ${INSTALLPATH}/etc/fstab || die
-		echo -e "${ROOTHDD}\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLPATH}/etc/fstab || die
+		if is_uuid_supported
+		then
+			addconfig -e "UUID=$(get_uuid ${BOOTHDD})\t/boot\t${FORMAT_FILESYSTEM_BOOTHDD}\tnoatime,noauto\t1 1"
+		else
+			addconfig -e "${BOOTHDD}\t/boot\t${FORMAT_FILESYSTEM_BOOTHDD}\tnoatime,noauto\t1 1"
+		fi
 	fi
+
+	if [[ -n ${ROOTHDD} ]]
+	then
+		if is_uuid_supported
+		then
+			addconfig -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM_ROOTHDD}\tnoatime\t0 0"
+		else
+			addconfig -e "${ROOTHDD}\t/\t${FORMAT_FILESYSTEM_ROOTHDD}\tnoatime\t0 0"
+		fi
+	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" >> ${INSTALLPATH}/etc/fstab || die
-	echo -e "proc\t/proc\tproc\tdefaults\t0 0" >> ${INSTALLPATH}/etc/fstab || die
-	echo -e "shm\t/dev/shm\ttmpfs\tdefaults\t0 0" >> ${INSTALLPATH}/etc/fstab || die
+	#addconfig -e "UUID='$(get_uuid ${SWAPHDD})'\tswap\tswap\tpri=1\t0 0"
+	addconfig -e "proc\t/proc\tproc\tdefaults\t0 0"
+	addconfig -e "shm\t/dev/shm\ttmpfs\tdefaults\t0 0"
 
 	# install network config skeleton
-	install -m0644 ${INSTALLPATH}/etc/alxconfig-ng/skel/net/net.eth0 ${INSTALLPATH}/etc/conf.d/ || die
+	install -m0644 ${INSTALL_ROOT}/etc/alxconfig-ng/skel/net/net.eth0 ${INSTALL_ROOT}/etc/conf.d/ || die
 
 	# intel framebufer quirk
 	if [[ -e /proc/fb ]]
@@ -863,37 +966,27 @@
 			fbdev=$(grep 'inteldrmfb' /proc/fb | sed 's:\([0-9]\).*:\1:')
 			if [[ ${fbdev} != 0 ]]
 			then
-				sed -i "s:^\(SPLASH_DEV=\).*:\1\"/dev/fb${fbdev}\":" ${INSTALLPATH}/etc/splash/splash.conf || die
+				sed -i "s:^\(SPLASH_DEV=\).*:\1\"/dev/fb${fbdev}\":" ${INSTALL_ROOT}/etc/splash/splash.conf || die
 			fi
 		fi
 	fi
 }
 
-install_system_settings_flash()
-{
-	# schreibe fstab
-	if is_uuid_supported
-	then
-		echo -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" > ${INSTALLPATH}/etc/fstab || die
-	else
-		echo -e "${ROOTHDD}\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" > ${INSTALLPATH}/etc/fstab || die
-	fi
-	echo -e "proc\t/proc\tproc\tdefaults\t0 0" >> ${INSTALLPATH}/etc/fstab || die
-	echo -e "shm\t/dev/shm\ttmpfs\tdefaults\t0 0" >> ${INSTALLPATH}/etc/fstab || die
-}
-
 install_umount_rootfs()
 {
 	cd /
-	umount ${INSTALLPATH}/boot || die
-	umount ${INSTALLPATH} || die
-	swapoff ${SWAPHDD} || die
-}
-
-install_umount_rootfs_flash()
-{
-	cd /
-	umount ${INSTALLPATH} || die
+	if [[ -n ${BOOTHDD} ]]
+	then
+		umount ${INSTALL_ROOT}/boot || die
+	fi
+	if [[ -n ${ROOTHDD} ]]
+	then
+		umount ${INSTALL_ROOT} || die
+	fi
+	if [[ -n ${SWAPHDD} ]]
+	then
+		swapoff ${SWAPHDD} || die
+	fi
 }
 
 install_do_reboot()
@@ -902,14 +995,58 @@
 }
 
 #################################################
-#	     Install Ablauf Scripte		#
+#	     Install Main Scripts		#
 #################################################
 
-run_install_normal()
+run_install()
 {
+	local method="$1"
+
+	# setup install environment
+	export KERNELOPTS="${DEFAULT_KERNELOPTS}"
+	export GRUBLEGACYOPTS="${GRUBLEGACYOPTS}"
+	export GRUB2OPTS="${GRUB2OPTS}"
+	export GRUB2GFXPAYLOAD="${DEFAULT_GRUB2GFXPAYLOAD}"
+	export FORMFACTOR="${DEFAULT_FORMFACTOR}"
+	export FORMAT_FILESYSTEM="${DEFAULT_FORMAT_FILESYSTEM}"
+
+	case "${method}" in
+		auto)
+			if [[ ${FLASHDISK} = 1 ]]
+			then
+				export FORMAT_FILESYSTEM="f2fs"
+				export FORMAT_FILESYSTEM_BOOTHDD="ext2"
+				export FORMAT_FILESYSTEM_ROOTHDD="${FORMAT_FILESYSTEM}"
+			else
+				export FORMAT_FILESYSTEM_BOOTHDD=""
+				export FORMAT_FILESYSTEM_ROOTHDD="${FORMAT_FILESYSTEM}"
+			fi
+			export INSTALL_METHOD="${method}"
+			;;
+		normal)
+			export FORMAT_FILESYSTEM_BOOTHDD="${FORMAT_FILESYSTEM}"
+			export FORMAT_FILESYSTEM_ROOTHDD="${FORMAT_FILESYSTEM}"
+			export INSTALL_METHOD="${method}"
+			;;
+		single)
+			export FORMAT_FILESYSTEM_BOOTHDD=""
+			export FORMAT_FILESYSTEM_ROOTHDD="${FORMAT_FILESYSTEM}"
+			export INSTALL_METHOD="${method}"
+			;;
+		flash)
+			export FORMAT_FILESYSTEM="f2fs"
+			export FORMAT_FILESYSTEM_BOOTHDD="ext2"
+			export FORMAT_FILESYSTEM_ROOTHDD="${FORMAT_FILESYSTEM}"
+			export INSTALL_METHOD="${method}"
+			;;
+		*)
+			die "Unknown install method '${method}', aborting."
+			;;
+	esac
+
 	dialog_hardware_detection
 
-	dialog_setup_hdd_partitions_manuell
+	dialog_setup_hdd_partitions
 	dialog_setup_hdd_format
 	setup_hdd_format > /dev/null
 	install_mount_rootfs
@@ -927,49 +1064,8 @@
 	dialog_install_successful
 }
 
-run_install_flash()
-{
-	dialog_hardware_detection
-
-	dialog_setup_hdd_partitions_manuell_flash
-	dialog_setup_hdd_format
-	setup_hdd_format_flash > /dev/null
-	install_mount_rootfs_flash
-	(install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | dialog_install_meter | dialog_install_system_image
-
-	dialog_install_settings
-	sleep 1
-	install_system_settings_flash
-	install_initrd_chroot
-
-	dialog_install_bootsector
-	install_bootsector_chroot
-
-	install_umount_rootfs_flash
-	dialog_install_successful
-}
-
-run_install_auto()
-{
-	dialog_hardware_detection
-
-	dialog_setup_hdd_partitions_auto
-	dialog_setup_hdd_format
-	setup_hdd_format_flash > /dev/null
-	install_mount_rootfs_flash
-	(install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | dialog_install_meter | dialog_install_system_image
-
-	dialog_install_settings
-	sleep 1
-	install_system_settings_flash
-	install_initrd_chroot
-
-	dialog_install_bootsector
-	install_bootsector_chroot
-
-	install_umount_rootfs_flash
-	dialog_install_successful
-}
+# set some proper traps
+trap "trap_exit" SIGINT SIGQUIT
 
 dialog_main