--- alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh.in	2014/04/22 10:55:06	5575
+++ alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh.in	2015/07/23 11:39:57	6828
@@ -1,56 +1,56 @@
 #!/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/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
-
+# default system settings
 # standard kernel opts
-KERNELOPTS="quiet video=1024x768"
+DEFAULT_KERNELOPTS="quiet video=1024x768"
 
 # grub options
-GRUBLEGACYOPTS=""
-GRUB2OPTS=""
-GRUB2GFXPAYLOAD="1024x768x16,1024x768"
-
-# 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=""
+FDISKPARTIONBELOW256MB=0
+SPECIALDEVICE=""
+### linecount of system.tar.gz -1 !
+CURRENTLINE=0
+#TOTALLINES=11072 # -> now in images.conf
 
 #################################################
-#		  DIALOG BOXEN			#
+#		  DIALOG BOXES			#
 #################################################
 
 die()
@@ -81,6 +81,18 @@
 
 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 ;;
+	esac
+}
+
+dialog_setup_hdd_info_normal()
+{
 	local SHDD="$(echo ${HDD} | sed 's/\/dev\///')"
 
 	dialog \
@@ -95,7 +107,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\///')"
 
@@ -138,15 +150,15 @@
 	"" "" \
 	"" "\Z1Experten Modi:\Zn" \
 	"2" "Normale IDE-Disk (Manuell)" \
-	"3" "Flash-Speicher (Manuell)")
+	"3" "Normale IDE Disk (Single)")
 	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 ;;
 			"") dialog_setup_system_menu;;
 		esac
 	fi
@@ -164,7 +176,7 @@
 		hwtmp="/tmp/hwtmp.sh"
 	fi
 
-	[[ ! -z ${installdevs} ]] && installdevs=""
+	run_hardware_detection_disks
 
 	echo "dialog \\"  > ${hwtmp}
 	echo "--backtitle \"${TITLE}\" \\" >> ${hwtmp}
@@ -174,45 +186,32 @@
 	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} ;;
-		i845) echo "	\n\n\n \\Z2Intel i845 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
@@ -230,11 +229,11 @@
 	fi
 }
 
-dialog_setup_hdd_partitions_manuell()
+dialog_setup_hdd_partitions()
 {
 	local i
 
-	if [[ -z ${installdevs} ]]
+	if [[ -z ${ALL_DISKS} ]]
 	then
 		dialog \
 		--backtitle "${TITLE}" \
@@ -250,7 +249,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
@@ -263,84 +262,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
 }
@@ -386,7 +308,6 @@
 	return 0
 }
 
-
 dialog_install_bootsector()
 {
 	dialog \
@@ -433,7 +354,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 ;;
@@ -443,12 +364,11 @@
 }
 
 #################################################
-#		Install Komandos		#
+#		Install Commands		#
 #################################################
 run_hardware_detection()
 {
 	local hwinfo
-	
 	hwinfo="$(hwinfo --bios --storage --pci --gfxcard --sys)"
 
 	# check for special devices/clients:
@@ -504,6 +424,13 @@
 		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 ]]
@@ -513,6 +440,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"
@@ -531,36 +473,50 @@
 	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"
+			;;
+	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 [[ ${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
@@ -570,17 +526,17 @@
 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
+		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
@@ -590,52 +546,45 @@
 1
 w
 EOF
+		fi
+	else
+		## hdds partitionieren manuell
+		cfdisk ${HDD} || die
 	fi
 }
 
-setup_hdd_partitions_manuell()
-{
-	BOOTHDD="${HDD}1"
-	SWAPHDD="${HDD}2"
-	ROOTHDD="${HDD}3"
-
-	## hdds partitionieren manuell
-	cfdisk ${HDD} || die
-}
-
-setup_hdd_partitions_manuell_flash()
-{
-	ROOTHDD="${HDD}1"
-
-	## hdds partitionieren manuell
-	cfdisk ${HDD} || die
-}
-
 setup_hdd_format()
 {
-	mkswap ${SWAPHDD} || die
-	mke2fs -j -q ${BOOTHDD} || die
-	mke2fs -j -q ${ROOTHDD} || die
-}
-
-setup_hdd_format_flash()
-{
-	mke2fs -j -q ${ROOTHDD} || die
+	if [[ -n ${SWAPHDD} ]]
+	then
+		mkswap ${SWAPHDD} || die
+	fi
+	if [[ -n ${BOOTHDD} ]]
+	then
+		mkfs.${FORMAT_FILESYSTEM} -q ${BOOTHDD} || die
+	fi
+	if [[ -n ${ROOTHDD} ]]
+	then
+		mkfs.${FORMAT_FILESYSTEM} -q ${ROOTHDD} || 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
-}
+	if [[ -n ${SWAPHDD} ]]
+	then
+		swapon ${SWAPHDD} || die
+	fi
+	if [[ -n ${ROOTHDD} ]]
+	then
+		mount ${ROOTHDD} ${INSTALLPATH} || die
+	fi
+	if [[ -n ${BOOTHDD} ]]
+	then
+		install -d ${INSTALLPATH}/boot || die
+		mount ${BOOTHDD} ${INSTALLPATH}/boot || die
+	fi
 
-install_mount_rootfs_flash()
-{
-	mount ${ROOTHDD} ${INSTALLPATH} || die
-	install -d ${INSTALLPATH}/boot || die
 	cd ${INSTALLPATH} || die
 }
 
@@ -736,7 +685,7 @@
 			echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || die
 		fi
 
-		# bootsector schreiben chrooted schreiben (lfs/magellan)
+		# write bootsector chrooted (lfs/magellan)
 		cat > ${INSTALLPATH}/root/.installrc << CHROOTEOF
 /usr/sbin/grub --no-floppy --batch << "EOF" 1> /dev/null 2> /dev/null
 root (hd0,0)
@@ -856,11 +805,23 @@
 	# schreibe fstab
 	if is_uuid_supported
 	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
+		if [[ -n ${BOOTHDD} ]]
+		then
+			echo -e "UUID=$(get_uuid ${BOOTHDD})\t/boot\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1" > ${INSTALLPATH}/etc/fstab || die
+		fi
+		if [[ -n ${ROOTHDD} ]]
+		then
+			echo -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLPATH}/etc/fstab || die
+		fi
 	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 [[ -n ${BOOTHDD} ]]
+		then
+			echo -e "${BOOTHDD}\t/boot\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1" > ${INSTALLPATH}/etc/fstab || die
+		fi
+		if [[ -n ${ROOTHDD} ]]
+		then
+			echo -e "${ROOTHDD}\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLPATH}/etc/fstab || die
+		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
@@ -884,31 +845,21 @@
 	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 ${INSTALLPATH}/boot || die
+	fi
+	if [[ -n ${ROOTHDD} ]]
+	then
+		umount ${INSTALLPATH} || die
+	fi
+	if [[ -n ${SWAPHDD} ]]
+	then
+		swapoff ${SWAPHDD} || die
+	fi
 }
 
 install_do_reboot()
@@ -917,14 +868,40 @@
 }
 
 #################################################
-#	     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)
+			export INSTALL_METHOD="${method}"
+			;;
+		normal)
+			export INSTALL_METHOD="${method}"
+			;;
+		single)
+			export INSTALL_METHOD="${method}"
+			;;
+		*)
+			echo "Unknown install method '${method}', aborting."
+			exit 1
+			;;
+	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
@@ -942,50 +919,6 @@
 	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
-}
-
 dialog_main
 
 exit 0