From 1f5262d2c96f888c21bd113d43528cf3964f163d Mon Sep 17 00:00:00 2001 From: Ryan Lortie Date: Tue, 20 Sep 2011 10:07:35 -0400 Subject: [PATCH] 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 --- gio/gunixmounts.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gio/gunixmounts.c b/gio/gunixmounts.c index c0af1dc87..4200c6218 100644 --- a/gio/gunixmounts.c +++ b/gio/gunixmounts.c @@ -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);