--- alx-src/branches/unlabeled-1.1.1/alxinstall-ng/bin/alxinstall-ng.sh	2005/04/18 19:01:41	258
+++ alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh	2010/10/18 11:46:02	1574
@@ -1,9 +1,8 @@
 #!/bin/sh
 #
-# $Header: /home/cvsd/alx-cvs/alx-src/alxinstall-ng/bin/alxinstall-ng.sh,v 1.1.1.1 2005-04-18 19:01:41 niro Exp $
+# $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
-# version: 0.8b
 #
 # Niels Rogalla <niro@magellan-linux.de>
 #		<rogalla@augusta-bochum.de>
@@ -12,26 +11,19 @@
 # Install Navigation Gui
 #
 
-#source /etc/alx_version
-#source /opt/alx-config/version
-
-#source /etc/alx-config/config.rc
-
 #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 -e 's/ //'`"
+cdromdev="$(echo ${cdromdev} | sed 's/ //')"
 ########################################
 
 ### System/Config Version
-VERSION="0.1"
+VERSION="0.3.5"
 TITLE="alxinstall-ng - ${VERSION}"
 
-#CONFIGS_TEMPLATE="/opt/alx-config/configs"
-
 CDPATH="/mnt/cdrom"
 INSTALLPATH="/mnt/magellan"
 
@@ -39,32 +31,35 @@
 CURRENTLINE=0
 #TOTALLINES=11072 # -> now in images.conf
 
+# standart kernel opts
+KERNELOPTS="quiet"
+
+# default specialdevices
+SPECIALDEVICE=""
 
 #################################################
 #		  DIALOG BOXEN			#
 #################################################
 
-die() {
-	#clear
-	#echo -e "\nhuch, da ist ein script gestorben -> $?\n"
-	#read
-	#exit 0
+die()
+{
 	ERROR=$1
 	RETVAL=$?
 	dialog_install_failure
 	exit 1
 }
 
-dialog_warning() {
+dialog_warning()
+{
 	dialog \
-	--backtitle "$TITLE" \
+	--backtitle "${TITLE}" \
 	--colors \
 	--defaultno \
 	--yesno "\Z1 !!! Achtung !!! \Zn\n\n\
 	Diese Festplatte wird unwiederruflich geloescht werden.\n\n\
 		Soll ich wirklich fortfahren ?" 10 70
 	RES=$?
-	if [ "$RES" == "1" ]
+	if [[ ${RES} -eq 1 ]]
 	then
 		clear
 		echo "Der Vorgang wurde abgebrochen."
@@ -72,13 +67,14 @@
 	fi
 }
 
-dialog_setup_hdd_info(){
-	local SHDD="`echo $HDD|sed -e 's/\/dev\///'`"
+dialog_setup_hdd_info()
+{
+	local SHDD="$(echo ${HDD} | sed 's/\/dev\///')"
 
 	dialog \
 	--colors \
 	--title "[ Festplatten Partitionierung ]" \
-	--backtitle "$TITLE" \
+	--backtitle "${TITLE}" \
 	--ok-label "Weiter" \
 	--msgbox "\nBitte legen Sie 3 Partitionen an.\n\n\
 		[ \Z3${SHDD}1\Zn ] Typ: \Z3Linux\Zn mit ca. 50MB\n\
@@ -87,114 +83,161 @@
 		Bitte ${SHDD}1 als \Z3bootable\Zn markieren." 12 81
 }
 
-dialog_setup_hdd_menu() {
+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 1 Partition an.\n\n\
+		[ \Z3${SHDD}1\Zn ] Typ: \Z3Linux\Zn mit dem gesamten Speicher\n\
+		Bitte ${SHDD}1 als \Z3bootable\Zn markieren." 12 81
+}
+
+dialog_setup_hdd_info_auto()
+{
+	local SHDD="$(echo $HDD | sed 's/\/dev\///')"
+
+	dialog \
+	--colors \
+	--title "[ Festplatten Partitionierung ]" \
+	--backtitle "${TITLE}" \
+	--ok-label "Weiter" \
+	--msgbox "\nAchtung!\n\
+		Alle Daten werden von der Disk [ \Z3${HDD}\Zn ] gelöscht!" 12 81
+}
+
+dialog_setup_system_menu()
+{
+	local i
 
-	I=`dialog \
-	--backtitle "$TITLE" \
+	i=$(dialog \
+	--backtitle "${TITLE}" \
 	--title "[ Festplatten Partitionierung ]" \
 	--cancel-label "Abbrechen" \
 	--ok-label "Weiter" \
 	--stdout \
-	--menu "\nWaehlen Sie zwischen Manuell und Automatisch" 14 70 5 \
-	"1" "Manuell" \
-	"2" "Automatisch"`
+	--menu "\nWaehlen Sie die Installations-Methode" 14 70 5 \
+	"1" "Automatisches Setup" \
+	"2" "Normale IDE-Disk (manuell)" \
+	"3" "Flash-Speicher (manuell)")
 	RES=$?
-	if [ "$RES" == "1" ];then
-		return 1
-	fi
-	if [ "$RES" == "0" ];then
-		case "$I" in
-        		"1")
-				dialog_setup_hdd_found_manuell
-				;;
-			"2")
-				dialog_warning
-				setup_hdd_partitions_silent
-			     	;;
+	[[ ${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 ;;
 		esac
 	fi
 }
 
-dialog_setup_hdd_found_manuell() {
-	if [ ! -z "$installdevs" ]
+dialog_hardware_detection()
+{
+	local i
+	local hwtmp
+
+	if [ -x $(which mktemp &> /dev/null) ]
 	then
-		installdevs=""
+		hwtmp="$(mktemp)"
+	else
+		hwtmp="/tmp/hwtmp.sh"
 	fi
 
-	echo "dialog \\"  > /tmp/hddtmp.sh
-	echo "--backtitle \"$TITLE\" \\" >> /tmp/hddtmp.sh
-	echo "--ok-label \"Weiter\" \\" >> /tmp/hddtmp.sh
-	echo "--stdout \\" >> /tmp/hddtmp.sh
-	echo "--colors \\" >> /tmp/hddtmp.sh
-	echo "--msgbox \"Gefundene Hardware:\n\n \\" >> /tmp/hddtmp.sh
-	echo "	Festplatten:\n \\" >> /tmp/hddtmp.sh
+	[[ ! -z ${installdevs} ]] && installdevs=""
 
-	if [ ! -z "$scsidisks" ]
+	echo "dialog \\"  > ${hwtmp}
+	echo "--backtitle \"${TITLE}\" \\" >> ${hwtmp}
+	echo "--ok-label \"Weiter\" \\" >> ${hwtmp}
+	echo "--stdout \\" >> ${hwtmp}
+	echo "--colors \\" >> ${hwtmp}
+	echo "--msgbox \"Gefundene Hardware:\n\n \\" >> ${hwtmp}
+	echo "	Festplatten:\n \\" >> ${hwtmp}
+
+	if [[ ! -z ${scsidisks} ]]
 	then
-		for I in $scsidisks
+		for i in ${scsidisks}
 		do
-			if [ "$I" != "$cdromdev" ]
+			if [[ ${i} != ${cdromdev} ]]
 			then
-				echo "		\\Z7SCSI: \\Z3$I\\Zn\n \\" >> /tmp/hddtmp.sh
-				installdevs="$installdevs $I"
+				echo "		\\Z7SCSI: \\Z3${i}\\Zn\n \\" >> ${hwtmp}
+				installdevs="${installdevs} ${i}"
 			fi
 		done
 	fi
 
-	if [ ! -z "$idedisks" ]
+	if [[ ! -z ${idedisks} ]]
 	then
-		for I in $idedisks
+		for i in ${idedisks}
 		do
-			if [ "$I" != "$cdromdev" ]
+			if [[ ${i} != ${cdromdev} ]]
 			then
-				echo "		\\Z7IDE:  \\Z3$I\\Zn\n \\" >> /tmp/hddtmp.sh
-				installdevs="$installdevs $I"
+				echo "		\\Z7IDE:  \\Z3${i}\\Zn\n \\" >> ${hwtmp}
+				installdevs="${installdevs} ${i}"
 			fi
 		done
 	fi
 
-	if [ ! -z "$cdromdev" ]
+	if [[ ! -z ${cdromdev} ]]
 	then
-		echo "	\n \\" >> /tmp/hddtmp.sh
-		echo "	\\Z7andere Laufwerke:\n \\" >> /tmp/hddtmp.sh
-		echo "		CDROM: \\Z3$cdromdev\\Zn\n \\" >> /tmp/hddtmp.sh
+		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} ;;
+		*) echo "	\n\n\n \\ZnStandard Device erkannt!\\Zn \\" >> ${hwtmp} ;;
+	esac
+
+	echo "	\" 13 70" >> ${hwtmp}
+	chmod a+x ${hwtmp}
+	${hwtmp}
+
+	# remove tmp file
+	if [[ -f ${hwtmp} ]]
+	then
+		rm ${hwtmp}
 	fi
-	echo "	\" 13 70" >> /tmp/hddtmp.sh
-	chmod a+x /tmp/hddtmp.sh
-	/tmp/hddtmp.sh
 }
 
-dialog_setup_hdd_partitions_manuell() {
-	if [ -z "$installdevs" ]
+dialog_setup_hdd_partitions_manuell()
+{
+	local i
+
+	if [[ -z ${installdevs} ]]
 	then
 		dialog \
-		--backtitle "$TITLE" \
+		--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 "--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
+		for i in ${installdevs}
 		do
-			echo "\"$I\" \"\" \\" >> /tmp/hddtmp.sh
+			echo "\"${i}\" \"\" \\" >> /tmp/hddtmp.sh
 		done
 		echo -e "\n" >> /tmp/hddtmp.sh
 
 		chmod a+x /tmp/hddtmp.sh
-		HDD="`/tmp/hddtmp.sh`"
+		HDD="$(/tmp/hddtmp.sh)"
 		RES=$?
-		if [ "$RES" == "1" ]
-		then
-			return 1
-		fi
-		if [ "$RES" == "0" ]
+		[[ ${RES} -eq 1 ]] && return 1
+		if [[ ${RES} -eq 0 ]]
 		then
 			dialog_setup_hdd_info
 			setup_hdd_partitions_manuell
@@ -202,34 +245,117 @@
 	fi
 }
 
-dialog_setup_hdd_partitions_silent() {
+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
+		fi
+	fi
+}
+
+dialog_setup_hdd_create_partitions()
+{
 	dialog \
-	--backtitle "$TITLE" \
-	--infobox "Erstelle Partitionen ..." 3 70
+	--backtitle "${TITLE}" \
+	--infobox "Erstelle Disk Partitionen ..." 3 70
 }
 
-dialog_setup_hdd_format() {
+dialog_setup_hdd_format()
+{
 	dialog \
-	--backtitle "$TITLE" \
+	--backtitle "${TITLE}" \
 	--infobox "Erstelle Datei-Systeme ..." 3 70
 }
 
-dialog_install_settings() {
+dialog_install_settings()
+{
 	dialog \
-	--backtitle "$TITLE" \
+	--backtitle "${TITLE}" \
 	--infobox "Speichere System-Einstellungen ..." 3 70
 }
 
-dialog_install_system_image() {
+dialog_install_system_image()
+{
 	dialog \
-	--backtitle "$TITLE" \
+	--backtitle "${TITLE}" \
 	--gauge "Kopiere System-Image ..." 6 80
 }
 
-dialog_install_meter() {
-	while [ "${CURRENTLINE}" != "${TOTALLINES}" ] ; do
-		CURRENTLINE=`grep --count . /tmp/install.log`
-		PERCENT=`expr ${CURRENTLINE} \* 100 / ${TOTALLINES}`
+dialog_install_meter()
+{
+	while [[ ${CURRENTLINE} != ${TOTALLINES} ]]
+	do
+		CURRENTLINE=$(grep -c . /tmp/install.log)
+		PERCENT=$(( ${CURRENTLINE} * 100 / ${TOTALLINES}))
 		echo ${PERCENT}
 		sleep 1
 	done
@@ -238,82 +364,39 @@
 }
 
 
-dialog_install_bootsector() {
+dialog_install_bootsector()
+{
 	dialog \
-	--backtitle "$TITLE" \
+	--backtitle "${TITLE}" \
 	--infobox "Schreibe den Bootsektor ..." 3 70
 }
 
-dialog_install_alxconfig() {
+dialog_install_successful()
+{
 	dialog \
-	--backtitle "$TITLE" \
-	--infobox "Installiere die ALX Setup-Tools ..." 3 70
-}
-
-dialog_install_kernel_image() {
-	dialog \
-	--backtitle "$TITLE" \
-	--infobox "Installiere den System-Kernel ..." 3 70
-
-}
-
-dialog_install_hotfixes() {
-	dialog \
-	--backtitle "$TITLE" \
-	--infobox "Installiere Hotfixes ..." 3 70
-
-}
-
-dialog_install_successful() {
-	dialog \
-	--backtitle "$TITLE" \
+	--backtitle "${TITLE}" \
 	--colors \
 	--msgbox "Die Installation war \Z2erfolgreich\Zn." 5 81
 }
 
-dialog_install_failure() {
+dialog_install_failure()
+{
 	dialog \
-	--backtitle "$TITLE" \
+	--backtitle "${TITLE}" \
 	--colors \
 	--msgbox "Die Installation ist \Z1Fehlgeschlagen\Zn.\n\n\
-		Fehler bei $ERROR, RetVal: $RETVAL \
+		Fehler bei ${ERROR}, RetVal: ${RETVAL} \
 	" 10 81
 }
 
-dialog_install_method() {
-
-	METHOD=`dialog \
-	--backtitle "$TITLE" \
-	--cancel-label "Abbrechen" \
-	--ok-label "Weiter" \
-	--stdout \
-	--menu "Konfiguration" 14 70 5 \
-	"1" "Normale Installation" \
-	"2" "Silent Installation"`
-	RES=$?
-	if [ "$RES" == "1" ];then
-		return 1
-	fi
-	if [ "$RES" == "0" ];then
-		case "$METHOD" in
-        		"1")
-				run_install_normal
-				;;
-			"2")
-				dialog_warning
-				run_install_silent
-			     	;;
-		esac
-	fi
-}
-
-dialog_main() {
+dialog_main()
+{
 	METHOD=0
 
-	while [ $METHOD -le 2 ]
+	while [[ ${METHOD} -le 2 ]]
 	do
-		METHOD=`dialog \
-		--backtitle "$TITLE" \
+		METHOD=$(dialog \
+		--backtitle "${TITLE}" \
 		--no-cancel \
 		--ok-label "Weiter" \
 		--stdout \
@@ -321,23 +404,16 @@
 		"1" "AutoSta_LX installieren" \
 		"2" "Uebersicht gefundener Laufwerke" \
 		"3" "Beenden und neustarten" \
-		"4" "Beenden ohne neustarten" `
+		"4" "Beenden und eine Shell starten")
 		RES=$?
-		if [ "$RES" == "1" ];then
-			exit 1
-		fi
-		if [ "$RES" == "0" ];then
-			case "$METHOD" in
-        			"1")	
-					#only for now later it will be used again
-					#with 6.1-r2 only one install method available
-					#dialog_install_method
-					run_install_normal
-					;;
-				"2") 	dialog_setup_hdd_found_manuell
-					;;
-				"3")	install_do_reboot
-					;;
+		[[ ${RES} -eq 1 ]] && exit 1
+		if [[ ${RES} -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
@@ -346,132 +422,111 @@
 #################################################
 #		Install Komandos		#
 #################################################
-setup_hdd_partitions_manuell() {
+run_hardware_detection()
+{
+	# check for special devices/clients:
+	# if zotac a zotac and the disk is a removeable device, then add rootdelay to kernelcmd
+	local removable=0
+	if [[ ! -z $(lspci -v | grep -i zotac) ]]
+	then
+		for i in /sys/block/[hs]d*/removable
+		do
+			if [[ $(< ${i}) = 1 ]]
+			then
+				removable=1
+			fi
+		done
+
+		export KERNELOPTS="${KERNELOPTS} rootdelay=8"
+		export SPECIALDEVICE="zotac"
+	fi
+}
+
+setup_hdd_partitions_auto()
+{
+	ROOTHDD="${HDD}1"
+
+	## delete disk
+	dd if=/dev/zero of=${HDD} count=1 &> /dev/null || die
+
+	## 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
+
+
+a
+1
+w
+EOF
+}
+
+setup_hdd_partitions_manuell()
+{
 	BOOTHDD="${HDD}1"
 	SWAPHDD="${HDD}2"
 	ROOTHDD="${HDD}3"
 
 	## hdds partitionieren manuell
-	cfdisk $HDD || die
+	cfdisk ${HDD} || die
 }
 
-setup_hdd_partitions_silent() {
-	## hdds löschen
-	dd if=/dev/zero of=$HDD bs=1024k count=1 || die
-	## hdds partitionieren silent
-	fdisk $HDD < $CONFIGS_TEMPLATE/fdisksettings #1> /dev/null 3> /dev/null || die
-	
-	read
-}
+setup_hdd_partitions_manuell_flash()
+{
+	ROOTHDD="${HDD}1"
 
-setup_hdd_format() {
-	mkswap $SWAPHDD || die
-	mke2fs -j -q $BOOTHDD || die
-	mke2fs -j -q $ROOTHDD || die
+	## hdds partitionieren manuell
+	cfdisk ${HDD} || die
 }
 
-install_mount_rootfs() {
-	swapon $SWAPHDD || die
-	mount $ROOTHDD $INSTALLPATH || die
-	install -d $INSTALLPATH/boot || die
-	mount $BOOTHDD $INSTALLPATH/boot || die
-	cd $INSTALLPATH || die
+setup_hdd_format()
+{
+	mkswap ${SWAPHDD} || die
+	mke2fs -j -q ${BOOTHDD} || die
+	mke2fs -j -q ${ROOTHDD} || die
 }
 
-install_system_image() {
-	#tar xvzpf $CDPATH/system/autosta_lx.tar.gz
-	tar xvjpf ${CDPATH}/system/${CDIMAGENAME} -C ${INSTALLPATH}
+setup_hdd_format_flash()
+{
+	mke2fs -j -q ${ROOTHDD} || die
 }
 
-
-install_kernel_image() {
-	declare -i CPUTYPE=`cat /proc/cpuinfo |grep "cpu family"|cut -d ' ' -f3`
-
-	if [ $CPUTYPE -le 5 ];then
-                #echo -e "\033[1;6m\033[36m""i386 Architektur gefunden.""\033[0m"
-                #echo -e "Installiere i386 Kernel..."
-
-		lastdir="`pwd`"
-
-		mkdir -p $INSTALLPATH/INSTALL/kernel || die
-		cd $INSTALLPATH/INSTALL/kernel || die
-		tar xzpf $CDPATH/kernels/kernel-i386.tar.gz || die
-		source $INSTALLPATH/INSTALL/kernel/kernelversion || die
-
-		cp -aRf $INSTALLPATH/INSTALL/kernel/$KRNLIB $INSTALLPATH/lib/modules || die
-		cp -aRf $INSTALLPATH/INSTALL/kernel/$KRNIMG $INSTALLPATH/boot || die
-		cp -aRf $INSTALLPATH/INSTALL/kernel/$KRNINITRD $INSTALLPATH/boot || die
-		cp -aRf $INSTALLPATH/INSTALL/kernel/kernelversion $INSTALLPATH/boot || die
-
-		cd $lastdir || die
-
-        elif [ $CPUTYPE -ge 6 ];then
-                #echo -e "\033[1;6m\033[36m""i686 Architektur gefunden.""\033[0m"
-                #echo -e "Installiere i686 Kernel..."
-
-		lastdir="`pwd`"
-
-		mkdir -p $INSTALLPATH/INSTALL/kernel || die
-		cd $INSTALLPATH/INSTALL/kernel || die
-		tar xzpf $CDPATH/kernels/kernel-i686.tar.gz || die
-		source $INSTALLPATH/INSTALL/kernel/kernelversion || die
-
-		cp -aRf $INSTALLPATH/INSTALL/kernel/$KRNLIB $INSTALLPATH/lib/modules || die
-		cp -aRf $INSTALLPATH/INSTALL/kernel/$KRNIMG $INSTALLPATH/boot || die
-		cp -aRf $INSTALLPATH/INSTALL/kernel/$KRNINITRD $INSTALLPATH/boot || die
-		cp -aRf $INSTALLPATH/INSTALL/kernel/kernelversion $INSTALLPATH/boot || die
-
-		cd $lastdir || 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
 }
 
-install_bootsector() {
-	### grubconf schreiben
-	source $INSTALLPATH/INSTALL/kernel/kernelversion
-
-	if [ -z $KRNVER ]
-	then
-		KRNVER="AutoSta_LX"
-	fi
-
-	if [ -z $KRNIMG ]
-	then
-		KRNIMG="bzImage"
-	fi
-
-	if [ -z $KRNINITRD ]
-	then
-		KRNINITRD="initrd"
-	fi
-
-	echo -e "default 0" > $INSTALLPATH/boot/grub/grub.conf || die
-	echo -e "timeout 03" >> $INSTALLPATH/boot/grub/grub.conf ||die
-	#no support for splash image in 6.1-r2
-	#echo -e "splashimage=(hd0,0)/boot/grub/splash.xpm.gz" >> $INSTALLPATH/boot/grub/grub.conf || die
-	echo -e "\ntitle=${KRNVER}" >> $INSTALLPATH/boot/grub/grub.conf || die
-	echo -e "root (hd0,0)" >> $INSTALLPATH/boot/grub/grub.conf || die
-	
-	#s3 cards don't support this
-	#echo -e "kernel (hd0,0)/boot/${KRNIMG} root=$ROOTHDD vga=0x317 video:vesa:ywrap,mtrr splash=silent quiet" >> $INSTALLPATH/boot/grub/grub.conf || die
-	#that's more safer:
-	echo -e "kernel (hd0,0)/boot/${KRNIMG} root=$ROOTHDD quiet" >> $INSTALLPATH/boot/grub/grub.conf || die
-	
-	#not needed without bootsplash support
-	#echo -e "initrd=/boot/${KRNINITRD}" >> $INSTALLPATH/boot/grub/grub.conf || die
+install_mount_rootfs_flash()
+{
+	mount ${ROOTHDD} ${INSTALLPATH} || die
+	install -d ${INSTALLPATH}/boot || die
+	cd ${INSTALLPATH} || die
+}
 
-	### bootsector schreiben
-	#grub --no-floppy < $CONFIGS_TEMPLATE/grubsettings || die
-	/sbin/grub --no-floppy --batch << "EOF" 1> /dev/null 2> /dev/null || die
-root (hd0,0)
-setup (hd0)
-quit
-EOF
+install_system_image()
+{
+	tar xvjpf ${CDPATH}/system/${CDIMAGENAME} -C ${INSTALLPATH}
 }
 
-install_bootsector_chroot() {
+install_bootsector_chroot()
+{
+	local my_roothdd
+
 	### grubconf schreiben
-	#source $INSTALLPATH/INSTALL/kernel/kernelversion
-	source $INSTALLPATH/boot/kernelversion
+	source ${INSTALLPATH}/boot/kernelversion
 
 	#for alx only
 	if [ -e ${INSTALLPATH}/etc/alx_version ]
@@ -481,126 +536,189 @@
 		KRNVER="ALX-${ALXVER}"
 		ALXVER="${OLD_ALXVER}"
 	fi
-	
-	if [ -z "$KRNVER" ]
+
+	[[ -z ${KRNVER} ]] && KRNVER="AutoSta_LX"
+	[[ -z ${KRNINITRD} ]] && KRNINITRD="initrd"
+	[[ -z ${KRNIMG} ]] && KRNIMG="vmlinuz"
+
+	# uuid support
+	if is_uuid_supported
 	then
-		KRNVER="AutoSta_LX"
+		my_roothdd="UUID=$(get_uuid ${ROOTHDD})"
+	else
+		my_roothdd="${ROOTHDD}"
 	fi
 
-	if [ -z "$KRNIMG" ]
+	local grubconf=${INSTALLPATH}/boot/grub/grub.conf
+	: > ${grubconf} || die
+	echo "default 0" >> ${grubconf} || die
+	echo "timeout 3" >> ${grubconf} || die
+	# 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}" >> ${grubconf} || die
+	if is_initrd_supported
 	then
-		KRNIMG="bzImage"
+		echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || die
 	fi
 
-	if [ -z "$KRNINITRD" ]
+	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} hardware-auto-detection" >> ${grubconf} || die
+	if is_initrd_supported
 	then
-		KRNINITRD="initrd"
+		echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || die
 	fi
 
-	echo -e "default 0" > $INSTALLPATH/boot/grub/grub.conf || die
-	echo -e "timeout 03" >> $INSTALLPATH/boot/grub/grub.conf ||die
-	
-	#no support for splash image in 6.1-r2
-	#echo -e "splashimage=(hd0,0)/boot/grub/splash.xpm.gz" >> $INSTALLPATH/boot/grub/grub.conf || die
-	
-	echo -e "\ntitle=${KRNVER}" >> $INSTALLPATH/boot/grub/grub.conf || die
-	echo -e "root (hd0,0)" >> $INSTALLPATH/boot/grub/grub.conf || die
-	
-	#s3 cards don't support this
-	#echo -e "kernel (hd0,0)/boot/${KRNIMG} root=$ROOTHDD vga=0x317 video:vesa:ywrap,mtrr splash=silent quiet" >> $INSTALLPATH/boot/grub/grub.conf || die
-	#that's more safer:
-	echo -e "kernel (hd0,0)/boot/${KRNIMG} root=$ROOTHDD quiet" >> $INSTALLPATH/boot/grub/grub.conf || die
-	
-	#not needed without bootsplash support
-	#echo -e "initrd=/boot/${KRNINITRD}" >> $INSTALLPATH/boot/grub/grub.conf || die
-
-
-	### bootsector schreiben chrooted schreiben (gentoo)
-	if [ -f $INSTALLPATH/sbin/grub ]
+	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} alx-reset-settings" >> ${grubconf} || die
+	if is_initrd_supported
 	then
-		cat > $INSTALLPATH/root/.bashrc << CHROOTEOF
-/sbin/grub --no-floppy --batch << "EOF" 1> /dev/null 2> /dev/null
-root (hd0,0)
-setup (hd0)
-quit
-EOF
-exit
-CHROOTEOF
+		echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || die
 	fi
 
-	### bootsector schreiben chrooted schreiben (lfs/magellan)
-	if [ -f $INSTALLPATH/usr/sbin/grub ]
-	then
-		cat > $INSTALLPATH/root/.bashrc << CHROOTEOF
+	# bootsector schreiben chrooted schreiben (lfs/magellan)
+	cat > ${INSTALLPATH}/root/.bashrc << CHROOTEOF
 /usr/sbin/grub --no-floppy --batch << "EOF" 1> /dev/null 2> /dev/null
 root (hd0,0)
 setup (hd0)
 quit
 EOF
-exit
+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/.bashrc -i
+	umount ${INSTALLPATH}/proc
+	umount ${INSTALLPATH}/sys
+	umount ${INSTALLPATH}/dev
+	rm ${INSTALLPATH}/root/.bashrc
+}
+
+is_initrd_supported()
+{
+	# only generate initrds if the cmd exists
+	[[ -x ${INSTALLPATH}/sbin/mkinitrd ]] && return 0
+	return 1
+}
+
+install_initrd_chroot()
+{
+	# only generate initrds if the cmd exists
+	is_initrd_supported || return 0
+
+	cat > ${INSTALLPATH}/root/.bashrc << CHROOTEOF
+echo "MODULES=\"ext3 amd74xx piix sis5513 via82cxxx sd_mod ata_piix pata_amd pata_mpiix pata_oldpiix pata_sis pata_via sata_via sata_sis sata_nv\"" > /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/.bashrc -i
+	umount ${INSTALLPATH}/proc
+	umount ${INSTALLPATH}/sys
+	umount ${INSTALLPATH}/dev
+	rm ${INSTALLPATH}/root/.bashrc
+}
+
+is_uuid_supported()
+{
+	if [[ -x $(which busybox.mkinitrd &> /dev/null) ]]
+	then
+		# only detect uuids if supported
+		if [[ ! -z $(busybox.mkinitrd | grep blkid) ]]
+		then
+			return 0
+		fi
 	fi
 
-	##enters chroot
-	mount -t proc proc $INSTALLPATH/proc
-	chroot $INSTALLPATH /bin/bash
-	umount $INSTALLPATH/proc
-	rm $INSTALLPATH/root/.bashrc
+	return 1
 }
 
-install_alxconfig(){
-	lastdir="`pwd`"
+get_uuid()
+{
+	local UUID
+	local SEC_TYPE
+	local TYPE
 
-	mkdir -p $INSTALLPATH/opt/alx-config || die
-	cd $INSTALLPATH/opt/alx-config || die
-	tar xzpf $CDPATH/alx-config/alx-config.tar.gz || die
-	chmod a+x $INSTALLPATH/opt/alx-config/Configurator/config_functions.sh || die
-	chmod a+x $INSTALLPATH/opt/alx-config/Configurator/config_menu.sh || die
-	ln -sf /opt/alx-config/Configurator/config_menu.sh $INSTALLPATH/bin/ALXConfig || die
+	local dev="$1"
+	[[ -z ${dev} ]] && die "no dev given"
 
-	cd $lastdir || die
+	# check if given device is already an UUID
+	if [[ ${dev/UUID=/}x != ${dev}x ]]
+	then
+		eval "${dev}"
+	else
+		eval $(busybox.mkinitrd blkid ${dev} | grep "${dev}:" | sed 's/.*:\ //')
+	fi
+	echo "${UUID}"
 }
 
+install_system_settings()
+{
+	# schreibe fstab
+	if is_uuid_supported
+	then
+		echo -e "UUID=$(get_uuid ${BOOTHDD})\t/boot\text3\tnoatime,noauto\t1 1" > ${INSTALLPATH}/etc/fstab || die
+		echo -e "UUID=$(get_uuid ${ROOTHDD})\t/\text3\tnoatime\t0 0" >> ${INSTALLPATH}/etc/fstab || die
+	else
+		echo -e "${BOOTHDD}\t/boot\text3\tnoatime,noauto\t1 1" > ${INSTALLPATH}/etc/fstab || die
+		echo -e "${ROOTHDD}\t/\text3\tnoatime\t0 0" >> ${INSTALLPATH}/etc/fstab || die
+	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
 
-install_system_settings(){
-	### schreibe fstab
-	echo -e "$BOOTHDD\t/\text3\tnoatime,noauto\t1 1" > $INSTALLPATH/etc/fstab || die
-	echo -e "$ROOTHDD\t/\text3\tnoatime\t0 0" >> $INSTALLPATH/etc/fstab || die
-	echo -e "$SWAPHDD\tswap\tswap\tpri=1\t0 0" >> $INSTALLPATH/etc/fstab || die
-	echo -e "none\t/proc\tproc\tdefaults\t0 0" >> $INSTALLPATH/etc/fstab || die
-	
-	#deprecated
-	#echo -e "devpts\t/dev/pts\tdevpts\tgid=4,mode=620\t0 0" >> $INSTALLPATH/etc/fstab || die
-
-	echo -e "none\t/dev/shm\ttmpfs\tdefaults\t0 0" >> $INSTALLPATH/etc/fstab || die
-	echo -e "none\t/proc/bus/usb\tusbfs\tdefaults\t0 0" >> $INSTALLPATH/etc/fstab || die
+	# install network config skeleton
+	install -m0644 ${INSTALLPATH}/etc/alxconfig-ng/skel/net/net.eth0 ${INSTALLPATH}/etc/conf.d/ || die
 }
 
-install_hotfixes(){
-	if [ -f $CDPATH/hotfixes/hotfixes.sh ]
+install_system_settings_flash()
+{
+	# schreibe fstab
+	if is_uuid_supported
 	then
-		dialog_hotfixes
-		sleep1
-		$CDPATH/hotfixes/hotfixes.sh
+		echo -e "UUID=$(get_uuid ${ROOTHDD})\t/\text3\tnoatime\t0 0" > ${INSTALLPATH}/etc/fstab || die
+	else
+		echo -e "${ROOTHDD}\t/\text3\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() {
+install_umount_rootfs_flash()
+{
 	cd /
-	umount $INSTALLPATH/boot || die
-	umount $INSTALLPATH || die
-	swapoff $SWAPHDD || die
+	umount ${INSTALLPATH} || die
 }
 
-install_do_reboot() {
-
-	#only for now later it will be used again
-	#with 6.1-r2 these options are not available
-	#cd /
-	#umount $CDPATH
-	#eject
-	#clear
-	
+install_do_reboot()
+{
 	reboot
 }
 
@@ -608,55 +726,69 @@
 #	     Install Ablauf Scripte		#
 #################################################
 
-run_install_normal() {
-	#only for now later it will be used again
-	#with 6.1-r2 only one install method available
-	#dialog_setup_hdd_menu
-	dialog_setup_hdd_found_manuell
-	
+run_install_normal()
+{
+	dialog_hardware_detection
+
 	dialog_setup_hdd_partitions_manuell
 	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
-	
-	#only for now later it will be used again
-	#with 6.1-r2 variable kernels are not available
-	#dialog_install_kernel_image
-	#install_kernel_image
-	
+
 	dialog_install_bootsector
 	install_bootsector_chroot
-	
-	#only for now later it will be used again
-	#with 6.1-r2 highest version of alx-config is already included
-	#dialog_install_alxconfig
-	#sleep 1
-	#install_alxconfig
-	
+
 	dialog_install_settings
 	sleep 1
 	install_system_settings
-	install_hotfixes
+	install_initrd_chroot
 	install_umount_rootfs
 	dialog_install_successful
 }
 
-run_install_silent() {
-	echo "starting silent install ..."
+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_bootsector
+	install_bootsector_chroot
+
+	dialog_install_settings
 	sleep 1
+	install_system_settings_flash
+	install_initrd_chroot
+	install_umount_rootfs_flash
+	dialog_install_successful
 }
 
-run_install_unattended() {
-	echo "starting unattended install ..."
+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_bootsector
+	install_bootsector_chroot
+
+	dialog_install_settings
 	sleep 1
+	install_system_settings_flash
+	install_initrd_chroot
+	install_umount_rootfs_flash
+	dialog_install_successful
 }
 
-if [ "$1" == "unattended" ]
-then
-	run_install_unattended
-else
-	dialog_main
-fi
+dialog_main
 
 exit 0