--- alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh.in	2015/07/23 10:50:11	6825
+++ alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh.in	2015/07/23 11:26:26	6826
@@ -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 \
@@ -217,7 +229,7 @@
 	fi
 }
 
-dialog_setup_hdd_partitions_manuell()
+dialog_setup_hdd_partitions()
 {
 	local i
 
@@ -250,84 +262,7 @@
 		if [[ ${RES} -eq 0 ]]
 		then
 			dialog_setup_hdd_info
-			setup_hdd_partitions_manuell
-		fi
-	fi
-}
-
-dialog_setup_hdd_partitions_manuell_single()
-{
-	local i
-
-	if [[ -z ${ALL_DISKS} ]]
-	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 ${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 ]]
-		then
-			dialog_setup_hdd_info_single
-			setup_hdd_partitions_manuell_single
-		fi
-	fi
-}
-
-dialog_setup_hdd_partitions_auto()
-{
-	local i
-
-	if [[ -z ${ALL_DISKS} ]]
-	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 ${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 ]]
-		then
-			dialog_setup_hdd_info_auto
-			dialog_setup_hdd_create_partitions
-			setup_hdd_partitions_auto
+			setup_hdd_partitions
 		fi
 	fi
 }
@@ -538,36 +473,48 @@
 	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"
+			;;
 
-	# run this only if FDISKPARTITIONBELOW256MB is not already 1
-	if [[ ${FDISKPARTIONBELOW256MB} != 1 ]]
+		single|auto)
+			ROOTHDD="${HDD}1"
+			;;
+	esac
+
+	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
@@ -577,17 +524,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
@@ -597,27 +544,13 @@
 1
 w
 EOF
+		fi
+	else
+		## hdds partitionieren manuell
+		cfdisk ${HDD} || die
 	fi
 }
 
-setup_hdd_partitions_manuell()
-{
-	case "${INSTALL_METHOD}" in
-		normal)
-			BOOTHDD="${HDD}1"
-			SWAPHDD="${HDD}2"
-			ROOTHDD="${HDD}3"
-			;;
-
-		single|auto)
-			ROOTHDD="${HDD}1"
-			;;
-	esac
-
-	## hdds partitionieren manuell
-	cfdisk ${HDD} || die
-}
-
 setup_hdd_format()
 {
 	if [[ -n ${SWAPHDD} ]]
@@ -966,10 +899,7 @@
 
 	dialog_hardware_detection
 
-	case "${INSTALL_METHOD}" in
-		auto) dialog_setup_hdd_partitions_auto ;;
-		*) dialog_setup_hdd_partitions_manuell ;;
-	esac
+	dialog_setup_hdd_partitions
 	dialog_setup_hdd_format
 	setup_hdd_format > /dev/null
 	install_mount_rootfs