Merge pull request containerd#3385 from apostasie/dev-nsenter

AkihiroSuda · web-flow · commit 286b02441822 · 2024-09-01T14:17:09.000+09:00
Fix nsenter working dir for child
diff --git a/pkg/rootlessutil/parent_linux.go b/pkg/rootlessutil/parent_linux.go
@@ -102,6 +102,7 @@ func ParentMain(hostGatewayIP string) error {
 		log.L.WithError(err).Warn("unable to determine working directory")
 	} else {
 		args = append(args, "-w"+wd)
+		os.Setenv("PWD", wd)
 	}
 
 	args = append(args, "--preserve-credentials",

Original file line number	Diff line number	Diff line change
`@@ -102,6 +102,7 @@ func ParentMain(hostGatewayIP string) error {`
`102`	`102`	`log.L.WithError(err).Warn("unable to determine working directory")`
`103`	`103`	`} else {`
`104`	`104`	`args = append(args, "-w"+wd)`
	`105`	`+ os.Setenv("PWD", wd)`
`105`	`106`	`}`
`106`	`107`
`107`	`108`	`args = append(args, "--preserve-credentials",`