summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoss Lagerwall <rosslagerwall@gmail.com>2015-06-10 18:37:16 +0100
committerMartin Pitt <martin.pitt@ubuntu.com>2015-06-30 08:25:10 +0200
commitaca6ac4826aea1777550838a8e87409a63520878 (patch)
treef0f927b013376fc20a0221aae346ea3c4dc73932
parent875ddfce1bc02ae8e81cbb05874d148132bec3b0 (diff)
downloadudisks-aca6ac4826aea1777550838a8e87409a63520878.tar.gz
Add support for creating f2fs filesystems
https://bugs.freedesktop.org/show_bug.cgi?id=63893
-rwxr-xr-xsrc/tests/integration-test7
-rw-r--r--src/udiskslinuxfsinfo.c8
2 files changed, 14 insertions, 1 deletions
diff --git a/src/tests/integration-test b/src/tests/integration-test
index d675cb4..6c137b6 100755
--- a/src/tests/integration-test
+++ b/src/tests/integration-test
@@ -281,6 +281,7 @@ class UDisksTestCase(unittest.TestCase):
'ntfs': 'mkntfs'}
label_opt = {'vfat': '-n',
'exfat': '-n',
+ 'f2fs': '-l',
'reiserfs': '-l'}
extra_opt = {'vfat': ['-I', '-F', '32'],
'swap': ['-f'],
@@ -643,6 +644,10 @@ class FS(UDisksTestCase):
'''fs: btrfs'''
self._do_fs_check('btrfs')
+ def test_f2fs(self):
+ '''fs: f2fs'''
+ self._do_fs_check('f2fs')
+
def test_minix(self):
'''fs: minix'''
self._do_fs_check('minix')
@@ -992,7 +997,7 @@ class FS(UDisksTestCase):
except GLib.GError as e:
if 'UDisks2.Error.NotSupported' in e.message:
# these fses are known to not support relabeling
- self.assertIn(type, ['minix', 'btrfs'])
+ self.assertIn(type, ['minix', 'btrfs', 'f2fs'])
supported = False
else:
raise
diff --git a/src/udiskslinuxfsinfo.c b/src/udiskslinuxfsinfo.c
index 0a12208..9a27b0f 100644
--- a/src/udiskslinuxfsinfo.c
+++ b/src/udiskslinuxfsinfo.c
@@ -123,6 +123,14 @@ const FSInfo _fs_info[] =
FALSE, /* supports_owners */
"mkudffs --vid $LABEL $DEVICE",
},
+ {
+ "f2fs",
+ NULL,
+ NULL,
+ FALSE, /* supports_online_label_rename */
+ TRUE, /* supports_owners */
+ "mkfs.f2fs -l $LABEL $DEVICE",
+ },
/* swap space */
{
"swap",