Skip to content

Commit

Permalink
mount_gcsfuse: don't choke on a _netdev option.
Browse files Browse the repository at this point in the history
For #172.
  • Loading branch information
jacobsa committed May 31, 2016
1 parent c289964 commit 104c5fd
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion tools/integration_tests/mount_helper_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}
Expand Down
2 changes: 1 addition & 1 deletion tools/mount_gcsfuse/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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":
Expand Down

0 comments on commit 104c5fd

Please sign in to comment.