From: Padraig O'Briain <padraig.obriain@sun.com>
Date: Fri, 15 Aug 2008 08:27:55 +0000 (+0000)
Subject: Add zfs to ignore_fs array in guess_system_internal: Fix for #542156.
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=4cafadc955d1c37118ca269ea22bbd37f8f2a2ce;p=dana%2Fcg-glib.git

Add zfs to ignore_fs array in guess_system_internal: Fix for #542156.

2008-08-15  Padraig O'Briain  <padraig.obriain@sun.com>

	* gunixmounts.c: Add zfs to ignore_fs array in guess_system_internal:
	Fix for #542156.


svn path=/trunk/; revision=7357
---

diff --git a/gio/ChangeLog b/gio/ChangeLog
index a18244da..89943ede 100644
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-15  Padraig O'Briain  <padraig.obriain@sun.com>
+
+	* gunixmounts.c: Add zfs to ignore_fs array in guess_system_internal:
+	Fix for #542156.
+
 2008-08-13  Tor Lillqvist  <tml@novell.com>
 
 	* win32/gwinhttpvfs.c
diff --git a/gio/gunixmounts.c b/gio/gunixmounts.c
index 9e4343c0..ab50b2e4 100644
--- a/gio/gunixmounts.c
+++ b/gio/gunixmounts.c
@@ -275,6 +275,7 @@ guess_system_internal (const char *mountpoint,
     "usbfs",
     "nfsd",
     "rpc_pipefs",
+    "zfs",
     NULL
   };
   const char *ignore_devices[] = {