change from debian, consider nfs4 mounts as G_UNIX_MOUNT_TYPE_NFS

2008-03-19  Sebastien Bacher  <seb128@ubuntu.com>

	* 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
This commit is contained in:
Sebastien Bacher 2008-03-19 14:09:57 +00:00 committed by Sebastien Bacher
parent 08d9f52d68
commit 029a6e2233
2 changed files with 7 additions and 1 deletions

View File

@ -1,3 +1,8 @@
2008-03-19 Sebastien Bacher <seb128@ubuntu.com>
* gunixmounts.c: (guess_mount_type): change from debian,
consider nfs4 mounts as G_UNIX_MOUNT_TYPE_NFS (#523338)
2008-03-19 Alexander Larsson <alexl@redhat.com> 2008-03-19 Alexander Larsson <alexl@redhat.com>
* gfile.c: * gfile.c:

View File

@ -1568,7 +1568,8 @@ guess_mount_type (const char *mount_path,
(strcmp (filesystem_type, "iso9660") == 0) || (strcmp (filesystem_type, "iso9660") == 0) ||
(strcmp (filesystem_type, "cd9660") == 0)) (strcmp (filesystem_type, "cd9660") == 0))
type = G_UNIX_MOUNT_TYPE_CDROM; 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; type = G_UNIX_MOUNT_TYPE_NFS;
else if (g_str_has_prefix (device_path, "/vol/dev/diskette/") || else if (g_str_has_prefix (device_path, "/vol/dev/diskette/") ||
g_str_has_prefix (device_path, "/dev/fd") || g_str_has_prefix (device_path, "/dev/fd") ||