From 029a6e2233658de00768e9d149ae7b8e16ab1241 Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Wed, 19 Mar 2008 14:09:57 +0000 Subject: [PATCH] change from debian, consider nfs4 mounts as G_UNIX_MOUNT_TYPE_NFS 2008-03-19 Sebastien Bacher * gunixmounts.c: (guess_mount_type): change from debian, consider nfs4 mounts as G_UNIX_MOUNT_TYPE_NFS (#523338) svn path=/branches/glib-2-16/; revision=6738 --- gio/ChangeLog | 5 +++++ gio/gunixmounts.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/gio/ChangeLog b/gio/ChangeLog index 856cfc4b6..880e252ce 100644 --- a/gio/ChangeLog +++ b/gio/ChangeLog @@ -1,3 +1,8 @@ +2008-03-19 Sebastien Bacher + + * gunixmounts.c: (guess_mount_type): change from debian, + consider nfs4 mounts as G_UNIX_MOUNT_TYPE_NFS (#523338) + 2008-03-19 Alexander Larsson * gfile.c: diff --git a/gio/gunixmounts.c b/gio/gunixmounts.c index 486a21b3d..cb8dc26c9 100644 --- a/gio/gunixmounts.c +++ b/gio/gunixmounts.c @@ -1568,7 +1568,8 @@ guess_mount_type (const char *mount_path, (strcmp (filesystem_type, "iso9660") == 0) || (strcmp (filesystem_type, "cd9660") == 0)) type = G_UNIX_MOUNT_TYPE_CDROM; - else if (strcmp (filesystem_type, "nfs") == 0) + else if ((strcmp (filesystem_type, "nfs") == 0) || + (strcmp (filesystem_type, "nfs4") == 0)) type = G_UNIX_MOUNT_TYPE_NFS; else if (g_str_has_prefix (device_path, "/vol/dev/diskette/") || g_str_has_prefix (device_path, "/dev/fd") ||