diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2019-04-14 07:48:30 +0200 |
|---|---|---|
| committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2019-04-14 07:48:37 +0200 |
| commit | 9e79530f8f1d2937e67fba27a33da3d368a5cf4e (patch) | |
| tree | 59fd1bdae88c04bc9c92f56eeffd8f0fa68722f8 /pkg/rootless | |
| parent | b9260053e94f2b4a00dbe7eba67fd195018bf94a (diff) | |
| download | podman-9e79530f8f1d2937e67fba27a33da3d368a5cf4e.tar.gz podman-9e79530f8f1d2937e67fba27a33da3d368a5cf4e.tar.bz2 podman-9e79530f8f1d2937e67fba27a33da3d368a5cf4e.zip | |
Revert "rootless: set controlling terminal for podman in the userns"
This reverts commit 531514e8231e7f42efb7e7992d62e516f9577363.
Closes: https://github.com/containers/libpod/issues/2926
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Diffstat (limited to 'pkg/rootless')
| -rw-r--r-- | pkg/rootless/rootless_linux.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/pkg/rootless/rootless_linux.c b/pkg/rootless/rootless_linux.c index d6a2793a7..9cb79ed4d 100644 --- a/pkg/rootless/rootless_linux.c +++ b/pkg/rootless/rootless_linux.c @@ -16,8 +16,6 @@ #include <sys/types.h> #include <sys/prctl.h> #include <dirent.h> -#include <termios.h> -#include <sys/ioctl.h> static const char *_max_user_namespaces = "/proc/sys/user/max_user_namespaces"; static const char *_unprivileged_user_namespaces = "/proc/sys/kernel/unprivileged_userns_clone"; @@ -180,11 +178,6 @@ reexec_userns_join (int userns, int mountns) _exit (EXIT_FAILURE); } - if (isatty (1) && ioctl (1, TIOCSCTTY, 0) == -1) { - fprintf (stderr, "cannot ioctl(TIOCSCTTY): %s\n", strerror (errno)); - _exit (EXIT_FAILURE); - } - if (setns (userns, 0) < 0) { fprintf (stderr, "cannot setns: %s\n", strerror (errno)); |