| Message ID | 1517863234-22113-6-git-send-email-brett.grandbois@opengear.com |
|---|---|
| State | Superseded |
| 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 [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zZzyn5xM9z9sR8 for <incoming@patchwork.ozlabs.org>; Tue, 6 Feb 2018 07:41:37 +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="IYIGJUp3"; 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 3zZzyn44b8zF0sd for <incoming@patchwork.ozlabs.org>; Tue, 6 Feb 2018 07:41:37 +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="IYIGJUp3"; 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.38.57; helo=nam02-bl2-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="IYIGJUp3"; dkim-atps=neutral Received: from NAM02-BL2-obe.outbound.protection.outlook.com (mail-bl2nam02on0057.outbound.protection.outlook.com [104.47.38.57]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3zZzy4605CzF0sL for <petitboot@lists.ozlabs.org>; Tue, 6 Feb 2018 07:41:00 +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=IYIGJUp3eugCgzVI1djImRR1GcyfDNVlxC9wlOziN8XoS2P3YTiL/cQy3wYba+hWFPBWR3eEcVCbht83guzEfILUry95/S/rRFYKV/Ezi3Nzc6QV/muQFbh3KqLNEDkfGSgLaSQQLf//aoD2PCPkjDSji0q2XGdGTthM5JLU54M= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brett.grandbois@opengear.com; Received: from opengear.com (59.167.150.161) by MW2PR1501MB2060.namprd15.prod.outlook.com (2603:10b6:302:c::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.464.11; Mon, 5 Feb 2018 20:40:54 +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: Tue, 6 Feb 2018 06:40:32 +1000 Message-Id: <1517863234-22113-6-git-send-email-brett.grandbois@opengear.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1517863234-22113-1-git-send-email-brett.grandbois@opengear.com> References: <1517863234-22113-1-git-send-email-brett.grandbois@opengear.com> MIME-Version: 1.0 X-Originating-IP: [59.167.150.161] X-ClientProxiedBy: SY3PR01CA0142.ausprd01.prod.outlook.com (2603:10c6:0:1b::27) To MW2PR1501MB2060.namprd15.prod.outlook.com (2603:10b6:302:c::24) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3a873d2a-4ebd-462f-98cf-08d56cd8c14a X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:MW2PR1501MB2060; X-Microsoft-Exchange-Diagnostics: 1; MW2PR1501MB2060; 3:Aq91KPSbUc9L/0Dzm0LoeeBAIZw/KcWkr+Ssj0Uq8X+rjXM8xJxBBQPAGklu3J1aor4WmjB6a5BS0ADQX9Qm7S28UCGx8MJxFlUzIKmf+GfIBRV7ZAaaosDwd0x3rVv7hPL+/h5Ulw4HA42oJROeXRscoLhfbIXKA4aySVCjKTD4v6wKvC/acTouQTYh55ZycZG+sk4DV1+V9ikSyh5teqvxy36otsSUrfC/hct7SuHzt92teNIX6XJZexM9Xc1p; 25:N2oZjQF5UQX9tHZzXRMx2naR8+3XTObqEEBlIH1oGCD44wdkXcduyOiiJmuHv0ILF1WsQH0BtgOxZ3uSCpbLtrQ9jNQfyIxzb3zZaFPKpme9Ddz2He2zrAwP0GpNJGHfdOP3gCo6Qo3p/uSvYgUYwl0+YSdKtCGRC7nHnKTaM7un8EJrLgmZWCy5/kCF/xinAsZmtZqPf6gBO4lVo4qdAAbox5FK0WbhsR6Dt3QT9tAf2cj89uJP3AIyor7+6L+2zAQtAx78Mm9L/aixM2kbKHUoF7qeur1tCp9PoATZP77v3uMYuaI03SYBPmrElFbugwRFGAthTnRcbkEWy1NM6g==; 31:uj8VpnbM7jalr7qPN7EDFIKbyWk6fxpOvLDF8MIaapXBNV+uRbkCFngdMPwqmtmEFgtv1OhpD2aj9IewDXOdYgjR814aNwi99hDJt+epv1b7mkdM5wSwLObb0ggZ2CSSnL4KVatPLeih2tWZ/6MO9qbnuFCHaGHSTOwqkfWU/ADIj5bOjs4nALX/t8vzYG2yO20s2Ele6IgkYB8eithRUd+X/YIqGtGHzpJ028VZj+Y= X-MS-TrafficTypeDiagnostic: MW2PR1501MB2060: X-Microsoft-Exchange-Diagnostics: 1; MW2PR1501MB2060; 20:l9SWXQBEdakEJseprEDtFfvT86lNcfEeVJmDqPH0q6WUi8+YiRVJN74Py54CXAxxnKjlyYITEnW3TmoTLCenwHRHYBNc2xHCdSLImax9Rmp6pIMKWIHYkoouI9u18TxpG+glhhQB0boMY8qKYiYMANwJ+f4Ldq07F/fKWxM0nW4=; 4:ZooN6a93e8Z/YbBTcjhxZG7BTv8xf4tAzKfx/Ia1rW3LPQZTTLt1gNnKifnwXClDS4q6K8xEXhslGzqGiRCErytJUVCopxe6sraRtHcvqv4dl+9i8NUwQLe7WptL3DNLuVe6UZaPrDqyWgciL0BOZPuqsrj/4pODUICeuT19t8ONEQ2zE+1AK360INfIaxkn6hV85O2xuOOzm2DLaGZ6oYPjVVYxI+OGugsoNnubnUKnvCkjStA8nbrgZm9aErFEr8/VWSzQLIPIxOuC65D2vg== X-Microsoft-Antispam-PRVS: <MW2PR1501MB2060062EC96C575064342C9882FE0@MW2PR1501MB2060.namprd15.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040501)(2401047)(5005006)(8121501046)(3002001)(3231101)(2400082)(944501161)(10201501046)(93006095)(93001095)(6041288)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123564045)(20161123560045)(6072148)(201708071742011); SRVR:MW2PR1501MB2060; BCL:0; PCL:0; RULEID:; SRVR:MW2PR1501MB2060; X-Forefront-PRVS: 0574D4712B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39380400002)(376002)(366004)(39840400004)(396003)(346002)(199004)(189003)(16526019)(6916009)(5660300001)(7696005)(50226002)(305945005)(52116002)(186003)(76176011)(7736002)(51416003)(26005)(8676002)(6666003)(33026002)(68736007)(107886003)(66066001)(2351001)(69596002)(36756003)(2361001)(86362001)(3846002)(6116002)(106356001)(316002)(21086003)(48376002)(25786009)(478600001)(50466002)(16586007)(55016002)(2906002)(47776003)(53936002)(8936002)(386003)(81156014)(4326008)(2950100002)(105586002)(97736004)(81166006); DIR:OUT; SFP:1101; SCL:1; SRVR:MW2PR1501MB2060; 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; MW2PR1501MB2060; 23:Ls2eMNHlPW3NvOb5C+fBQidaKqHIJr8th5QUyPh?= SnEe1fGm+w/YoeKDXawQjbcO0akqs65Kqf6gYF/Or1E9nOyeDKzKGwQCYDAwhyMlmKDn8oypS4zdFVecwR4tETbJdui7kb5vgIT0D0CzE6bTlFHkN5T1mWNYB/nFe+PEKvXtJ32H1zlxjUkUMOO0ZueueFWlpEclBkKOE9CdRrC5b5uaISFH8jeb24olRnTTrUeoLM+wxfyCFszSgcZ8yt89QFUYScUcBT7lKlc1BImIdSKT7PkdDxFD6NVOfKXAMZ+TjPg4m1qfUljNTGTmeeYE5LfEwzvWAeYlTvr95EC5vhzOY4eLh930KpDtM/8Xz6UWXShfW4S0OnNC+LltTEes6pHTX2/L4GFLnT+9WXoUxpebrFr5s4AFmluFxTbfCKTjWqkiXb/o4oec9W+yw/plBncBWkZuYG0qFJQ9QF7xJ4rG9QFW7aaIuVlH8quVBI3n1M1hk3/+IdoopNGvPKQsu2+l463DQ1OMpAaOuNJbh+vfsuJ5xNa50MFQq7QdimBN2VJzNmb6PHzZKa+o8WTjMYueWjEODhgUW7XmZDQbiq/3XNkzRZroAZBPbXh2Wl534BrVxOmITaRa+lS5uwUr6QRFUYSQG40tsWJD6PqNCEaUmYovZa03ia2G+Tc51qToPoqlT0NDMslm86yiAR3whD8H4Qp50rgCt643ltRpWD4ZN72wvJjHJw5CF9a7Vsp43/maAB7zGeohHPfXWgFvfjY3gHGg44unXp3zR2FkaPg1z8p8nxjme+ZEREUermdG+Ue6/00Z+z/uRMra4aMOuBNtuy07yCuvBUarCI9fA2p5UEsoB7wNnLKJRuVEWhwGz2A050nq6YoauzEWX1k7lFxi30ElFsSb3guUVBaDxgljYYwiA5xEGOnHuxQPpnW9GEtUPq1JFqMbUZ4vuHMfmbq8vfiOTm212XjsbbcXKZkV67ov/gVTgxD7yqB69+fdOsFuDOA66fu9yLw30KGhGszFH8WkOV3qvJlQ4IqYNmEPRiJRFRRSw+xjgSTNDJIAm0S6H2QGmQnJq4EkWTRnLTcdxU64qYOemveY25lBquOVLAluKnTBa55W63W2Wu0kuxHyRAPvId14MqcOGSYO7KHd2jg7gjxD9zmuNOaTAIGLTgh07nSwqqdfVkZPpzwwCbGQjRvGSb4KSqOK/oqwr X-Microsoft-Exchange-Diagnostics: 1; MW2PR1501MB2060; 6:fEox+yG+b8Vl+jmAzZHIE1g1xcwH3Eal9kl91sKg8W5zfPqbGVnNPTUEY3CSbD1bRzrKsIF0MVnGWFYVHsWzT1Q1bopcbCbZnLNdrXbRQALzcFbUrXylgLKL+pQAEpl+Bm58A38p70TEm7qmSPsHGh8c/vQfMEdcldvUKnoIXMl5+Exnr+kjsqmqwt+TyyAn9e0jOcDF7ULHv17GpuoXhcrWmMetddgZis31YGIzpxbSgckJJOU4AzX49XU38/5+KVevU5fz8rjhptmUg7zGaOmm2DFnAa+GeUbP694cJghRLc54tsmpDHKXcstqwzmoUKrRaxTWFVHIkW8FccJNkKsVMg+14bW2JqyRuiuNsIE=; 5:vnED6VQYR64esF8hYb9U/SR4XltDYf3W6hKb7gE2JAgLHrV8Q9kqPpbD6pBhRXKjXnbyRM9Jfr07vt+RvfgsJcLED/pKck+jZtkeYBhFa3L0rc7BJPFLvnUOle3xwsolPidqaD2h1zOgyVJZwKDcX/R8jKgr7e6wgQrLKSP4c3k=; 24:aPsLzQECBCzom+nj3yB7uNWw03xJb6Estrs2+qR80aoqu923/IS83EoRyVg/KkhrR2t5Nh8+GKtXPf119UQ8JdekXYDHMATrTWYxb9omqiI=; 7:w32iC45V1flbYzsjcD4IPFgjtHs2lVmTeldIv2EAAs0h8cT8Ggo/cpG357btKqXOffkL2l6PMoOk0+IVQ9NytzAE8XzKGKa9FK/g7BdgoYdKkVX93oR03GERH2TaLEyzkSjc9LzACZvJmq0JtUT6HNhUv7gLW4F+tzCP9erCxLesyuzooBaJ2RK5A2D8GNllUStk5tufbRX8jf1U4iM9wuH2a8bHirhiad9Do30Po+Dr3/V2bLtiVzI32GY4NEMp SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: opengear.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Feb 2018 20:40:54.6920 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3a873d2a-4ebd-462f-98cf-08d56cd8c14a X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a6251c26-d21f-4164-a225-1f4eaebf5f9a X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR1501MB2060 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> Cc: platypus-sw@opengear.com 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 |
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(+)