containers
/
automation-tests
mirror of https://github.com/containers/automation-tests.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2927 from giuseppe/fix-tty-rootless 

Revert "rootless: set controlling terminal for podman in the userns"
This commit is contained in:
OpenShift Merge Robot 2019-04-14 06:21:41 -07:00 committed by GitHub
parent f929b9e4d5 9e79530f8f
commit eed8bbf3f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/rootless/rootless_linux.c
View File

@ -16,8 +16,6 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/prctl.h> #include <sys/prctl.h>
#include <dirent.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 *_max_user_namespaces = "/proc/sys/user/max_user_namespaces";
static const char *_unprivileged_user_namespaces = "/proc/sys/kernel/unprivileged_userns_clone"; 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); _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) if (setns (userns, 0) < 0)
{ {
fprintf (stderr, "cannot setns: %s\n", strerror (errno)); fprintf (stderr, "cannot setns: %s\n", strerror (errno));