[glib/wip/test-this-patch] gunixmounts: exempt entries with "none" mountpoint



commit 4f862fb5130e9673bce0e7bb10bcf888cfe6f626
Author: Ryan Lortie <desrt desrt ca>
Date:   Tue Sep 20 10:07:35 2011 -0400

    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.

 gio/gunixmounts.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/gio/gunixmounts.c b/gio/gunixmounts.c
index 931bbb9..425d5a8 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);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]