opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-09-28 01:04:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

rootless: propagate errors from info

Browse Source 
we use "podman info" to reconfigure the runtime after a reboot, but we
don't propagate the error message back if something goes wrong.

Closes: https://github.com/containers/libpod/issues/2584

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano
2019-03-08 16:36:49 +01:00
parent 8a21e231e6
commit cc411dd98f
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libpod/runtime.go
View File

@ -971,9 +971,12 @@ func (r *Runtime) refreshRootless() error {
// Take advantage of a command that requires a new userns // Take advantage of a command that requires a new userns
// so that we are running as the root user and able to use refresh() // so that we are running as the root user and able to use refresh()
cmd := exec.Command(os.Args[0], "info") cmd := exec.Command(os.Args[0], "info")
err := cmd.Run()
if err != nil { if output, err := cmd.CombinedOutput(); err != nil {
return errors.Wrapf(err, "Error running %s info while refreshing state", os.Args[0]) if _, ok := err.(*exec.ExitError); !ok {
return errors.Wrapf(err, "Error waiting for info while refreshing state: %s", os.Args[0])
}
return errors.Wrapf(err, "Error running %s info while refreshing state: %s", os.Args[0], output)
} }
return nil return nil
} }

2
pkg/rootless/rootless_linux.c
View File

@ -277,6 +277,8 @@ reexec_in_user_namespace (int ready)
_exit (EXIT_FAILURE); _exit (EXIT_FAILURE);
} }
close (ready); close (ready);
if (b != '1')
_exit (EXIT_FAILURE);
if (syscall_setresgid (0, 0, 0) < 0) if (syscall_setresgid (0, 0, 0) < 0)
{ {

1
pkg/rootless/rootless_linux.go
View File

@ -229,6 +229,7 @@ func BecomeRootInUserNS() (bool, int, error) {
} }
defer r.Close() defer r.Close()
defer w.Close() defer w.Close()
defer w.Write([]byte("0"))
pidC := C.reexec_in_user_namespace(C.int(r.Fd())) pidC := C.reexec_in_user_namespace(C.int(r.Fd()))
pid := int(pidC) pid := int(pidC)