From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2D93CC433FE for ; Fri, 18 Nov 2022 12:36:09 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 95E9A8515F; Fri, 18 Nov 2022 13:36:06 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=mt.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=mt.com header.i=@mt.com header.b="buwB0tk6"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8BE77851F3; Fri, 18 Nov 2022 09:00:35 +0100 (CET) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on0706.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0e::706]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id E8B8A85112 for ; Fri, 18 Nov 2022 09:00:32 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=mt.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=Manuel.Traut@mt.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gFNOuLj80qz1NovxTQ2LILLOOnXggU1+fJJ1IPBRvNfnCs3r5+bWQrpBSFBYwvJ6pUg5WWqmSX6cQOck5uf1FwuTjHVMydfW9awfm/p+SqRIUO8Wz8OLBaqICXAez4QOeyRaY3rJIphNojT+kMbwGV6z78d1/CPuRs97AWtsqucriOtZIKuADJ6HYh8lzZvMWKCXStvtKfWkfOI5sAPl4S1NySYpLkmTyUWdv18ZC4GXJfStGNI0GCzsCopqK9m0FYh/rGi7ejdGZsB/4De6pryp3xkhosmcoqiWh54J0dC5Nz2RfCuwqnM06AiOxoRCcxceZoKYjfVbLWSdM9gRLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=EjzbQlQdJ/HPWQkSm1HGebYE9zACTXYpLF+gna06vus=; b=NjgjIv79weBw1zpeiNMasOVD87SXa1dxc2/PH6q8xXvoIw9V3hf5ZCaVbQP0rKDKNdlc6e+TC5gzR9f0eoAHKkuPeD3kA2Kdqc+KpoqH23xrjiogKilWtq1L+iE3F1G3ZdoNlCuOmFy6c5J/eJ6bJ7bnA32CZs1Gm5LNrgDH16tLmUQM718KYfDClvOssH+b3sRiP03+dgDxxuc1o3IpWW4XNT/cBYd+Zbc8rRViyOVxC0wIY1dKQNhREJsOI2ZFLmNDjutXenWEcykbx1568XxYPTYKGkrLe62v1dCs1KzBrvUol8lM607bx7D4/87CxPMo+tmohFBvk38ciDlj6Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=mt.com; dmarc=pass action=none header.from=mt.com; dkim=pass header.d=mt.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mt.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=EjzbQlQdJ/HPWQkSm1HGebYE9zACTXYpLF+gna06vus=; b=buwB0tk6KgX3gQvHQ78GTXxHaeoW5v9AdTrMjMlSZBtscYy2wq44LWS9y1YgiUfqWZRK7J/mRoohiqWfSRh9tdnlL0hhVPvCSqsgF0/pgr/rL0TCg9wlgsuLCMvGX/64vZ1Nrs+E2VU4zdEEaHBilFUY4OZv7Xs+4p5wRMTuFnklk/unyhlQ+iP2tsoRNCn702dKeayYxfPvScQ8Az6jEdbn8TAEWC9KA20RuukV7XlI0MkEJm1E7BNa7Z1bcy+6f8OBEx3dazpnlI46V2HRu04aTHiie20vjiaQtlrgNJGiOIwPc9pZ5A3VWc/LEDkH+Csvy+e13DRScugZrSztrw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=mt.com; Received: from AS8PR03MB7621.eurprd03.prod.outlook.com (2603:10a6:20b:345::20) by AS8PR03MB9511.eurprd03.prod.outlook.com (2603:10a6:20b:5a6::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5813.17; Fri, 18 Nov 2022 08:00:32 +0000 Received: from AS8PR03MB7621.eurprd03.prod.outlook.com ([fe80::17a9:93a4:880f:79fb]) by AS8PR03MB7621.eurprd03.prod.outlook.com ([fe80::17a9:93a4:880f:79fb%7]) with mapi id 15.20.5834.009; Fri, 18 Nov 2022 08:00:31 +0000 Date: Fri, 18 Nov 2022 09:00:27 +0100 From: Manuel Traut To: u-boot@lists.denx.de Cc: vagrant@debian.org Subject: [PATCH] distro/pxeboot: Handle prompt variable Message-ID: Content-Type: text/plain; charset=utf-8 Content-Disposition: inline X-ClientProxiedBy: FR3P281CA0120.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a3::18) To AS8PR03MB7621.eurprd03.prod.outlook.com (2603:10a6:20b:345::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR03MB7621:EE_|AS8PR03MB9511:EE_ X-MS-Office365-Filtering-Correlation-Id: d6ccfcc4-692c-434b-50c8-08dac93af64f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Q5M7EXWzDcXgbEf+yNavTh/DXfeZhB1DRtbheQAHJ0bN2skevidIc2SMKQclfYTrPv5zbL6no+4d3PgzCPB49vND7+PgcxSkuhhXfql5ZgUfuWr9piPhdyIWam1kIlegIzXBEwMiw1bMLB7ApYam7GBqBhLC5nrjBket1nNPCiv7o9y/kT5JZfh+sxHS519clV+Gqsk8KCoGNNgHn2bZzDOw7UGPzCWXIR5lXjNOiew3v79IMwoNN5rydKx+bfyDwYcMl65m4gIlCon3XJabAwH9Nl562iY1mPMa9zbxSt99lOgLe6v9VgFJpXo8c7+AVPMRJ326GeayomKhSmVUPw0zSzikHdrXSm81BIwhugIXFMBgvVqYwSfNTxyU7xlLJ6m+0MQlUUYQsKj+7hkQc0OYCh1+0sTZULRaW0D3+aEkpHe54BbrmSvTTC9SteuDAnLAZ6x1NNK9xqTwD1oDy8Ze/kus6cY+sbc6XaEf0EA7wiK+9N2I7LZf25x7wOv9UCwbTi2Bd6tJRs/DypLHYic2RB3A3KhnT2DTml0yVUY4eDlD5BRaOjpBIlYP0dhSEoWR8vQsFog9yVoeNFRPBVUQ+UTiZSqSniRHiG/RvbCgl+gEsXhofrskA4Ropr1FB3bCR8kk/Wj4bGEl+6b9QWFAou9GKfEKsWHacCHRmdDuQKRigyV7iY5SKmPY14zlA4bupbzNdi/9/lThDGN9rcuEcFmZb01Qna1WNXry660= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AS8PR03MB7621.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(376002)(366004)(346002)(136003)(396003)(39860400002)(451199015)(86362001)(36756003)(38350700002)(38100700002)(26005)(6512007)(52116002)(6506007)(6666004)(316002)(6916009)(2906002)(41300700001)(6486002)(4744005)(478600001)(44832011)(83380400001)(966005)(66556008)(66476007)(66946007)(8936002)(5660300002)(186003)(4326008)(8676002)(2616005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?Tzd3QjZYN0lwYkJidzJXNjg3ME1GYVBzQXZZc1kwV2VLbTZGZmFadlpOODl2?= =?utf-8?B?Y2JsZ0txSy81YWxkMHlsS3Vmb2NuVzgvSHQwYTRLamVEa2JHN1NrZHZQbHpu?= =?utf-8?B?UlkxOGlpdll5ZzRqenpBZVphQWNhSHRDb3NqL3c1blVBNHlIZHFBMzZGZmtR?= =?utf-8?B?SzdXcEJTSDRZUmp4ZTJ4WkZxSDJXNWdWM2Z3dDRDeHFNZklMNjlLUGxMSkk4?= =?utf-8?B?T3pILzFTUFRlQmxMY2Fleng1RVltYytHZGRaVy9sQVh1TmFJZlRHcllZMmN6?= =?utf-8?B?T2s0QVY1UGJQNUNrakd3bWw2UW43RW10a2dicE1FWUE0SmYrUWJmUG5IUkhL?= =?utf-8?B?NFcrMVNFTCsyTFpqMlNvaXJvN044VlBWOSs0TTRMMHRYUHo3RkszM1NaQUNU?= =?utf-8?B?cHg4UlcybWVERW85a3FnUFdZVUtFbDNlWklURWtyTVVFL0liOTBQV2dxa3M3?= =?utf-8?B?TFZRNzM4eHNyR0FOckR0TFpBcDFwbXpxeHdJUFN4Nnl2L0VpdVEraGoyZWNr?= =?utf-8?B?T3grUHFtTVNxQ0pQcCtaa1BnYlp5VGZtWVhhdEZ5a3EyZnlLTjhJUDVSbjJH?= =?utf-8?B?OXhVK1hSR20wYzcwRXBwMXJjV2lNMlRaek5UYm5GaEdiUStqaTJ2a01mYjd2?= =?utf-8?B?WGt2NGF3cUIzTXMreVdDeEh5OC8wY21rb2d2T1ZISktFYmNjMDhiejNKVUV6?= =?utf-8?B?QTNpZUpHVzdxam1ocGlobEtzbUt6Z0xMSXRqNGhIT2RuZ01lcXNGcGtaVVpV?= =?utf-8?B?TllXVVhRMVFHVGtyZW9SZ3hyUDdRa3BxUTBzQXdleFI0OTYzRkNmKzVmckRT?= =?utf-8?B?U1RXYlNkMTlqVEFnckZPSU50N3EvQTVNRHgrTjVkcStSOWxPcy9Fd2lXamhV?= =?utf-8?B?aVBpTEVnMjRlWXZwckVQS1Y4MFBrdzR4ZmYwTDk4bWdUaXNHL2JJU2VBMFV3?= =?utf-8?B?U2phRmZuTVhUczZPMHFJRFZtWHJ2R09LV0hSSUdzMGt3RmV6MXZFYjFCYWJo?= =?utf-8?B?UkdhOGpxb0MwYUUzQmxWcDlsWTlsb25TRktUbUxmUnUya256MXVUaTVxWVBT?= =?utf-8?B?dHlCVGJVYmxNdzdoSDF0bUxqYVVzRXAxQ2tQdHdiaFZHZHNiRnhaKy9xVG9q?= =?utf-8?B?bTRlVFlkbXVGSDc0dzM0TVIzbzdhZVlaekNBNHdjR0VQVUVnTFZ4UjE3UFB6?= =?utf-8?B?ZHFzYXBnbDIvcFRHNWlSTGVkMGlWT0x1RUY1aTA1VzNKS0U5UVU1VkpBMkNU?= =?utf-8?B?OEx4dDhhT3hPeDVSaXJWN2JKZEc2dTNjWmVCcDNycjgrT2QyQmJnV3NtTzcv?= =?utf-8?B?ZzBpYjB1Mm9WekZLSVEyNFRRbjVTa3BEbDU5QndXV3BEZWgrMFhUczFlUFpi?= =?utf-8?B?alVsUEpYWkhMR3EyZ3p6aGgxWU9sWmZVMW5QZHRqS3JiMEdvbkJEWTlHTHYz?= =?utf-8?B?Yldha0UrVUEzZ1ljTXVyUEhpVkZodGlHUzMxdkZpQnVIN0kzdEFPMXJhZmMy?= =?utf-8?B?VVNleHdBT0ZnSk1qK055TER1TEJaQzd1azR6T0Q5dzE1VU81THlRcGRkejdt?= =?utf-8?B?OTlUbElxVzhqYU94MlJpS1ZETlJldnozT2RiUVhlOVlZT25tOFdaM090Q0Ra?= =?utf-8?B?SXh0eTdsOEc1dnBYbGNpTmYwSFo5MFdINTVRSW1DZUlrTzFkUHJtZTJsRVU5?= =?utf-8?B?T2FZSkVXUHk2blBWWkl2alRxcWJWYlBDNFlKU0tiRm9OOGZ1Z1lCUnJYNjhv?= =?utf-8?B?Q1RKcHZFU2lmVXhVQllXNzhPWGhyWCtha1l2NllYVWhGNmdhajlGN2xjL2Jw?= =?utf-8?B?d1k4K0c3UDc2QmVTSzRjaXQ1UGhkcWEyZEtUZUJMZHBPdmhxdXNSQTRlUURy?= =?utf-8?B?K2J4K1EwbGl0OGh3a2tYQ2VlL0MweGZDODZwUDFhWG1QcmdQUm4vU3VSN0Ny?= =?utf-8?B?OG1TOCtNaDFJakNwQnN2ZUtTWk5BK1ZDVFFyL3NYdHFudGZ4empHYkppamhz?= =?utf-8?B?b1hNdlJXWlh1VFI3YnJYZjFtSmp3TW1GUi85LzJrS3V1UGRVb0VzVlFXQ3Zy?= =?utf-8?B?NSt0c3NYQU5BQWJsdGpobHdpMlUrSzg0ZzhkYjh0TkltQkV1TzUvWkR6Rnho?= =?utf-8?Q?OTsUvvp0v1PGGLfnOenZDEJiI?= X-OriginatorOrg: mt.com X-MS-Exchange-CrossTenant-Network-Message-Id: d6ccfcc4-692c-434b-50c8-08dac93af64f X-MS-Exchange-CrossTenant-AuthSource: AS8PR03MB7621.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Nov 2022 08:00:31.8878 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fb4c0aee-6cd2-482f-a1a5-717e7c02496b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 4CwKVzliy51S8f23NcccS9sG+yD5MkREkJ/N/EY9jjzJsa82AvG10WKFhFlkw88gBqU/Mt7iRYJ3BNKa8fSEkA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR03MB9511 X-Mailman-Approved-At: Fri, 18 Nov 2022 13:36:05 +0100 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean 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 --- 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