[PATCH] Fix nsenter option parsing

Denys Vlasenko vda.linux at googlemail.com
Sat Dec 12 07:45:25 UTC 2020


Applied, thanks.

On Thu, Dec 10, 2020 at 11:54 PM Thomas Lidén <thomas.liden at advenica.com> wrote:
>
> Usage: nsenter [OPTIONS] [PROG [ARGS]]
> Stop nsenter from processing ARGS to PROG as OPTIONS.
> e.g. "nsenter ls -l" gives: invalid option -- 'l'
>
> diff --git a/util-linux/nsenter.c b/util-linux/nsenter.c
> index c48dcf885..9cfbf21e4 100644
> --- a/util-linux/nsenter.c
> +++ b/util-linux/nsenter.c
> @@ -103,8 +103,9 @@ static const struct namespace_descr ns_list[] = {
>  };
>  /*
>   * Upstream nsenter doesn't support the short option for --preserve-credentials
> + * "+": stop on first non-option
>   */
> -static const char opt_str[] ALIGN1 = "U::i::u::n::p::m::""t:+S:+G:+r::w::F";
> +static const char opt_str[] ALIGN1 = "+""U::i::u::n::p::m::""t:+S:+G:+r::w::F";
>
>  #if ENABLE_LONG_OPTS
>  static const char nsenter_longopts[] ALIGN1 =
> _______________________________________________
> busybox mailing list
> busybox at busybox.net
> http://lists.busybox.net/mailman/listinfo/busybox


More information about the busybox mailing list