Message ID | 1518055632-11462-6-git-send-email-brett.grandbois@opengear.com |
---|---|
State | Accepted |
Headers | show
Return-Path: <petitboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zcM6l3SPxz9rxj for <incoming@patchwork.ozlabs.org>; Thu, 8 Feb 2018 13:08:15 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=opengear.com header.i=@opengear.com header.b="CRNRNwwJ"; dkim-atps=neutral Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3zcM6l1cNhzF16w for <incoming@patchwork.ozlabs.org>; Thu, 8 Feb 2018 13:08:15 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=opengear.com header.i=@opengear.com header.b="CRNRNwwJ"; dkim-atps=neutral X-Original-To: petitboot@lists.ozlabs.org Delivered-To: petitboot@lists.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=opengear.com (client-ip=104.47.42.61; helo=nam03-by2-obe.outbound.protection.outlook.com; envelope-from=brett.grandbois@opengear.com; receiver=<UNKNOWN>) Authentication-Results: lists.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=opengear.com header.i=@opengear.com header.b="CRNRNwwJ"; dkim-atps=neutral Received: from NAM03-BY2-obe.outbound.protection.outlook.com (mail-by2nam03on0061.outbound.protection.outlook.com [104.47.42.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3zcM625zhbzF16R for <petitboot@lists.ozlabs.org>; Thu, 8 Feb 2018 13:07:38 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=opengear.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=m6ZKSDW2CbgUpjPPYPmpFsXChAkYtPTLxqt84pyUXBk=; b=CRNRNwwJAaZTYCPrmjMUU5VtWd507jWr6gySKntojTfv3QizmfmGnZwIh11bnAemwaaJQf/E+Go35apw8TX3TC85hyhpDDG+jCd5fPIfxONwMthFHJ4PobCQgvXB9VXnHYKvcOxTfkYum92QRW336JlJzJWpruEBl1Bkmt3XpR4= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brett.grandbois@opengear.com; Received: from opengear.com (59.167.150.161) by SN6PR1501MB2061.namprd15.prod.outlook.com (2603:10b6:805:e::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.464.11; Thu, 8 Feb 2018 02:07:32 +0000 From: Brett Grandbois <brett.grandbois@opengear.com> To: petitboot@lists.ozlabs.org Subject: [PATCH 5/7] grub2/grub2: add Yocto paths to default grub2 conf search paths Date: Thu, 8 Feb 2018 12:07:10 +1000 Message-Id: <1518055632-11462-6-git-send-email-brett.grandbois@opengear.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1518055632-11462-1-git-send-email-brett.grandbois@opengear.com> References: <1518055632-11462-1-git-send-email-brett.grandbois@opengear.com> MIME-Version: 1.0 X-Originating-IP: [59.167.150.161] X-ClientProxiedBy: SYXPR01CA0079.ausprd01.prod.outlook.com (2603:10c6:0:2e::12) To SN6PR1501MB2061.namprd15.prod.outlook.com (2603:10b6:805:e::20) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5eda3a10-29e4-4b42-6764-08d56e98b6f4 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:SN6PR1501MB2061; X-Microsoft-Exchange-Diagnostics: 1; SN6PR1501MB2061; 3:3u6WYcDp95KvdZ2c8GzAzlHjKRSD5oKyDzi0Il7I23mG6evK4Aj0yK8xT0PasiuOkjEYw8sr/5Ez7rjWxrQjvfqCU7CKD7bXraOGyBa8sxnfnQr9LNr00oWzrZeMjestF8HveygFOV32jpl77TNFJjtfUMN1VyyzIXOEGe0/jJf873Cre0XVWFR7qRjEs8G0WkjKLm3Ggt9CdJSMHhrs93tBohuisFHKa0zY2cAfHjCEnzsZDHURQRA8Dgx4oPUn; 25:yce9rfmcNFmcVsTJouSSjOZBYm2aapBOGzfmlxerX0AuAMJ1M5K7PN+CAp3yGPFqghGPbkX1jkmu2fw5AQi8qcjSoHw8CEz06Jef9y03lKz3LzmcLY6p/RlIu+M1+KC1OfCT15fu8D1sRBz7tncJHnKRfHy8X7oAu98eXlaDynZeBrpiqt/wLHgwDoakA/7poSbPy8F5v0Ui+lN6cMAkIwrDow1Dppa/7mWOwpdhUzWH2XqfKWBsjJlV6IZkE5h+OXfugjXLJlNN0mfag1j0OsEuQDm9y+JLJTk8Pf/RR3zf7rknkUSRa9hbxdPKDMAdEeuC+j8Gr/5BdzIkSsvjNg==; 31:we6jFTRfz27+pGmcd/D71iflx28t4M8CJTWYKpvE2YtjGG7P19XVfBCV5hst/Zzej61fYzuQ5cCRjZObp/Ih1NwOtcr+gYloWDroUr6O0hO/GqHYj9Rd7HysYu9JqjA9m/lmyBugqIrSdbhXOR/zFSmS2W/QB7YE9EuHGv/AQ9WOYxCAUmzv5dRGklvMG/3jK956TD2iLgq0cj+Gbvqzc7S5Db7PRid+O9coiI1rlqM= X-MS-TrafficTypeDiagnostic: SN6PR1501MB2061: X-Microsoft-Exchange-Diagnostics: 1; SN6PR1501MB2061; 20:wHc5E6JY0UvhCX+5X86psN12YaHBqYet9vtO/l+KDnhFGUZOdjvTTIKCPjn8RCMDL1tj8pkJlZ8Uz+nDaRzYEeycR8EBPUvfkAmb8EtL8MpZhyZVmG8ec9OkLW3IpjXdE5bO1Y6mDZDIR2QgAhrUV4Iw0j8nX0SEwzwuBt5TR54=; 4:cp92Rtwo7cxHrW0ce1eAbX+jpQAJ6yg+uaoY3dvF91fdruvOYRGs28cKJq0lbtbX3ZXKCzN2eXE1JBclIe9isbQGhtsmfsWK0vQK/xgcarIPLQQwPEtqz4fa+2c434uV+4Tr5t6IIranWDy7w2+0j1/PX4e065C4nSibYctgpR39/eDgI+kzZN5e0HeaLqqdK3mMuAzNdUqi/tkSOjmYm1sh8a62sik3GHja5Ly+IHSP/OzzTYhodt6wf3n9qIz1xk4aNQd7Sc+u7s56DP0bYA== X-Microsoft-Antispam-PRVS: <SN6PR1501MB20618953285B42F671F39D8982F30@SN6PR1501MB2061.namprd15.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040501)(2401047)(8121501046)(5005006)(93006095)(93001095)(3002001)(3231101)(2400082)(944501161)(10201501046)(6041288)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123562045)(20161123560045)(20161123558120)(6072148)(201708071742011); SRVR:SN6PR1501MB2061; BCL:0; PCL:0; RULEID:; SRVR:SN6PR1501MB2061; X-Forefront-PRVS: 0577AD41D6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(366004)(346002)(39380400002)(376002)(396003)(39840400004)(199004)(189003)(2351001)(76176011)(2361001)(7736002)(478600001)(50466002)(6916009)(2950100002)(50226002)(55016002)(6666003)(2906002)(21086003)(97736004)(6116002)(48376002)(3846002)(69596002)(36756003)(106356001)(68736007)(53936002)(16526019)(26005)(86362001)(33026002)(105586002)(386003)(25786009)(316002)(186003)(16586007)(66066001)(81156014)(8676002)(47776003)(8936002)(7696005)(52116002)(305945005)(51416003)(81166006)(5660300001); DIR:OUT; SFP:1101; SCL:1; SRVR:SN6PR1501MB2061; H:opengear.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: opengear.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN6PR1501MB2061; 23:H63+bszmHVIHB6SiG8G3/ht+xIDJZHlm6MTaeMW?= RFJmFeogEnDoA0HRANE25K8NGJDixbwXiMHzQeCv+Etnc5LgoxuWvpLfdNT70qeAfCNWxH1Up1NWHFYGg+oEceKSAYLvory+2gmh4vN2/vZGBG5xIbArls7nymURqHRNCZ8sGExiwpPFiP5HjiFh+uWz4rrrCxgMWMu+tEh8uuKW2cW5ZMHRaZEpRQFzy7rAjvXAfOIeY1i66rNs+D4hiVDyS6Fw8fRIFPq3yCQpZty36XFITz81eLna/1SszohpLWDCkqXTSl6D3nR7kuEcWAuCrcA+4bRse3oH/0CJ1TegvXZz7OUvwd3G2FkCJQfZSlq8Q7pX2Rj3sidJpfLkgZ7LIUiOyV2NxgxH+hK+m2Ca6GZA6CTZKU1vxdHJ922D+yZSs2S7gR23RludAlBBgHVAM6IuS3U0ftn1MqHZF25xcuE3N92ifdnoXs8zhTmyzQdlWcxqCofl0+4BY1QjkslhUf7KX3vnF330+Mf1xRXawU77pMsDtAh8oyrnIl3QSQDlQ74HbcwqtLAGsG/QfZauEfSMiW8PNIsTDxFjhgv6wng5bs9WWPbV1m3Ndd0/LXFOjLGYZ6REir+XTuotm/RZ9XEPc/exKNb+fdoAbmfOYIP+P7jVzl3WmGn+KjOMXXJN/Y0n9gZCD/HfH4eJQtN1suAj0ohbU+o952nbCVXLY6GiJ9NowiJtLAX+qSut1z6oaebMzKkuNL7eBd7gHB6UCaumY+YnQ1pYLX2e4W2ipDloukFPs4oBQR1BK94n0XrTGNO9wBWtL2j2k+71e50cChhwBHyV7uJ0eDhC0b7DxJOc6HZtys7DYlIqUFDgy7fERrmqNUpzRyM1RSVdJ6gXyReUScs26QFFhGG2Jxs1Jwa9EJicGeiaZ9UW+WNgk1AWX3D4o8ly2QdCfQeeSNv1OORHznrUjrkG5TJiifUJfN6NfShUyJinrp6SCk5GXrV2PhGRTGebzP8i+mN26EHWZLERPouDuGc1vgyerJG8zZA95+MpyjoF5VHX6BgWFxCmcAHcB+kJDNGMTL9Ka3yG3CZV3tDgyHySWPqY7/RwVazvimgH+mc9X0IzRMV6fum2jEjk3w2i5gbSYJMYCIMCca8bRVxKvaz66BxcRW7ld7Q== X-Microsoft-Exchange-Diagnostics: 1; SN6PR1501MB2061; 6:ofnWF5YVyL+NOaVOA8SgCWEFGMr54zHHmF3u9SJbSmHaS+dAFgJTQhb7ux0I0NoZ7Z+2y2FwN07lcp0R7k84ID4e/EkyCNmArs5FL9j2jVLkw0G8AK8QKRw7ZwJgNntAsph4RYcGyInO8AhaKZYWjlCXVyWbLSxcUnXHEVzq9f5wSOjpvMcSANw+QYnSXY1oiyNRsQXSI2y/FAIue82xWZOrddFO+MpO5vHSrtT5rGygiTJ5DywZ9YXdkkvmTpdS9aA9ElkQnghpb2Q2sM3iElJZ9mdRJL10qunOpVZgwBG4jcb1Ck3/l5miHeV2rnu9XHF6HK1ua1WgWMi0M1Y/tsx0V/wHggJeYj3+lxiHDkU=; 5:UzrLUDuv5WJxWv0YbaCwI9/YrLPd0fZjiCLW77X3pSCA08jJ40E4AW8AiIHdgwC3WlvKRND8xIWea596wY9QXdaqeodapcWjvOVcrRQDrw2fs9S6ANz5bC8Z/LeuCKkBeeBo0HaZ08MjYy26/e9Ibvzoekbl40ri7/UeaMUJ1A4=; 24:Ew7gsrqm+FU80h21o3Cj6BIQv5UW64yWwxxq+tFWTZ/afaLE2Uy22TtSZbHi/2b6zMWTQ2pQjvXgqtI5wQ4Fl8exuXc+W5/+vNTnnbdOrhQ=; 7:0NbCy/YonsQBafsybxOi/k498EBfYKg1R0bwZ9Ho0Xt3tkggefoOa4OwSwgcTkbxKz6/g9qRx4dD88MS1d+ORFbiZXefD5FfIS314EX81hQnJhLU+N3uZkTQoAE1pUcQ/Prmb9ZQ0EKZeEivPXJcokjEX5h58RfZjluQFQsMC+46FRcrhtPmzTv1CBgZh5nLxNtkbC1IXjBXWlSq1hp9TKKcYo9wTst9ju00k4smn7oOSHXF7bwWlJspvSh/5VbX SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: opengear.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Feb 2018 02:07:32.0879 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5eda3a10-29e4-4b42-6764-08d56e98b6f4 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a6251c26-d21f-4164-a225-1f4eaebf5f9a X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR1501MB2061 X-BeenThere: petitboot@lists.ozlabs.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: Petitboot bootloader development <petitboot.lists.ozlabs.org> List-Unsubscribe: <https://lists.ozlabs.org/options/petitboot>, <mailto:petitboot-request@lists.ozlabs.org?subject=unsubscribe> List-Archive: <http://lists.ozlabs.org/pipermail/petitboot/> List-Post: <mailto:petitboot@lists.ozlabs.org> List-Help: <mailto:petitboot-request@lists.ozlabs.org?subject=help> List-Subscribe: <https://lists.ozlabs.org/listinfo/petitboot>, <mailto:petitboot-request@lists.ozlabs.org?subject=subscribe> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: petitboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Petitboot" <petitboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org> |
Series |
Resubmit: Yocto and musl libc fixes, syslinux parser support
|
expand
|
diff --git a/discover/grub2/grub2.c b/discover/grub2/grub2.c index 3474616..f62ccdd 100644 --- a/discover/grub2/grub2.c +++ b/discover/grub2/grub2.c @@ -21,6 +21,7 @@ static const char *const grub2_conf_files[] = { "/boot/grub/grub.cfg", "/boot/grub2/grub.cfg", "/boot/grub/menu.lst", + "/efi/boot/grub.cfg", "/GRUB.CFG", "/MENU.LST", "/GRUB/GRUB.CFG", @@ -28,6 +29,7 @@ static const char *const grub2_conf_files[] = { "/GRUB/MENU.LST", "/BOOT/GRUB/GRUB.CFG", "/BOOT/GRUB/MENU.LST", + "/EFI/BOOT/GRUB.CFG", NULL };
Signed-off-by: Brett Grandbois <brett.grandbois@opengear.com> --- discover/grub2/grub2.c | 2 ++ 1 file changed, 2 insertions(+)