diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-02-23 11:49:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-23 11:49:07 +0100 |
| commit | 0969d725a3b302d9baa0616a204f7fc824404973 (patch) | |
| tree | cf18caca541ae0b7b532b1768de0276326035e13 /test/utils/utils.go | |
| parent | b223d4e1367463a32eeeb31a4b9d8a351641d83c (diff) | |
| parent | 7e920e486512d350faa43306d2cda12fdad887e1 (diff) | |
| download | podman-0969d725a3b302d9baa0616a204f7fc824404973.tar.gz podman-0969d725a3b302d9baa0616a204f7fc824404973.tar.bz2 podman-0969d725a3b302d9baa0616a204f7fc824404973.zip | |
Merge pull request #2393 from giuseppe/reexec-into-same-wd
rootless: force same cwd when re-execing
Diffstat (limited to 'test/utils/utils.go')
| -rw-r--r-- | test/utils/utils.go | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/test/utils/utils.go b/test/utils/utils.go index aace018cd..098779321 100644 --- a/test/utils/utils.go +++ b/test/utils/utils.go @@ -61,7 +61,7 @@ func (p *PodmanTest) MakeOptions(args []string) []string { // PodmanAsUserBase exec podman as user. uid and gid is set for credentials useage. env is used // to record the env for debugging -func (p *PodmanTest) PodmanAsUserBase(args []string, uid, gid uint32, env []string) *PodmanSession { +func (p *PodmanTest) PodmanAsUserBase(args []string, uid, gid uint32, cwd string, env []string) *PodmanSession { var command *exec.Cmd podmanOptions := p.MakeOptions(args) podmanBinary := p.PodmanBinary @@ -74,14 +74,18 @@ func (p *PodmanTest) PodmanAsUserBase(args []string, uid, gid uint32, env []stri fmt.Printf("Running: (env: %v) %s %s\n", env, podmanBinary, strings.Join(podmanOptions, " ")) } if uid != 0 || gid != 0 { - nsEnterOpts := append([]string{"--userspec", fmt.Sprintf("%d:%d", uid, gid), "/", podmanBinary}, podmanOptions...) - command = exec.Command("chroot", nsEnterOpts...) + pythonCmd := fmt.Sprintf("import os; import sys; uid = %d; gid = %d; cwd = '%s'; os.setgid(gid); os.setuid(uid); os.chdir(cwd) if len(cwd)>0 else True; os.execv(sys.argv[1], sys.argv[1:])", gid, uid, cwd) + nsEnterOpts := append([]string{"-c", pythonCmd, podmanBinary}, podmanOptions...) + command = exec.Command("python", nsEnterOpts...) } else { command = exec.Command(podmanBinary, podmanOptions...) } if env != nil { command.Env = env } + if cwd != "" { + command.Dir = cwd + } session, err := gexec.Start(command, GinkgoWriter, GinkgoWriter) if err != nil { @@ -92,7 +96,7 @@ func (p *PodmanTest) PodmanAsUserBase(args []string, uid, gid uint32, env []stri // PodmanBase exec podman with default env. func (p *PodmanTest) PodmanBase(args []string) *PodmanSession { - return p.PodmanAsUserBase(args, 0, 0, nil) + return p.PodmanAsUserBase(args, 0, 0, "", nil) } // WaitForContainer waits on a started container |