From 104c5fd02fa0d39b87e891d0783c06cb87bec170 Mon Sep 17 00:00:00 2001 From: Aaron Jacobs Date: Tue, 31 May 2016 03:57:28 +0000 Subject: [PATCH] mount_gcsfuse: don't choke on a _netdev option. For #172. --- tools/integration_tests/mount_helper_test.go | 2 +- tools/mount_gcsfuse/main.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/integration_tests/mount_helper_test.go b/tools/integration_tests/mount_helper_test.go index 0972be2326..47414c0970 100644 --- a/tools/integration_tests/mount_helper_test.go +++ b/tools/integration_tests/mount_helper_test.go @@ -197,7 +197,7 @@ func (t *MountHelperTest) ExtraneousOptions() { // Mount with extra junk that shouldn't be passed on. args := []string{ - "-o", "noauto,nouser,auto,user", + "-o", "noauto,nouser,no_netdev,auto,user,_netdev", canned.FakeBucketName, t.dir, } diff --git a/tools/mount_gcsfuse/main.go b/tools/mount_gcsfuse/main.go index 739588c98b..7feef04010 100644 --- a/tools/mount_gcsfuse/main.go +++ b/tools/mount_gcsfuse/main.go @@ -77,7 +77,7 @@ func makeGcsfuseArgs( switch name { // Don't pass through options that are relevant to mount(8) but not to // gcsfuse, and that fusermount chokes on with "Invalid argument" on Linux. - case "user", "nouser", "auto", "noauto": + case "user", "nouser", "auto", "noauto", "_netdev", "no_netdev": // Special case: support mount-like formatting for gcsfuse bool flags. case "implicit_dirs":