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 a18244da4f6ff9b3e7f5d1fb4762a5887553c120..89943edec2c264100177d2669210a336c091e771 100644 (file)
--- 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 9e4343c076dd9d3a09d5f3f47ca15c018f558834..ab50b2e4c09a6da9b54434457457168d5c782c8c 100644 (file)
--- 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[] = {