From patchwork Mon Apr 13 01:11:43 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geoff Levand X-Patchwork-Id: 25876 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id 958BADE52D for ; Mon, 13 Apr 2009 11:16:49 +1000 (EST) X-Original-To: cbe-oss-dev@ozlabs.org Delivered-To: cbe-oss-dev@ozlabs.org Received: from hera.kernel.org (hera.kernel.org [140.211.167.34]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A53B3DE121; Mon, 13 Apr 2009 11:15:40 +1000 (EST) Received: from hera.kernel.org (IDENT:U2FsdGVkX1+FDiuZXneUfTCdlaE5Yo8vH7IyrpVMG5E@localhost [127.0.0.1]) by hera.kernel.org (8.14.2/8.14.2) with ESMTP id n3D1FYhH006248 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 13 Apr 2009 01:15:34 GMT Received: (from geoff@localhost) by hera.kernel.org (8.14.2/8.13.1/Submit) id n3D1FYvC006247; Mon, 13 Apr 2009 01:15:34 GMT Message-Id: <20090413011137.032062105@am.sony.com> References: <20090413011136.475152916@am.sony.com> In-Reply-To: <20090413011136.475152916@am.sony.com> User-Agent: quilt/0.46-1 Date: Sun, 12 Apr 2009 18:11:43 -0700 From: Geoff Levand To: Jeremy Kerr Content-Disposition: inline; filename=yaboot-empty-conf.diff X-Virus-Scanned: ClamAV 0.93.3/9226/Sun Apr 12 20:02:45 2009 on hera.kernel.org X-Virus-Status: Clean X-Spam-Status: No, score=-2.1 required=5.0 tests=AWL,BAYES_00, UNPARSEABLE_RELAY autolearn=ham version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on hera.kernel.org X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.0 (hera.kernel.org [127.0.0.1]); Mon, 13 Apr 2009 01:15:35 +0000 (UTC) Cc: cbe-oss-dev@ozlabs.org Subject: [Cbe-oss-dev] [patch 07/24] petitboot: Check if yaboot.conf files are empty X-BeenThere: cbe-oss-dev@ozlabs.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Discussion about Open Source Software for the Cell Broadband Engine List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: cbe-oss-dev-bounces+patchwork-incoming=ozlabs.org@ozlabs.org Errors-To: cbe-oss-dev-bounces+patchwork-incoming=ozlabs.org@ozlabs.org Add a yaboot parser check to ignore empty yaboot.conf files. Signed-off-by: Geoff Levand --- discover/yaboot-parser.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) --- a/discover/yaboot-parser.c +++ b/discover/yaboot-parser.c @@ -24,7 +24,12 @@ static void yaboot_finish(struct conf_co { struct yaboot_state *state = conf->parser_info; - assert(state->desc_image); + if (!state->desc_image) { + pb_log("%s: %s: no image found\n", __func__, + conf->dc->device->id); + return; + } + assert(state->opt); assert(state->opt->name); assert(state->opt->boot_args);