gunixmounts: exempt entries with "none" mountpoint

We ignore entries with mountpoint of "swap" and "ignore".  Add "none" to
that list, since Debian uses it.

Probably we should move to using our already-existing internal list of
things to ignore, but this patch is more minimally intrusive for now.

https://bugzilla.gnome.org/show_bug.cgi?id=654563
This commit is contained in:
Ryan Lortie 2011-09-20 10:07:35 -04:00
parent 6b39085016
commit 1f5262d2c9

View File

@ -763,7 +763,8 @@ _g_get_unix_mount_points (void)
#endif
{
if ((strcmp (mntent->mnt_dir, "ignore") == 0) ||
(strcmp (mntent->mnt_dir, "swap") == 0))
(strcmp (mntent->mnt_dir, "swap") == 0) ||
(strcmp (mntent->mnt_dir, "none") == 0))
continue;
mount_entry = g_new0 (GUnixMountPoint, 1);
@ -829,7 +830,8 @@ _g_get_unix_mount_points (void)
while (! getmntent (file, &mntent))
{
if ((strcmp (mntent.mnt_mountp, "ignore") == 0) ||
(strcmp (mntent.mnt_mountp, "swap") == 0))
(strcmp (mntent.mnt_mountp, "swap") == 0) ||
(strcmp (mntent.mnt_mountp, "none") == 0))
continue;
mount_entry = g_new0 (GUnixMountPoint, 1);