ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

nsenter: revert changes committed by accident 

Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2017-11-10 14:02:51 +01:00
parent 4545ba6276
commit 82524a1379
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys-utils/nsenter.c
View File

@ -238,7 +238,6 @@ int main(int argc, char *argv[])
int do_fork = -1; /* unknown yet */
uid_t uid = 0;
gid_t gid = 0;
const char *rd_path = NULL, *wd_path = NULL;
#ifdef HAVE_LIBSELINUX
bool selinux = 0;
#endif
@ -319,13 +318,13 @@ int main(int argc, char *argv[])
break;
case 'r':
if (optarg)
rd_path = optarg;
open_target_fd(&root_fd, "root", optarg);
else
do_rd = true;
break;
case 'w':
if (optarg)
wd_path = optarg;
open_target_fd(&wd_fd, "cwd", optarg);
else
do_wd = true;
break;
@ -434,11 +433,6 @@ int main(int argc, char *argv[])
}
}
if (wd_path)
open_target_fd(&wd_fd, "cwd", wd_path);
if (rd_path)
open_target_fd(&root_fd, "root", rd_path);
/* Remember the current working directory if I'm not changing it */
if (root_fd >= 0 && wd_fd < 0) {
wd_fd = open(".", O_RDONLY);