From a3a6c516c4cd894a87590720fa4efe78f53a769e Mon Sep 17 00:00:00 2001
From: Philip Withnall <withnall@endlessm.com>
Date: Wed, 20 Jun 2018 12:16:34 +0100
Subject: [PATCH] gunixmounts: Stop considering cifs/nfs as system file systems
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

They’re network file systems, but not system file systems (in the sense
that procfs is a system file system). This fixes them disappearing from
the sidebar in the UI.

Signed-off-by: Philip Withnall <withnall@endlessm.com>

https://gitlab.gnome.org/GNOME/glib/issues/1424
---
 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 f2db27e66..355329c19 100644
--- a/gio/gunixmounts.c
+++ b/gio/gunixmounts.c
@@ -307,7 +307,6 @@ g_unix_is_system_fs_type (const char *fs_type)
     "autofs",
     "autofs4",
     "cgroup",
-    "cifs",
     "configfs",
     "cxfs",
     "debugfs",
@@ -329,8 +328,6 @@ g_unix_is_system_fs_type (const char *fs_type)
     "mfs",
     "mqueue",
     "ncpfs",
-    "nfs",
-    "nfs4",
     "nfsd",
     "nullfs",
     "ocfs2",
@@ -343,7 +340,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