3 files changed, 5 insertions, 3 deletions
diff --git a/perl-install/fs/format.pm b/perl-install/fs/format.pm
index b75ed54a6..23f37502a 100644
--- a/perl-install/fs/format.pm
+++ b/perl-install/fs/format.pm
@@ -28,6 +28,7 @@ my %cmds = (
     ext2     => [ 'e2fsprogs', 'mkfs.ext2', '-F' ],
     ext3     => [ 'e2fsprogs', 'mkfs.ext3', '-F' ],
     ext4     => [ 'e2fsprogs', 'mkfs.ext4', '-F' ],
+    f2fs     => [ 'f2fs-tools', 'mkfs.f2fs', '-f' ],
     reiserfs => [ 'reiserfsprogs', 'mkfs.reiserfs', '-ff' ],
     xfs      => [ 'xfsprogs', 'mkfs.xfs', '-f', '-q' ],
     jfs      => [ 'jfsutils', 'mkfs.jfs', '-f' ],
@@ -52,6 +53,7 @@ my %LABELs = (
     ext2     => [ '-L', 16, 1 ],
     ext3     => [ '-L', 16, 1 ],
     ext4     => [ '-L', 16, 1 ],
+    f2fs     => [ '-l', 16, 1 ],
     reiserfs => [ '-l', 16, 1 ],
     xfs      => [ '-L', 12, 1 ],
     jfs      => [ '-L', 16, 1 ],
diff --git a/perl-install/fs/mount.pm b/perl-install/fs/mount.pm
index 85f6fcc07..6afaa9260 100644
--- a/perl-install/fs/mount.pm
+++ b/perl-install/fs/mount.pm
@@ -35,7 +35,7 @@ sub mount {
     $fs or log::l("not mounting $dev partition"), return;
 
     {
-	my @fs_modules = qw(btrfs ext3 ext4 hfs jfs nilfs2 nfs ntfs romfs reiserfs ufs xfs vfat);
+	my @fs_modules = qw(btrfs ext3 ext4 f2fs hfs jfs nilfs2 nfs ntfs romfs reiserfs ufs xfs vfat);
 	my @types = (qw(ext2 proc sysfs iso9660 devpts auto ntfs-3g), @fs_modules);
 
 	push @types, 'smb', 'cifs', 'davfs2' if !$::isInstall;
diff --git a/perl-install/fs/type.pm b/perl-install/fs/type.pm
index f4820e90b..b80340dfd 100644
--- a/perl-install/fs/type.pm
+++ b/perl-install/fs/type.pm
@@ -108,6 +108,7 @@ if_(arch() =~ /i.86|x86_64/,
   0x75 => '',         'PC/IX',
   0x80 => '',         'Old Minix',
   0x81 => '',         'Minix / old Linux',
+  0x83 => 'f2fs',     'Journalised FS: F2FS',
   0x83 => 'reiserfs', 'Journalised FS: ReiserFS',
   0x83 => 'nilfs2',   'Journalised FS: NILFS2',
   0x84 => '',         'OS/2 hidden C: drive',
@@ -300,8 +301,7 @@ sub type_subpart_from_magic {
 
 # helpers
 sub defaultFS() { 'ext4' }
-
-sub true_local_fs_types() { qw(btrfs ext3 ext2 ext4 reiserfs xfs jfs) }
+sub true_local_fs_types() { qw(btrfs ext3 ext2 ext4 f2fs reiserfs xfs jfs) }
 
 sub isEmpty { !$_[0]{fs_type} && !$_[0]{pt_type} }
 sub isBIOS_GRUB { $_[0]{pt_type} eq 'BIOS_GRUB' }