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 CB140C63797 for ; Tue, 17 Jan 2023 08:39:25 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 67F48853BE; Tue, 17 Jan 2023 09:39:23 +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="izFASzwj"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 14B3A85038; Tue, 17 Jan 2023 09:39:21 +0100 (CET) Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02on2104.outbound.protection.outlook.com [40.107.249.104]) (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 A7FB78551A for ; Tue, 17 Jan 2023 09:39:13 +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=CAP495mbmr4uu6iaLriApGGIhjWV+UWUdlru19ELMBVNF89kwCv2D1D1h6p6nTmbRHZL4ksh0XBHSQS3ZJzFPHdmPYmmfLqOEhj81kVoCWC5Pk8LBJLroW+BNcVSNBAZtP9A8uUt67DPcAdNnGYbeyJ3MTefVHKrH4KuMhplR4375Mt4jB8bXUKHW60r5Tr44fyzcYYJUClugMzSLpt8HVrqCYjSVBO0y/aFbD7EaQtxaT3IG3CF4WvM6jZHDyVT0XjIwV/2wL5zuh3PMrFIYzXm3vekHi1tB3Ou4nqhzLeuyR3j80MTin9XKYhOZiqjBjmOnKt2gJMSdXETZ9PDWw== 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=wUvHJrO2tZBLqEC6HscT63aSVnVCS/gHe6apDAg9GK0=; b=C3TXKkClW3jgCEaTOkTDa9JRs4zvUMuG8DlHJGbwh8K2Yhw0iexh68zHoOO0kqc5X2NcS5ji+ZpNqWKx9ERaQScMtd82sBr2lF+ryvghT6fdayRhw9ssUrmLlMvBUSuI5Y2+nkctmOe8T1f24wPCWD2O+6/sgR5zawlKukSDlJJvY3C0UgreCRJOhOZhq2vYmMAmqw4cU/iKuJBm3cJbWZ0raJmeAR7rRPt9VGIRSBYcoESKLhhjikRxLTwCUXdL3OCiY4bW0Na0TKVZWnBaaz06DU8HGzttL7AucYl7IAWSnMvT4AjgL2xPwM+eu7P3SNsnTLFrP+wt2BdlG4xOzQ== 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=wUvHJrO2tZBLqEC6HscT63aSVnVCS/gHe6apDAg9GK0=; b=izFASzwjB5KbiiBRccUTIOo3fgukUSnlDnXmkHT2fDXDDmcEZ109SolBCCYdyCLG/r/FatdbmSw0nxiJutFK/WNWoFz+mXy72pMWO0kHaLtRCkxgy9gDHIkDmN6mxcPemWmmTG4cINhpgcANGIFmx7LqZYTAKXHK9R/TG98rUPRnvdApGNl391/ApE1VmxpSVrz8wSjJ3NN7++Wesg5/2XlaECvyboQRR8qihpZCXaUSdkQRUyZsriC0jLcM8gF8lzyq6MuXWh/aVUVoJM8vyUF1dBl7Jxwy5OME2YnGKZlBYfn1bt8MAjFjYMf80ZXgG76y/kmZU/2nIz0B+kcrEg== 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 AS2PR03MB9002.eurprd03.prod.outlook.com (2603:10a6:20b:5f4::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5986.19; Tue, 17 Jan 2023 08:39:12 +0000 Received: from AS8PR03MB7621.eurprd03.prod.outlook.com ([fe80::b42f:82f8:24cb:a225]) by AS8PR03MB7621.eurprd03.prod.outlook.com ([fe80::b42f:82f8:24cb:a225%4]) with mapi id 15.20.5986.023; Tue, 17 Jan 2023 08:39:12 +0000 Date: Tue, 17 Jan 2023 09:39:09 +0100 From: Manuel Traut To: Karsten Merker Cc: Simon Glass , U-Boot Mailing List Subject: Re: U-Boot: extlinux.conf boot menu support appears to be broken by commit 739e8361f3fe78038251216df6096a32bc2d5839 Message-ID: References: Content-Type: multipart/mixed; boundary="ustAX4xJFm54vaZH" Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-ClientProxiedBy: FR2P281CA0080.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:9a::13) To AS8PR03MB7621.eurprd03.prod.outlook.com (2603:10a6:20b:345::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR03MB7621:EE_|AS2PR03MB9002:EE_ X-MS-Office365-Filtering-Correlation-Id: f1d1f5c4-0e3c-42fb-8b30-08daf8664ec2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: q9Bf1e7JJuYPPQea6+h2CP9ieRDjTuaPTephmWaEpGuQmeRh1oefpkHxC5TfBT/14hYREt9MrN5SLxzGbz6KXco3wZC8oZJ2Ivq4sVixljxZzQMpHB6HhyOJBowwSovMjA9m3gwU6Vn2LArgamWMTrgz12vntQ83fBJoYqIPIBmbxpJap0XwMMhVR+owMgAh5WkdJckbM/jKlJSv4BwtnLtJYXyByWmHUb31HGfvLZFno6MI5rc7Cw/2F4pMtjCK2QdRYk68RzNN+7kNKzwOgM6ZOybV0nxL5MXBgTNS2di3Fw8Rx8CAP6aIm6xiox5uiu9bEmN1K91986P6aSyRAO08GCi8O+lfpXiteSk3WE4Pxk3rUK/uH2tTGMwQ7suVdCtBSFEzvK+hNoLvtGi4baeStsiuywJ3HuKkJFEkd9fEdBZOVj0EhAjOqS8gEk8MgTLCwPWMyTEmrlxPoVfSC0b+ZcT036Xd/ruI50kuzN+os/F342Unm6/EhuOwTqt4TfDUBDFjc2CwbF0jxyTRah3/GbU4/2p6Fu4E6KcY4H18sjRKIBayW6eDekaHnTKww5OmeQboZgVt5ZDs8eLzGqhh7EUU0ql6xSNBZWP9ZO9JdCVRKQCGr9IeirMNjfjpq4dHxzggZDMyp5fg8z/2gUNX01zaV0AgKogoDIfwm3UPBlH1/UdZkyNr9bOWWC+gDpXs8nc9Uy1KjWfg6XsLvJNOR43jmQhfpMe3I/+TMEiGhV7fmd8f4aEC3+6GqaGDz1H4LTmpw0dzqnbFRks/9A== 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)(39860400002)(366004)(136003)(376002)(396003)(346002)(451199015)(52116002)(26005)(6512007)(186003)(966005)(478600001)(6486002)(316002)(66556008)(66476007)(6666004)(54906003)(66946007)(2616005)(44144004)(33964004)(8676002)(6506007)(6916009)(4326008)(38350700002)(38100700002)(83380400001)(8936002)(5660300002)(41300700001)(235185007)(44832011)(66574015)(86362001)(36756003)(2906002)(2700100001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?WXBqdGpJOERHZ25EQlFIUHJ5M2s2Y1FtbEFKVXFPcS8waVAyUjh3L09kc3ZC?= =?utf-8?B?anMvT2grejhlM1JibVI4SmNlZXpQYytKLytKQS9UNHNEcWZQTTltanlZV3Ra?= =?utf-8?B?SnRFazliNjhzeE5Yd0RSN2YxNk5hK1FUL2JseVlXa3BJdU5rclJ1dDM1bHR2?= =?utf-8?B?SEpxaWQ5TnZndVJYTzhZbDBGalpyY3RDRk5pa2JLbEVRUGlxL2I5UHdzQlpM?= =?utf-8?B?M21iNHdxazVKTDh6RktBSkNQRnQwVGFsaE9UUWh0YkRncitxcytORHdDaVRm?= =?utf-8?B?U2gvbVNpRzRmcEJUVlkzbWp1WjBuL1k3RkI4cHU0cDd6N3QrOHI5Zk10Kzdm?= =?utf-8?B?RHZ6WS9USUF4a3JHYldORnIwOHJRRmNYcnRhN3ZseURyeXkvRVNGaVMvQVBs?= =?utf-8?B?UlBodGRwVDFHYjh1N1FhYUZKYi9BOURHcTk2RUVaZmpBa1FkZ1d4dm0rOVVV?= =?utf-8?B?SUk0OWpoVFk0eHJMNjhDTlhGVzJ1S3lmdjVXRUtRbGgxUHQ1S1o3cUd0dWVP?= =?utf-8?B?SU1EMzBvL3RKTCtrVkYzcStTVlYwSHcrc3Q0QmFTd1ZqeXhiZEpYYlVFMUFZ?= =?utf-8?B?QXNHQlFienJDK3ZRRUJWYnAzak5lUFpoQ0cxWTJuY0tHZ0pqbUNpdXE4S1Vw?= =?utf-8?B?UkY0bmtMOWxUcmxwajZ2Yy9tbHdISThNRnk3MWcrNlVQbjVNR09yTm5nMSs0?= =?utf-8?B?czlDZUw4aEg3KzlJeXdpWlNsYkptb2FuQjJ5eDd0ZHZsZjAyeGN1RTIxRjIv?= =?utf-8?B?eGlsU2Z3UWdUU2lyRTBDVzhIa1hVZGVxUlVYQVdyOWNJbWJMNzFQMlJLc2tL?= =?utf-8?B?b21YemRONlRpdWhpa3hvazMvenJMekplN3l3a00xZW0vdE5BV285SmRFLzQ1?= =?utf-8?B?UzF4dGtuL0FlcEllZDhKRkJFQU9zY0JacTZlVHFCQWwxenZKTXRaNUNpckdX?= =?utf-8?B?MWdBaVNaVkJCNWZSZEo0R2ZVRHBKZ0dySUJhUll4dU1MbkxtL2JKaUo0MENo?= =?utf-8?B?VnBCMU1yKyt3OVBIOVdQYit3QWh6Y3JyMkVsY29YNmhXUVhRWmxhQXpLU2Jx?= =?utf-8?B?enBSZzFhelZzbzR4ZjdzMGxaWVVOQjhXUmpONEhESVpNWHhLK0hkb0d2STBO?= =?utf-8?B?OStHbzBsQWJ4cG9QV01Ka2c3YVlaVVR2UmhxTEtLZnB5bjQxcDhFOXlGdFBI?= =?utf-8?B?WWp3MGl6S0FMdHpEYzdHK0lKSzkzNlRQVk14TTFMRGtmb282TjJxZGQxMTdX?= =?utf-8?B?K0FSM0VldnpPZDNwbUNSSENjZXVkbTBQRS81QnZ3b050ZzZDMEZWUHZ4eVVo?= =?utf-8?B?QWIvVWhvc2ozZnBmUDg0czFQVUZsOUkwZlVMT1B0THEzSmhFVGpFbUtsTkFC?= =?utf-8?B?bVBrL1FVSU9SUm9yZnJKUWtnM1JmU28yT0lRN3BQb0Z2eG55WmZIZWlVMlB6?= =?utf-8?B?U3l0aUQ5bkZWaG02cmVsUlluaGFYb25zeW1oaFVhV2ZkNS9kQkRUNnFOd0lh?= =?utf-8?B?U2JXc0JCWG1UWGd4bWhHL2hOMmNiNXhIT01BY1NEd3BBaEUrZjZxWUxleDBO?= =?utf-8?B?cTRZUUxnMTR0ZUpOeFlKSUg4bDJsbmRxV29mVTVJSXdWV3ArQlRnL1B6eHdm?= =?utf-8?B?NVByb2ZMVEk5UE5jNVNKN0wybWhOVEtFTURCOWZqYXdIQ0NEM1Axblp0RDh0?= =?utf-8?B?YUYvaWM0N0dkcGUzV0dudjVLbi9VT3BHZGJtb2dTK2RjWnBqdmNqcUhhQUNs?= =?utf-8?B?dXF3ZUFEbHVFRHVyRFEwUVlUR3FwajZKQTk0emtZTUo3Yi9KZ21nL1dQZ1ll?= =?utf-8?B?VldEdXRKY2FZV1NxMEpGRnZUenJuWWJtWmxwY0o5bmJ0ZXlJOFpMVFdvNG1I?= =?utf-8?B?MnE5MDVxREVlMWgxVDArUkNtQzVHUEwxODN3NjAzWVEyd2tiMWlwaVRQUjRB?= =?utf-8?B?a3NCa2h6ZGVJR0dnQUE2SDBzZU9lN1ptdGRSWWJ6ZGxSWGZVcDQrcStXdnM5?= =?utf-8?B?a3Q4UVh2Tlc4dkhxd0Z3V3RCYkRsWUJpZEZqNmRidW9wVlhKUS9MNFFNekFU?= =?utf-8?B?Nlk3T0VzRG1WZSsxcWFFdTl1K1h6SVhWN3A0cm1uOTR5bWxtYWlhUHVraytI?= =?utf-8?Q?MZoo3BYUJtrqmG9YZnRUD5WZm?= X-OriginatorOrg: mt.com X-MS-Exchange-CrossTenant-Network-Message-Id: f1d1f5c4-0e3c-42fb-8b30-08daf8664ec2 X-MS-Exchange-CrossTenant-AuthSource: AS8PR03MB7621.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jan 2023 08:39:12.0571 (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: jmixZvUCA2+o2Ald//5ng/qX6iGWhzge1QxMPPjDUXN4SRBxKtj6y6Bs7r3ukXkSVFJUGUYIJEydb4j1vtT8uw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS2PR03MB9002 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 --ustAX4xJFm54vaZH Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit Hi Karsten, thanks for your report. Can you test with the attached patch? I do not have access to a hardware today, but I will test it tomorrow. Regards Manuel Am 16.01.2023 um 19:50 hat Karsten Merker geschrieben: > Hello, > > it looks like the following commit has broken the extlinux.conf > boot menu support in U-Boot: > > -----8<----------8<----------8<----------8<----------8<----------8<----- > commit 739e8361f3fe78038251216df6096a32bc2d5839 > Author: Manuel Traut > Date: Fri Nov 18 09:00:27 2022 +0100 > > distro/pxeboot: Handle prompt variable > > 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 > Reviewed-by: Simon Glass > Reviewed-by: Simon Glass > -----8<----------8<----------8<----------8<----------8<----------8<----- > > Since the commit above, a system with the following > /boot/extlinux/extlinux.conf (which sets timeout to 50) > immediately boots the first entry in the config without > displaying a boot menu. According to the description, that > should only happen if both prompt and timeout are set to zero in > the config, but it also happens with timeout set to a non-zero > value as in the config below: > > -----8<----------8<----------8<----------8<----------8<----------8<----- > ## /boot/extlinux/extlinux.conf > ## > ## IMPORTANT WARNING > ## > ## The configuration of this file is generated automatically. > ## Do not edit this file manually, use: u-boot-update > > default l0 > menu title U-Boot menu > prompt 0 > timeout 50 > > > label l0 > menu label Debian GNU/Linux bookworm/sid 6.1.0-1-riscv64 > linux /boot/vmlinux-6.1.0-1-riscv64 > initrd /boot/initrd.img-6.1.0-1-riscv64 > > > append root=/dev/vda1 rw noquiet > > label l0r > menu label Debian GNU/Linux bookworm/sid 6.1.0-1-riscv64 (rescue target) > linux /boot/vmlinux-6.1.0-1-riscv64 > initrd /boot/initrd.img-6.1.0-1-riscv64 > > append root=/dev/vda1 rw noquiet single > > > label l1 > menu label Debian GNU/Linux bookworm/sid 6.0.0-6-riscv64 > linux /boot/vmlinux-6.0.0-6-riscv64 > initrd /boot/initrd.img-6.0.0-6-riscv64 > > > append root=/dev/vda1 rw noquiet > > label l1r > menu label Debian GNU/Linux bookworm/sid 6.0.0-6-riscv64 (rescue target) > linux /boot/vmlinux-6.0.0-6-riscv64 > initrd /boot/initrd.img-6.0.0-6-riscv64 > > append root=/dev/vda1 rw noquiet single > > > label l2 > menu label Debian GNU/Linux bookworm/sid 6.0.0-5-riscv64 > linux /boot/vmlinux-6.0.0-5-riscv64 > initrd /boot/initrd.img-6.0.0-5-riscv64 > > > append root=/dev/vda1 rw noquiet > > label l2r > menu label Debian GNU/Linux bookworm/sid 6.0.0-5-riscv64 (rescue target) > linux /boot/vmlinux-6.0.0-5-riscv64 > initrd /boot/initrd.img-6.0.0-5-riscv64 > > append root=/dev/vda1 rw noquiet single > -----8<----------8<----------8<----------8<----------8<----------8<----- > > Up to commit 51c5c28af59c19407d6602336ac7374dd1432c49 the boot process > with the extlinux.conf above looks as follows: > > -----8<----------8<----------8<----------8<----------8<----------8<----- > Hit any key to stop autoboot: 0 > > Device 0: QEMU VirtIO Block Device > Type: Hard Disk > Capacity: 102400.0 MB = 100.0 GB (209715200 x 512) > ... is now current device > Scanning virtio 0:1... > Found /boot/extlinux/extlinux.conf > Retrieving file: /boot/extlinux/extlinux.conf > U-Boot menu > 1: Debian GNU/Linux bookworm/sid 6.1.0-1-riscv64 > 2: Debian GNU/Linux bookworm/sid 6.1.0-1-riscv64 (rescue target) > 3: Debian GNU/Linux bookworm/sid 6.0.0-6-riscv64 > 4: Debian GNU/Linux bookworm/sid 6.0.0-6-riscv64 (rescue target) > 5: Debian GNU/Linux bookworm/sid 6.0.0-5-riscv64 > 6: Debian GNU/Linux bookworm/sid 6.0.0-5-riscv64 (rescue target) > Enter choice: > -----8<----------8<----------8<----------8<----------8<----------8<----- > > The user can then either select a boot menu entry or - if there is > no user input - the system boots the first entry after the timeout > set in extlinux.conf is over. > > Starting with commit 739e8361f3fe78038251216df6096a32bc2d5839, > the boot process looks as follows, i.e. there isn't a boot menu > anymore but the system immediately boots the first entry: > > -----8<----------8<----------8<----------8<----------8<----------8<----- > Device 0: QEMU VirtIO Block Device > Type: Hard Disk > Capacity: 102400.0 MB = 100.0 GB (209715200 x 512) > ... is now current device > Scanning virtio 0:1... > Found /boot/extlinux/extlinux.conf > Retrieving file: /boot/extlinux/extlinux.conf > 1: Debian GNU/Linux bookworm/sid 6.1.0-1-riscv64 > Retrieving file: /boot/vmlinux-6.1.0-1-riscv64 > Retrieving file: /boot/initrd.img-6.1.0-1-riscv64 > append: root=/dev/vda1 rw noquiet > Moving Image from 0x84000000 to 0x80200000, end=815e5000 > ## Flattened Device Tree blob at ff7344b0 > Booting using the fdt blob at 0xff7344b0 > Working FDT set to ff7344b0 > Using Device Tree in place at 00000000ff7344b0, end 00000000ff738dea > Working FDT set to ff7344b0 > > Starting kernel ... > [...] > -----8<----------8<----------8<----------8<----------8<----------8<----- > > Regards, > Karsten > -- > Hiermit widerspreche ich ausdrücklich der Nutzung sowie der Weitergabe > meiner personenbezogenen Daten für Zwecke der Werbung sowie der Markt- > oder Meinungsforschung. -- Manuel Traut --ustAX4xJFm54vaZH Content-Type: text/x-diff; charset=utf-8 Content-Disposition: attachment; filename="0001-menu-Ignore-prompt-variable-if-timeout-is-0.patch" >From 1dd799c08384b21e7f441a8b4731a0e02d5e28d9 Mon Sep 17 00:00:00 2001 From: Manuel Traut Date: Tue, 17 Jan 2023 09:30:27 +0100 Subject: [PATCH] menu: Ignore prompt variable if timeout is != 0 Since 739e8361f3fe78038251216df6096a32bc2d5839, a system with the following /boot/extlinux/extlinux.conf (which sets timeout to 50) immediately boots the first entry in the config without displaying a boot menu. According to the description, that should only happen if both prompt and timeout are set to zero in the config, but it also happens with timeout set to a non-zero value. Reported-by: Karsten Merker Signed-off-by: Manuel Traut --- common/menu.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/common/menu.c b/common/menu.c index 8fe00965c0..8eabcccc87 100644 --- a/common/menu.c +++ b/common/menu.c @@ -277,6 +277,9 @@ int menu_get_choice(struct menu *m, void **choice) if (!m->item_cnt) return -ENOENT; + if (m->timeout) + return menu_interactive_choice(m, choice); + if (!m->prompt) return menu_default_choice(m, choice); -- 2.39.0 --ustAX4xJFm54vaZH--