Fix ro mount option being passed

bpfoster · estesp · commit 47d73b2de65c · 2023-07-28T15:07:20.000-04:00
"ro" was not parsed out of the string, so it was passed as part of data to mount(). This would lead to mount() returning an invalid argument code. Separate out the "ro" option, much like "userxattr", which will allow the MS-RDONLY mountflag to get set. Signed-off-by: Ben Foster <bpfoster@gmail.com> (cherry picked from commit f3daf32)
diff --git a/snapshots/overlay/overlayutils/check.go b/snapshots/overlay/overlayutils/check.go
@@ -176,6 +176,7 @@ func NeedsUserXAttr(d string) (bool, error) {
 	}
 
 	opts := []string{
+		"ro",
 		fmt.Sprintf("lowerdir=%s:%s,upperdir=%s,workdir=%s", filepath.Join(td, "lower2"), filepath.Join(td, "lower1"), filepath.Join(td, "upper"), filepath.Join(td, "work")),
 		"userxattr",
 	}

Original file line number	Diff line number	Diff line change
`@@ -176,6 +176,7 @@ func NeedsUserXAttr(d string) (bool, error) {`
`176`	`176`	`}`
`177`	`177`
`178`	`178`	`opts := []string{`
	`179`	`+ "ro",`
`179`	`180`	`fmt.Sprintf("lowerdir=%s:%s,upperdir=%s,workdir=%s", filepath.Join(td, "lower2"), filepath.Join(td, "lower1"), filepath.Join(td, "upper"), filepath.Join(td, "work")),`
`180`	`181`	`"userxattr",`
`181`	`182`	`}`