aboutsummaryrefslogtreecommitdiff
path: root/toys/other
diff options
context:
space:
mode:
authorAndy Lutomirski <luto@amacapital.net>2014-10-17 18:40:03 -0700
committerAndy Lutomirski <luto@amacapital.net>2014-10-17 18:40:03 -0700
commitc0854f0955ae35dfc98e762f559e59258142c8b0 (patch)
tree71c15cfc63342291d9ebb08571357864afc6041b /toys/other
parent5fcc71581abdf8839d10786d7ac437cc5b0bf4c5 (diff)
downloadtoybox-c0854f0955ae35dfc98e762f559e59258142c8b0.tar.gz
unshare: Fix help and option parsing
The help text was inconsistent, and option parsing was completely broken (the options mostly did the wrong thing).
Diffstat (limited to 'toys/other')
-rw-r--r--toys/other/unshare.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/toys/other/unshare.c b/toys/other/unshare.c
index d9a8d3fb..68c1ebdd 100644
--- a/toys/other/unshare.c
+++ b/toys/other/unshare.c
@@ -2,14 +2,14 @@
*
* Copyright 2011 Rob Landley <rob@landley.net>
-USE_UNSHARE(NEWTOY(unshare, "<1^niumpU", TOYFLAG_USR|TOYFLAG_BIN))
+USE_UNSHARE(NEWTOY(unshare, "<1^imnpuU", TOYFLAG_USR|TOYFLAG_BIN))
config UNSHARE
bool "unshare"
default y
depends on TOYBOX_CONTAINER
help
- usage: unshare [-muin] COMMAND...
+ usage: unshare [-imnpuU] COMMAND...
Create new namespace(s) for this process and its children, so some
attribute is not shared with the parent process. This is part of
@@ -20,7 +20,7 @@ config UNSHARE
-n Network address, sockets, routing, iptables
-p Process IDs and init
-u Host and domain names
- -U UIDs, GIDs, capabilities
+ -U UIDs, GIDs, capabilities
*/
#include "toys.h"
@@ -29,14 +29,14 @@ extern int unshare (int __flags);
void unshare_main(void)
{
- unsigned flags[]={CLONE_NEWNS, CLONE_NEWUTS, CLONE_NEWIPC, CLONE_NEWNET,
- CLONE_NEWPID, CLONE_NEWUSER, 0};
+ unsigned flags[]={CLONE_NEWUSER, CLONE_NEWUTS, CLONE_NEWPID, CLONE_NEWNET,
+ CLONE_NEWNS, CLONE_NEWIPC, 0};
unsigned f=0;
int i;
for (i=0; flags[i]; i++) if (toys.optflags & (1<<i)) f |= flags[i];
- if(unshare(f)) perror_exit("failed");
+ if (unshare(f)) perror_exit("failed");
xexec_optargs(0);
}