ctr: parse mount options with embedded = character

samuelkarp · samuelkarp · commit 535d9cc59fe7 · 2021-05-25T00:21:37.000-07:00
FreeBSD mount options may have embedded = characters.  For example,
devfs(5) supports the `ruleset` option which can be passed as
`ruleset=4` to indicate that ruleset 4 should be used.

Signed-off-by: Samuel Karp &lt;me@samuelkarp.com&gt;
diff --git a/cmd/ctr/commands/run/run.go b/cmd/ctr/commands/run/run.go
@@ -63,8 +63,8 @@ func parseMountFlag(m string) (specs.Mount, error) {
 	}
 
 	for _, field := range fields {
-		v := strings.Split(field, "=")
-		if len(v) != 2 {
+		v := strings.SplitN(field, "=", 2)
+		if len(v) < 2 {
 			return mount, fmt.Errorf("invalid mount specification: expected key=val")
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -63,8 +63,8 @@ func parseMountFlag(m string) (specs.Mount, error) {`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`for _, field := range fields {`
`66`		`- v := strings.Split(field, "=")`
`67`		`- if len(v) != 2 {`
	`66`	`+ v := strings.SplitN(field, "=", 2)`
	`67`	`+ if len(v) < 2 {`
`68`	`68`	`return mount, fmt.Errorf("invalid mount specification: expected key=val")`
`69`	`69`	`}`
`70`	`70`