From patchwork Sun Apr 11 04:06:57 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Blanchard X-Patchwork-Id: 57976 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on bilbo.ozlabs.org X-Spam-Level: X-Spam-Status: No, score=-3.5 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.3.1 X-Original-To: tony@bakeyournoodle.com Delivered-To: tony@bilbo.ozlabs.org Received: from bilbo.ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id 65CD8B7E21 for ; Sun, 11 Apr 2010 18:48:36 +1000 (EST) Received: by ozlabs.org (Postfix, from userid 1010) id 03258B7D21; Sun, 11 Apr 2010 14:07:31 +1000 (EST) Date: Sun, 11 Apr 2010 14:06:57 +1000 From: Anton Blanchard To: yaboot-devel@lists.ozlabs.org Subject: [PATCH 10/10] Fix incorrect comparision in get_params Message-ID: <20100411040657.GG11751@kryten> References: <20100411040149.GA3142@kryten> <20100411040226.GB3142@kryten> <20100411040256.GC3142@kryten> <20100411040321.GD3142@kryten> <20100411040427.GA11751@kryten> <20100411040448.GB11751@kryten> <20100411040521.GC11751@kryten> <20100411040559.GD11751@kryten> <20100411040615.GE11751@kryten> <20100411040634.GF11751@kryten> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20100411040634.GF11751@kryten> User-Agent: Mutt/1.5.20 (2009-06-14) X-Mailman-Approved-At: Sun, 11 Apr 2010 18:48:32 +1000 X-BeenThere: yaboot-devel@lists.ozlabs.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Technical and development discussion regarding yaboot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: yaboot-devel-bounces+tony=bakeyournoodle.com@lists.ozlabs.org Errors-To: yaboot-devel-bounces+tony=bakeyournoodle.com@lists.ozlabs.org Content-Length: 1053 Lines: 24 We were comparing the first character of manualinitrd with a string. Not sure how this ever worked. Signed-off-by: Anton Blanchard Index: yaboot/second/yaboot.c =================================================================== --- yaboot.orig/second/yaboot.c 2010-04-11 12:05:09.000000000 +1000 +++ yaboot/second/yaboot.c 2010-04-11 12:06:28.000000000 +1000 @@ -981,7 +981,7 @@ int get_params(struct boot_param_t* para /* check if user seted to use a initrd file from boot console */ if (!definitrd && p != manualinitrd) { - if (manualinitrd[0] != "/" && (prom_get_devtype(defdevice_bak) != FILE_DEVICE_NET)) { + if (manualinitrd[0] != '/' && (prom_get_devtype(defdevice_bak) != FILE_DEVICE_NET)) { strcpy(initrdpath, "/"); strcat(initrdpath, manualinitrd); } else