--- alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh.in	2015/07/23 13:03:19	6840
+++ alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh.in	2015/07/23 13:20:43	6841
@@ -44,6 +44,8 @@
 GRUB2GFXPAYLOAD=""
 FORMFACTOR=""
 FORMAT_FILESYSTEM=""
+FORMAT_FILESYSTEM_BOOTHDD=""
+FORMAT_FILESYSTEM_ROOTHDD=""
 FDISKPARTIONBELOW256MB=0
 SPECIALDEVICE=""
 FLASHDISK=0
@@ -594,17 +596,11 @@
 	fi
 	if [[ -n ${BOOTHDD} ]]
 	then
-		# f2fs is not grub/grub2 compatible
-		if [[ ${FORMAT_FILESYSTEM} = f2fs ]]
-		then
-			mkfs.ext2 -q ${BOOTHDD} || die
-		else
-			mkfs.${FORMAT_FILESYSTEM} -q ${BOOTHDD} || die
-		fi
+		mkfs.${FORMAT_FILESYSTEM_BOOTHDD} -q ${BOOTHDD} || die
 	fi
 	if [[ -n ${ROOTHDD} ]]
 	then
-		mkfs.${FORMAT_FILESYSTEM} -q ${ROOTHDD} || die
+		mkfs.${FORMAT_FILESYSTEM_ROOTHDD} -q ${ROOTHDD} || die
 	fi
 }
 
@@ -618,15 +614,12 @@
 	fi
 	if [[ -n ${ROOTHDD} ]]
 	then
-		# be safe here, append file system type to mount
-		# just in case the f2fs module was not autoloaded
-		[[ ${FORMAT_FILESYSTEM} = f2fs ]] && opts="-t fs2fs"
-		mount ${opts} ${ROOTHDD} ${INSTALL_ROOT} || die
+		mount -t ${FORMAT_FILESYSTEM_ROOTHDD} ${ROOTHDD} ${INSTALL_ROOT} || die
 	fi
 	if [[ -n ${BOOTHDD} ]]
 	then
 		install -d ${INSTALL_ROOT}/boot || die
-		mount ${BOOTHDD} ${INSTALL_ROOT}/boot || die
+		mount -t ${FORMAT_FILESYSTEM_BOOTHDD} ${BOOTHDD} ${INSTALL_ROOT}/boot || die
 	fi
 
 	cd ${INSTALL_ROOT} || die
@@ -761,7 +754,7 @@
 	# only generate initrds if the cmd exists
 	is_initrd_supported || return 0
 
-	FSMODS="${FORMAT_FILESYSTEM}"
+	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"
@@ -778,11 +771,6 @@
 		*) FBMODS="uvesafb" ;;
 	esac
 
-	# add a filesystems recoqnized by the bootloader if the current ${FORMAT_FILESYSTEM} is not supported
-	case "${FORMAT_FILESYSTEM}" in
-		f2fs) FSMODS+=" ext2" ;;
-	esac
-
 	if [[ ${FORMFACTOR} = laptop ]]
 	then
 		OTHERMODS="acpi-cpufreq cpufreq_ondemand cpufreq_conservative cpufreq_powersave"
@@ -875,18 +863,11 @@
 
 	if [[ -n ${BOOTHDD} ]]
 	then
-		if [[ ${FORMAT_FILESYSTEM} = f2fs ]]
-		then
-			# grub/grub2 does not support boot from f2fs, use ext2 instead
-			fstype="ext2"
-		else
-			fstype="${FORMAT_FILESYSTEM}"
-		fi
 		if is_uuid_supported
 		then
-			addconfig -e "UUID=$(get_uuid ${BOOTHDD})\t/boot\t${fstype}\tnoatime,noauto\t1 1"
+			addconfig -e "UUID=$(get_uuid ${BOOTHDD})\t/boot\t${FORMAT_FILESYSTEM_BOOTHDD}\tnoatime,noauto\t1 1"
 		else
-			addconfig -e "${BOOTHDD}\t/boot\t${fstype}\tnoatime,noauto\t1 1"
+			addconfig -e "${BOOTHDD}\t/boot\t${FORMAT_FILESYSTEM_BOOTHDD}\tnoatime,noauto\t1 1"
 		fi
 	fi
 
@@ -894,9 +875,9 @@
 	then
 		if is_uuid_supported
 		then
-			addconfig -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0"
+			addconfig -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM_ROOTHDD}\tnoatime\t0 0"
 		else
-			addconfig -e "${ROOTHDD}\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0"
+			addconfig -e "${ROOTHDD}\t/\t${FORMAT_FILESYSTEM_ROOTHDD}\tnoatime\t0 0"
 		fi
 	fi
 
@@ -962,16 +943,24 @@
 
 	case "${method}" in
 		auto)
+			export FORMAT_FILESYSTEM_BOOTHDD=""
+			export FORMAT_FILESYSTEM_ROOTHDD="${FORMAT_FILESYSTEM}"
 			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}"
 			;;
 		*)