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

unshare: use '-T' for time namespace instead of '-t' 

While working on getting time namespace support into 'nsenter' it was
not possible to use '-t' to enter a time namespace as '-t' is the short
option for '--target'. Fortunately '-T' is still available in 'nsenter'
and 'unshare' and therefore let's change 'unshare' to use the same flag
for the time namespace as 'nsenter'.

Signed-off-by: Adrian Reber <areber@redhat.com>
This commit is contained in:
Adrian Reber 2020-03-09 12:20:51 +00:00
parent 40c28f51c9
commit f218fd9784
No known key found for this signature in database
GPG Key ID: 82C9378ED3C4906A
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys-utils/unshare.1
View File

@ -141,7 +141,7 @@ namespace is created by a bind mount.
Unshare the cgroup namespace. If \fIfile\fP is specified then persistent namespace is created Unshare the cgroup namespace. If \fIfile\fP is specified then persistent namespace is created
by bind mount. by bind mount.
.TP .TP
.BR \-t , " \-\-time"[=\fIfile\fP] .BR \-T , " \-\-time"[=\fIfile\fP]
Unshare the time namespace. If \fIfile\fP is specified then a persistent Unshare the time namespace. If \fIfile\fP is specified then a persistent
namespace is created by a bind mount. The \fB\-\-monotonic\fP and namespace is created by a bind mount. The \fB\-\-monotonic\fP and
\fB\-\-boottime\fP options can be used to specify the corresponding \fB\-\-boottime\fP options can be used to specify the corresponding

8
sys-utils/unshare.c
View File

@ -285,7 +285,7 @@ static void __attribute__((__noreturn__)) usage(void)
fputs(_(" -p, --pid[=<file>] unshare pid namespace\n"), out); fputs(_(" -p, --pid[=<file>] unshare pid namespace\n"), out);
fputs(_(" -U, --user[=<file>] unshare user namespace\n"), out); fputs(_(" -U, --user[=<file>] unshare user namespace\n"), out);
fputs(_(" -C, --cgroup[=<file>] unshare cgroup namespace\n"), out); fputs(_(" -C, --cgroup[=<file>] unshare cgroup namespace\n"), out);
fputs(_(" -t, --time[=<file>] unshare time namespace\n"), out); fputs(_(" -T, --time[=<file>] unshare time namespace\n"), out);
fputs(USAGE_SEPARATOR, out); fputs(USAGE_SEPARATOR, out);
fputs(_(" -f, --fork fork before launching <program>\n"), out); fputs(_(" -f, --fork fork before launching <program>\n"), out);
fputs(_(" -r, --map-root-user map current user to root (implies --user)\n"), out); fputs(_(" -r, --map-root-user map current user to root (implies --user)\n"), out);
@ -335,7 +335,7 @@ int main(int argc, char *argv[])
{ "pid", optional_argument, NULL, 'p' }, { "pid", optional_argument, NULL, 'p' },
{ "user", optional_argument, NULL, 'U' }, { "user", optional_argument, NULL, 'U' },
{ "cgroup", optional_argument, NULL, 'C' }, { "cgroup", optional_argument, NULL, 'C' },
{ "time", optional_argument, NULL, 't' }, { "time", optional_argument, NULL, 'T' },
{ "fork", no_argument, NULL, 'f' }, { "fork", no_argument, NULL, 'f' },
{ "kill-child", optional_argument, NULL, OPT_KILLCHILD }, { "kill-child", optional_argument, NULL, OPT_KILLCHILD },
@ -379,7 +379,7 @@ int main(int argc, char *argv[])
textdomain(PACKAGE); textdomain(PACKAGE);
close_stdout_atexit(); close_stdout_atexit();
while ((c = getopt_long(argc, argv, "+fhVmuinpCtUrR:w:S:G:c", longopts, NULL)) != -1) { while ((c = getopt_long(argc, argv, "+fhVmuinpCTUrR:w:S:G:c", longopts, NULL)) != -1) {
switch (c) { switch (c) {
case 'f': case 'f':
forkit = 1; forkit = 1;
@ -419,7 +419,7 @@ int main(int argc, char *argv[])
if (optarg) if (optarg)
set_ns_target(CLONE_NEWCGROUP, optarg); set_ns_target(CLONE_NEWCGROUP, optarg);
break; break;
case 't': case 'T':
unshare_flags |= CLONE_NEWTIME; unshare_flags |= CLONE_NEWTIME;
if (optarg) if (optarg)
set_ns_target(CLONE_NEWTIME, optarg); set_ns_target(CLONE_NEWTIME, optarg);