From patchwork Tue Jul 24 22:15:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geoff Levand X-Patchwork-Id: 948875 Return-Path: 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 41Zt4J53dWz9s2g for ; Wed, 25 Jul 2018 08:16:32 +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="kQjB0ueK"; 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 41Zt4J3WndzDrTQ for ; Wed, 25 Jul 2018 08:16:32 +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="kQjB0ueK"; 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=) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=infradead.org header.i=@infradead.org header.b="kQjB0ueK"; dkim-atps=neutral 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 41Zt3P60BHzDrJ7 for ; Wed, 25 Jul 2018 08:15:45 +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=kQjB0ueKIs0ZE8mQuke5dR+Lj huphaDxTOMsomhT+jY53dGQPA4twVDc6QU/BkUHI1ppcgg9hH/r0Rm9igrcJH7OiP7Of44aR/POMm sI1AeByrd8YHSxPtxoiUM8DnK9nsh1bxHsVhhRgGoCuVdJsnC5b4798FbPVTCCAniJ0t6c7rORf+2 K4nveWnkRgfSrxcpARYv+RMhX7vQvqSjEz7Yv5w6LV9p3Z/XJ8SRC8rBdpQf5Mc6tGnblCgGtK385 oNjvhbTiCwQ0EO+Rb4lXHXyPfq27QQ1xeQnDwGJWL25ecApOXMn+Q5nwCQZA5CPzSZ2jyTataZ03b wumiQPoBA==; Received: from geoff by merlin.infradead.org with local (Exim 4.90_1 #2 (Red Hat Linux)) id 1fi5am-0004jK-Eh; Tue, 24 Jul 2018 22:15:40 +0000 Message-Id: In-Reply-To: References: From: Geoff Levand Patch-Date: Tue, 24 Jul 2018 15:03:16 -0700 Subject: [PATCH v1 07/30] discover/kboot-parser: Look in /boot To: Samuel Mendoza-Jonas Date: Tue, 24 Jul 2018 22:15:40 +0000 X-BeenThere: petitboot@lists.ozlabs.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: Petitboot bootloader development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ge Song , Petitboot@lists.ozlabs.org MIME-Version: 1.0 Errors-To: petitboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Petitboot" Other parsers look in /boot for config files, so add it to the kboot parser. Signed-off-by: Geoff Levand --- discover/kboot-parser.c | 4 ++++ 1 file changed, 4 insertions(+) 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 };