diff options
| author | Ron Yorston <rmy@pobox.com> | 2016-05-16 09:33:03 +0100 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2016-05-16 09:33:03 +0100 |
| commit | 35d2f5bccb0f3dde600702ebcdb5424d4d50be4a (patch) | |
| tree | 6e0ff0341c69839e268459a199682628bae734ed /util-linux/nsenter.c | |
| parent | 248a2600a2f4b442101ad568d1994b908bb28d4b (diff) | |
| parent | f2559e5c2b7bd2c5fa0dd8e88d0a931da92a23af (diff) | |
| download | busybox-w32-35d2f5bccb0f3dde600702ebcdb5424d4d50be4a.tar.gz busybox-w32-35d2f5bccb0f3dde600702ebcdb5424d4d50be4a.tar.bz2 busybox-w32-35d2f5bccb0f3dde600702ebcdb5424d4d50be4a.zip | |
Merge branch 'busybox' into merge
Diffstat (limited to 'util-linux/nsenter.c')
| -rw-r--r-- | util-linux/nsenter.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/util-linux/nsenter.c b/util-linux/nsenter.c index b08b3dae7..6834292da 100644 --- a/util-linux/nsenter.c +++ b/util-linux/nsenter.c | |||
| @@ -128,7 +128,7 @@ static const struct namespace_descr ns_list[] = { | |||
| 128 | /* | 128 | /* |
| 129 | * Upstream nsenter doesn't support the short option for --preserve-credentials | 129 | * Upstream nsenter doesn't support the short option for --preserve-credentials |
| 130 | */ | 130 | */ |
| 131 | static const char opt_str[] = "U::i::u::n::p::m::""t+S+G+r::w::F"; | 131 | static const char opt_str[] ALIGN1 = "U::i::u::n::p::m::""t+S+G+r::w::F"; |
| 132 | 132 | ||
| 133 | #if ENABLE_FEATURE_NSENTER_LONG_OPTS | 133 | #if ENABLE_FEATURE_NSENTER_LONG_OPTS |
| 134 | static const char nsenter_longopts[] ALIGN1 = | 134 | static const char nsenter_longopts[] ALIGN1 = |