Merge pull request #2927 from giuseppe/fix-tty-rootless
Revert "rootless: set controlling terminal for podman in the userns"
This commit is contained in:
commit
eed8bbf3f9
|
|
@ -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));
|
||||
|
|
|
|||
Loading…
Reference in New Issue