diff --git a/step2/10-disk b/step2/10-disk
index 8bb7cc6..e5ad539 100644
--- a/step2/10-disk
+++ b/step2/10-disk
@@ -24,6 +24,7 @@ if test -d /sys/firmware/efi; then
 	q" | fdisk "${dodiskid}" > /dev/null
 	efipart="/dev/disk/by-id/${diskid}-part${index}"
 	index=$(( index + 1 ))
+	mkfs.vfat "${efipart}"
 else
 	echo "BIOS Partition"
 	echo "o
@@ -32,7 +33,6 @@ else
 fi
 sleep $sleep
 
-set -x
 
 if [[ "${cfg[fde_key_store]}" == "once" ]]; then
 echo "create bootpartition"
@@ -49,6 +49,8 @@ q" | fdisk "${dodiskid}" > /dev/null
 sleep $sleep
 fi
 
+set -x
+
 if [[ "${cfg[rootfssize]}" == "rest" ]]; then
 	target_partition_tmp="${dodiskid}-part${index}"
 	echo "create rootfs"
@@ -56,6 +58,7 @@ if [[ "${cfg[rootfssize]}" == "rest" ]]; then
 	echo "n
 
 
+
 	w
 	q" | fdisk "${dodiskid}" > /dev/null
 	else
@@ -65,7 +68,7 @@ if [[ "${cfg[rootfssize]}" == "rest" ]]; then
 	 
 	 
 	w
-	q" | fdisk "${dodiskid}"
+	q" | fdisk "${dodiskid}" > /dev/null
 	fi
 elif [[ ! "${cfg[rootfssize]}" == "rest" ]]; then
 	target_partition_tmp="${dodiskid}-part${index}"