diff options
| author | Ron Yorston <rmy@pobox.com> | 2016-10-19 17:01:55 +0100 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2016-10-19 17:01:55 +0100 |
| commit | 075814c60a316cfd088c88f26f75ab21b5850b98 (patch) | |
| tree | f6e33ac693630827deb309faa5fa4931588db57d /util-linux/unshare.c | |
| parent | 977d65c1bbc57f5cdd0c8bfd67c8b5bb1cd390dd (diff) | |
| parent | f37e1155aabde6bd95d267a8aec347cedccb8bc3 (diff) | |
| download | busybox-w32-075814c60a316cfd088c88f26f75ab21b5850b98.tar.gz busybox-w32-075814c60a316cfd088c88f26f75ab21b5850b98.tar.bz2 busybox-w32-075814c60a316cfd088c88f26f75ab21b5850b98.zip | |
Merge branch busybox (up to "ash: comment out free(p) just before...")
Diffstat (limited to 'util-linux/unshare.c')
| -rw-r--r-- | util-linux/unshare.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/util-linux/unshare.c b/util-linux/unshare.c index fa7086add..dcc59559a 100644 --- a/util-linux/unshare.c +++ b/util-linux/unshare.c | |||
| @@ -103,7 +103,7 @@ enum { | |||
| 103 | OPT_mount = 1 << 0, | 103 | OPT_mount = 1 << 0, |
| 104 | OPT_uts = 1 << 1, | 104 | OPT_uts = 1 << 1, |
| 105 | OPT_ipc = 1 << 2, | 105 | OPT_ipc = 1 << 2, |
| 106 | OPT_network = 1 << 3, | 106 | OPT_net = 1 << 3, |
| 107 | OPT_pid = 1 << 4, | 107 | OPT_pid = 1 << 4, |
| 108 | OPT_user = 1 << 5, /* OPT_user, NS_USR_POS, and ns_list[] index must match! */ | 108 | OPT_user = 1 << 5, /* OPT_user, NS_USR_POS, and ns_list[] index must match! */ |
| 109 | OPT_fork = 1 << 6, | 109 | OPT_fork = 1 << 6, |
| @@ -142,7 +142,7 @@ static const char unshare_longopts[] ALIGN1 = | |||
| 142 | "mount\0" Optional_argument "\xf0" | 142 | "mount\0" Optional_argument "\xf0" |
| 143 | "uts\0" Optional_argument "\xf1" | 143 | "uts\0" Optional_argument "\xf1" |
| 144 | "ipc\0" Optional_argument "\xf2" | 144 | "ipc\0" Optional_argument "\xf2" |
| 145 | "network\0" Optional_argument "\xf3" | 145 | "net\0" Optional_argument "\xf3" |
| 146 | "pid\0" Optional_argument "\xf4" | 146 | "pid\0" Optional_argument "\xf4" |
| 147 | "user\0" Optional_argument "\xf5" | 147 | "user\0" Optional_argument "\xf5" |
| 148 | "fork\0" No_argument "f" | 148 | "fork\0" No_argument "f" |