Message ID | ec9740ba65d81a7e60bd4e2fdc2d461adf112d40.1531170563.git.geoff@infradead.org |
---|---|
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 [203.11.71.2]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41Pdby3NTwz9rxs for <incoming@patchwork.ozlabs.org>; Tue, 10 Jul 2018 07:23:26 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=infradead.org header.i=@infradead.org header.b="FILGjbFP"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 41Pdby1NgVzDrTs for <incoming@patchwork.ozlabs.org>; Tue, 10 Jul 2018 07:23:26 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=infradead.org header.i=@infradead.org header.b="FILGjbFP"; dkim-atps=neutral X-Original-To: Petitboot@lists.ozlabs.org Delivered-To: Petitboot@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=none (mailfrom) smtp.mailfrom=infradead.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=geoff@infradead.org; receiver=<UNKNOWN>) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=infradead.org Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 41PdZJ3RFlzDrTg for <Petitboot@lists.ozlabs.org>; Tue, 10 Jul 2018 07:21:59 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=Date:Cc:To:Subject:From:References: In-Reply-To:Message-Id:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=mfWaTp0gd1w43MwYk+HFmjfPh0AVJ/0FyjhNwg3ykrw=; b=FILGjbFPUBdAlf74pTOgkOE1c u//208JCdFqA+rNjKi1NseN9s/g/ni9sYzlGHJ13uiVUVbkJ7vzE2HBzY5A/CIF9sMN2rUtcUflrF xJSRGU8D9P2SCXGDXi6oH7vyzB/+MgHTBupSPLg+tkkSA11Fxuj6QemWSSrQVifAzlOxgq3YXbGlH VjCD5G3YyHoYXINOYqo4tKGwyFrA2V5AsQZMfDPhhnY5rrRoWpEFzFxe8Aq0XpzrXjPc2GLf0Etu+ XXmNebzBFkY9bh/A8FamdRSUE2U3ARkiqKtAesi8lQLeFC95jClddlQAfICFtQBVEQo4+byldGRi4 i8NIJ5qcA==; Received: from geoff by merlin.infradead.org with local (Exim 4.90_1 #2 (Red Hat Linux)) id 1fcdbX-0001Re-I2; Mon, 09 Jul 2018 21:21:55 +0000 Message-Id: <ec9740ba65d81a7e60bd4e2fdc2d461adf112d40.1531170563.git.geoff@infradead.org> In-Reply-To: <cover.1531170563.git.geoff@infradead.org> References: <cover.1531170563.git.geoff@infradead.org> From: Geoff Levand <geoff@infradead.org> Patch-Date: Mon, 9 Jul 2018 13:57:53 -0700 Subject: [PATCH v1 06/10] discover/kboot-parser: Look in /boot To: Samuel Mendoza-Jonas <sam@mendozajonas.com> Date: Mon, 09 Jul 2018 21:21:55 +0000 X-BeenThere: petitboot@lists.ozlabs.org X-Mailman-Version: 2.1.27 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: Petitboot@lists.ozlabs.org MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: petitboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Petitboot" <petitboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org> |
Series |
[v1,01/10] docker: Add libfdt-dev
|
expand
|
diff --git a/discover/kboot-parser.c b/discover/kboot-parser.c index bf9c5eb..62512cf 100644 --- a/discover/kboot-parser.c +++ b/discover/kboot-parser.c @@ -145,10 +145,14 @@ static const char *const kboot_conf_files[] = { "/kboot.cnf", "/etc/kboot.conf", "/etc/kboot.cnf", + "/boot/kboot.conf", + "/boot/kboot.cnf", "/KBOOT.CONF", "/KBOOT.CNF", "/ETC/KBOOT.CONF", "/ETC/KBOOT.CNF", + "/BOOT/KBOOT.CONF", + "/BOOT/KBOOT.CNF", NULL };
Other parsers look in /boot for config files, so add it to the kboot parser. Signed-off-by: Geoff Levand <geoff@infradead.org> --- discover/kboot-parser.c | 4 ++++ 1 file changed, 4 insertions(+)