Fixes for f2fs

lib/util-disk.sh

@@ -186,14 +186,14 @@ create_partitions() {
             "ext2" "mkfs.ext2 -q" \
             "ext3" "mkfs.ext3 -q" \
             "ext4" "mkfs.ext4 -q" \
-            "f2fs" "mkfs.f2fs -l" \
+            "f2fs" "mkfs.f2fs -q" \
             "jfs" "mkfs.jfs -q" \
             "nilfs2" "mkfs.nilfs2 -fq" \
             "ntfs" "mkfs.ntfs -q" \
             "reiserfs" "mkfs.reiserfs -q" \
             "vfat" "mkfs.vfat -F32" \
             "xfs" "mkfs.xfs -f" 2>${ANSWER}
-
+        cat ${ANSWER} > /tmp/.fs
         case $(cat ${ANSWER}) in
             "$_FSSkip") FILESYSTEM="$_FSSkip"
                 ;;
@@ -211,7 +211,7 @@ create_partitions() {
                 CHK_NUM=8
             fs_opts="data=journal data=writeback dealloc discard noacl noatime nobarrier nodelalloc"
                 ;;
-            "f2fs") FILESYSTEM="mkfs.f2fs -l"
+            "f2fs") FILESYSTEM="mkfs.f2fs -q"
                 fs_opts="data_flush disable_roll_forward disable_ext_identify discard fastboot flush_merge \
                 inline_xattr inline_data inline_dentry no_heap noacl nobarrier noextent_cache noinline_data norecovery"
                 CHK_NUM=16
@@ -287,9 +287,9 @@ mount_partitions() {
 
         # Use special mounting options if selected, else standard mount
         if [[ $(cat ${MOUNT_OPTS}) != "" ]]; then
-            mount -o $(cat ${MOUNT_OPTS}) ${PARTITION} ${MOUNTPOINT}${MOUNT} 2>$ERR
+            mount -t $(cat /tmp/.fs) -o $(cat ${MOUNT_OPTS}) ${PARTITION} ${MOUNTPOINT}${MOUNT} 2>$ERR
         else
-            mount ${PARTITION} ${MOUNTPOINT}${MOUNT} 2>$ERR
+            mount -t $(cat /tmp/.fs) ${PARTITION} ${MOUNTPOINT}${MOUNT} 2>$ERR
         fi
 
         check_for_error "$FUNCNAME" "$?"