From b3267861213527118af77c346631b7b9e99d2c98 Mon Sep 17 00:00:00 2001
From: Chen John L <john0312@gmail.com>
Date: Thu, 20 Nov 2014 16:28:37 +0800
Subject: [PATCH 1/4] Added more troubleshooting tips to the README.rst

---
 gdrivefs/resources/README.rst | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/gdrivefs/resources/README.rst b/gdrivefs/resources/README.rst
index 2f328e2..f0ef545 100644
--- a/gdrivefs/resources/README.rst
+++ b/gdrivefs/resources/README.rst
@@ -89,6 +89,16 @@ Troubleshooting
 
       $ sudo pip install --allow-unverified antlr-python-runtime --allow-external antlr-python-runtime gdrivefs
 
+- If you see an ImportError regarding "ez_setup", then you'll need to install
+  ez_setup with::
+
+      $ sudo pip install ez_setup
+
+- After installation, if you see an ImportError regarding "discovery", then try
+  the following command::
+
+      $ sudo pip install --upgrade google-api-python-client
+
 
 =====
 Usage

From d49e462db7cdd30db7ce0a293422e6f3816280a3 Mon Sep 17 00:00:00 2001
From: Dustin Oprea <myselfasunder@gmail.com>
Date: Fri, 23 Jan 2015 02:39:08 -0500
Subject: [PATCH 2/4] Added Gitter button

---
 gdrivefs/resources/README.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/gdrivefs/resources/README.rst b/gdrivefs/resources/README.rst
index 5dda5c6..161c3f8 100644
--- a/gdrivefs/resources/README.rst
+++ b/gdrivefs/resources/README.rst
@@ -1,3 +1,5 @@
+|gitter|
+
 |donate|
 
 GDriveFS is an innovative *FUSE* wrapper for *Google Drive* developed under 
@@ -491,3 +493,7 @@ software, make sure you add the prefixing dot.
 .. |donate| image:: https://pledgie.com/campaigns/27265.png?skin_name=chrome
    :alt: Click here to lend your support to: Fund GDriveFS, the Open Source Google Drive FUSE Adapter and make a donation at pledgie.com !
    :target: https://pledgie.com/campaigns/27265
+
+.. |gitter| image:: https://badges.gitter.im/gitterHQ/gitter.png
+   :alt: Gitter chat
+   :target: https://gitter.im/gitterHQ/gitter

From 150b937a1720310b2844130cc7eda5bdfe9b465e Mon Sep 17 00:00:00 2001
From: Dustin Oprea <myselfasunder@gmail.com>
Date: Fri, 23 Jan 2015 02:40:17 -0500
Subject: [PATCH 3/4] Update README.rst

---
 gdrivefs/resources/README.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gdrivefs/resources/README.rst b/gdrivefs/resources/README.rst
index 161c3f8..07be506 100644
--- a/gdrivefs/resources/README.rst
+++ b/gdrivefs/resources/README.rst
@@ -496,4 +496,4 @@ software, make sure you add the prefixing dot.
 
 .. |gitter| image:: https://badges.gitter.im/gitterHQ/gitter.png
    :alt: Gitter chat
-   :target: https://gitter.im/gitterHQ/gitter
+   :target: https://gitter.im/dsoprea/GDriveFS

From 9905102baec8a510b355e76c8b291adbc1d844c4 Mon Sep 17 00:00:00 2001
From: Petr Baloun <balounp@gmail.com>
Date: Sun, 1 Mar 2015 10:20:45 +0100
Subject: [PATCH 4/4] Don't pass _netdev option to fuse

---
 gdrivefs/gdfs/gdfuse.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gdrivefs/gdfs/gdfuse.py b/gdrivefs/gdfs/gdfuse.py
index 60be041..dc3f3ca 100644
--- a/gdrivefs/gdfs/gdfuse.py
+++ b/gdrivefs/gdfs/gdfuse.py
@@ -835,6 +835,9 @@ def mount(auth_storage_filepath, mountpoint, debug=None, nothreads=None,
                           in option_string.split(',') ]:
             k = opt_parts[0]
 
+            if k == "_netdev":
+                continue
+
             # We need to present a bool type for on/off flags. Since all we
             # have are strings, we'll convert anything with a 'True' or 'False'
             # to a bool, or anything with just a key to True.