[glib/glib-2-56] Merge branch 'cifs-is-not-a-system-fs' into 'master'

[Ondrej Holy <oholy src gnome org>]

commit 86b5b440a8a7729dbff84d530f69a6b9e9293ceb
Author: Ondrej Holy <oholy redhat com>
Date:   Fri Jun 29 07:07:24 2018 +0000

    Merge branch 'cifs-is-not-a-system-fs' into 'master'
    
    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

 gio/gunixmounts.c       | 4 ----
 gio/tests/unix-mounts.c | 6 ++++++
 2 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/gio/gunixmounts.c b/gio/gunixmounts.c
index 0035d57e7..4d19217ca 100644
--- a/gio/gunixmounts.c
+++ b/gio/gunixmounts.c
@@ -306,7 +306,6 @@ g_unix_is_system_fs_type (const char *fs_type)
     "autofs",
     "autofs4",
     "cgroup",
-    "cifs",
     "configfs",
     "cxfs",
     "debugfs",
@@ -328,8 +327,6 @@ g_unix_is_system_fs_type (const char *fs_type)
     "mfs",
     "mqueue",
     "ncpfs",
-    "nfs",
-    "nfs4",
     "nfsd",
     "nullfs",
     "ocfs2",
@@ -342,7 +339,6 @@ g_unix_is_system_fs_type (const char *fs_type)
     "rpc_pipefs",
     "securityfs",
     "selinuxfs",
-    "smbfs",
     "sysfs",
     "tmpfs",
     "usbfs",
diff --git a/gio/tests/unix-mounts.c b/gio/tests/unix-mounts.c
index 3d54047dc..67b8c8d98 100644
--- a/gio/tests/unix-mounts.c
+++ b/gio/tests/unix-mounts.c
@@ -33,6 +33,12 @@ test_is_system_fs_type (void)
 {
   g_assert_true (g_unix_is_system_fs_type ("tmpfs"));
   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