fix add ro mount for userattr-unmount unexpected timeout

mmmmmmmxl · mmmmmmmxl · commit fa4720fa16b0 · 2022-06-08T11:34:05.000+08:00
Signed-off-by: Xinlin Ma &lt;forblue.lin@gmail.com&gt;
diff --git a/snapshots/overlay/overlayutils/check.go b/snapshots/overlay/overlayutils/check.go
@@ -145,7 +145,7 @@ func NeedsUserXAttr(d string) (bool, error) {
 	}
 
 	opts := []string{
-		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")),
+		fmt.Sprintf("ro,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
`@@ -145,7 +145,7 @@ func NeedsUserXAttr(d string) (bool, error) {`
`145`	`145`	`}`
`146`	`146`
`147`	`147`	`opts := []string{`
`148`		`- 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")),`
	`148`	`+ fmt.Sprintf("ro,lowerdir=%s:%s,upperdir=%s,workdir=%s", filepath.Join(td, "lower2"), filepath.Join(td, "lower1"), filepath.Join(td, "upper"), filepath.Join(td, "work")),`
`149`	`149`	`"userxattr",`
`150`	`150`	`}`
`151`	`151`