luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-24 03:02:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cifs-is-not-a-system-fs' into 'master'

Browse Source 
gunixmounts: Stop considering cifs/nfs as system file systems

See merge request GNOME/glib!125

(cherry picked from commit 51132b1d49c184f49baafa81ce7fac02b1458643)

a3a6c516 gunixmounts: Stop considering cifs/nfs as system file systems
This commit is contained in:
Ondrej Holy 2018-06-29 07:07:24 +00:00
parent baeaca4f31
commit 86b5b440a8
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gio/gunixmounts.c
View File

@ -306,7 +306,6 @@ g_unix_is_system_fs_type (const char *fs_type)
"autofs", "autofs",
"autofs4", "autofs4",
"cgroup", "cgroup",
"cifs",
"configfs", "configfs",
"cxfs", "cxfs",
"debugfs", "debugfs",
@ -328,8 +327,6 @@ g_unix_is_system_fs_type (const char *fs_type)
"mfs", "mfs",
"mqueue", "mqueue",
"ncpfs", "ncpfs",
"nfs",
"nfs4",
"nfsd", "nfsd",
"nullfs", "nullfs",
"ocfs2", "ocfs2",
@ -342,7 +339,6 @@ g_unix_is_system_fs_type (const char *fs_type)
"rpc_pipefs", "rpc_pipefs",
"securityfs", "securityfs",
"selinuxfs", "selinuxfs",
"smbfs",
"sysfs", "sysfs",
"tmpfs", "tmpfs",
"usbfs", "usbfs",

6
gio/tests/unix-mounts.c
View File

@ -33,6 +33,12 @@ test_is_system_fs_type (void)
{ {
g_assert_true (g_unix_is_system_fs_type ("tmpfs")); g_assert_true (g_unix_is_system_fs_type ("tmpfs"));
g_assert_false (g_unix_is_system_fs_type ("ext4")); g_assert_false (g_unix_is_system_fs_type ("ext4"));
/* Check that some common network file systems aren’t considered ‘system’. */
g_assert_false (g_unix_is_system_fs_type ("cifs"));
g_assert_false (g_unix_is_system_fs_type ("nfs"));
g_assert_false (g_unix_is_system_fs_type ("nfs4"));
g_assert_false (g_unix_is_system_fs_type ("smbfs"));
} }
static void static void