[PATCH] distro/pxeboot: Handle prompt variable

[PATCH] distro/pxeboot: Handle prompt variable

[Manuel Traut]

Regarding the documentation found here:
https://github.com/u-boot/u-boot/blob/master/common/menu.c#L347

If both timeout and prompt is set to 0 the default entry shall
be booted immediately. However the current behaviour is that
the prompt is shown (tested with distroboot) until the user
selects an entry (no timeout).

This change implements a behaviour as documented. It was tested
with distroboot.

Signed-off-by: Manuel Traut <manuel.traut@mt.com>
---
 boot/pxe_utils.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/boot/pxe_utils.c b/boot/pxe_utils.c
index 8133006875..075a0f2830 100644
--- a/boot/pxe_utils.c
+++ b/boot/pxe_utils.c
@@ -1359,7 +1359,10 @@ static int parse_pxefile_top(struct pxe_context *ctx, char *p, unsigned long bas
 			break;
 
 		case T_PROMPT:
-			eol_or_eof(&p);
+			err = parse_integer(&p, &cfg->prompt);
+			// Do not fail if prompt configuration is undefined
+			if (err <  0)
+				eol_or_eof(&p);
 			break;
 
 		case T_EOL:
-- 
2.35.1

Re: [PATCH] distro/pxeboot: Handle prompt variable

[Simon Glass]

On Fri, 18 Nov 2022 at 05:36, Manuel Traut <manuel.traut@mt.com> wrote:
>
> Regarding the documentation found here:
> https://github.com/u-boot/u-boot/blob/master/common/menu.c#L347
>
> If both timeout and prompt is set to 0 the default entry shall
> be booted immediately. However the current behaviour is that
> the prompt is shown (tested with distroboot) until the user
> selects an entry (no timeout).
>
> This change implements a behaviour as documented. It was tested
> with distroboot.
>
> Signed-off-by: Manuel Traut <manuel.traut@mt.com>
> ---
>  boot/pxe_utils.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)

Reviewed-by: Simon Glass <sjg@chromium.org>

AW: [PATCH] distro/pxeboot: Handle prompt variable

[Traut Manuel LCPF-CH]

Can this be picked for next?

-----Ursprüngliche Nachricht-----
Von: Simon Glass <sjg@chromium.org> 
Gesendet: Sonntag, 27. November 2022 15:36
An: Traut Manuel LCPF-CH <Manuel.Traut@mt.com>
Cc: u-boot@lists.denx.de; vagrant@debian.org
Betreff: Re: EXTERNAL - [PATCH] distro/pxeboot: Handle prompt variable

On Fri, 18 Nov 2022 at 05:36, Manuel Traut <manuel.traut@mt.com> wrote:
>
> Regarding the documentation found here:
> https://github.com/u-boot/u-boot/blob/master/common/menu.c#L347
>
> If both timeout and prompt is set to 0 the default entry shall be 
> booted immediately. However the current behaviour is that the prompt 
> is shown (tested with distroboot) until the user selects an entry (no 
> timeout).
>
> This change implements a behaviour as documented. It was tested with 
> distroboot.
>
> Signed-off-by: Manuel Traut <manuel.traut@mt.com>
> ---
>  boot/pxe_utils.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)

Reviewed-by: Simon Glass <sjg@chromium.org>

Re: [PATCH] distro/pxeboot: Handle prompt variable

[Tom Rini]

[-- Attachment #1: Type: text/plain, Size: 695 bytes --]

On Fri, Nov 18, 2022 at 09:00:27AM +0100, Manuel Traut wrote:

> Regarding the documentation found here:
> https://github.com/u-boot/u-boot/blob/master/common/menu.c#L347
> 
> If both timeout and prompt is set to 0 the default entry shall
> be booted immediately. However the current behaviour is that
> the prompt is shown (tested with distroboot) until the user
> selects an entry (no timeout).
> 
> This change implements a behaviour as documented. It was tested
> with distroboot.
> 
> Signed-off-by: Manuel Traut <manuel.traut@mt.com>
> Reviewed-by: Simon Glass <sjg@chromium.org>
> Reviewed-by: Simon Glass <sjg@chromium.org>

Applied to u-boot/next, thanks!

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]