--- trunk/installer-simple/bin/installer.sh.in	2015/07/31 10:09:08	2885
+++ trunk/installer-simple/bin/installer.sh.in	2015/07/31 10:43:21	2886
@@ -222,19 +222,6 @@
 
 setup_hdd_partitions()
 {
-	case "${INSTALL_METHOD}" in
-		auto)
-			BOOTHDD=""
-			SWAPHDD=""
-			ROOTHDD="${HDD}1"
-			;;
-		normal)
-			BOOTHDD="${HDD}1"
-			SWAPHDD="${HDD}2"
-			ROOTHDD="${HDD}3"
-			;;
-	esac
-
 	# sanity check - should not happen
 	if is_mounted --device "${ROOTHDD}"
 	then
@@ -542,16 +529,25 @@
 
 	case "${method}" in
 		auto)
+			export BOOTHDD=""
+			export SWAPHDD=""
+			export ROOTHDD="${HDD}1"
 			export FORMAT_FILESYSTEM_BOOTHDD=""
 			export FORMAT_FILESYSTEM_ROOTHDD="${FORMAT_FILESYSTEM}"
 			export INSTALL_METHOD="${method}"
 			;;
 		normal)
+			export BOOTHDD="${HDD}1"
+			export SWAPHDD="${HDD}2"
+			export ROOTHDD="${HDD}3"
 			export FORMAT_FILESYSTEM_BOOTHDD="${FORMAT_FILESYSTEM}"
 			export FORMAT_FILESYSTEM_ROOTHDD="${FORMAT_FILESYSTEM}"
 			export INSTALL_METHOD="${method}"
 			;;
 		single)
+			export BOOTHDD=""
+			export SWAPHDD=""
+			export ROOTHDD="${HDD}1"
 			export FORMAT_FILESYSTEM_BOOTHDD=""
 			export FORMAT_FILESYSTEM_ROOTHDD="${FORMAT_FILESYSTEM}"
 			export INSTALL_METHOD="${method}"