From a36fef8a66cfdd25277aa1f1c7798a997e09fe67 Mon Sep 17 00:00:00 2001 From: Hugal31 Date: Thu, 12 May 2022 21:27:13 +0200 Subject: [PATCH] rclone.mount: ignore _netdev mount argument - FIxes #5808 Do not trigger an error upon parsing argument starting with underscores. _netdev was already ignored after parsing. --- fs/mount_helper.go | 2 +- fs/mount_helper_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/mount_helper.go b/fs/mount_helper.go index 884b1f67c..f45b85895 100644 --- a/fs/mount_helper.go +++ b/fs/mount_helper.go @@ -208,7 +208,7 @@ func parseHelperOptionString(optString string) (opts []string, err error) { if len(param) == 0 { return nil, errHelperEmptyOption } - if param[0] == '-' || param[0] == '_' { + if param[0] == '-' { return nil, errHelperOptionName } prev = i + 1 diff --git a/fs/mount_helper_test.go b/fs/mount_helper_test.go index 00c4fba79..3235b1195 100644 --- a/fs/mount_helper_test.go +++ b/fs/mount_helper_test.go @@ -20,7 +20,7 @@ func TestMountHelperArgs(t *testing.T) { src: []string{}, dst: []string{"mount", "--daemon"}, }, { - src: []string{"-o", `x-systemd.automount,vvv,env.HTTPS_PROXY="a b;c,d?EF",ro,rw,args2env`}, + src: []string{"-o", `x-systemd.automount,vvv,env.HTTPS_PROXY="a b;c,d?EF",ro,rw,args2env,_netdev`}, dst: []string{"mount", "--read-only", "--verbose=3", "--daemon"}, env: "HTTPS_PROXY=a b;c,d?EF", }}