From patchwork Fri Aug 19 05:21:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Mendoza-Jonas X-Patchwork-Id: 660704 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3sFrtb1qRLz9t1d for ; Fri, 19 Aug 2016 15:21:59 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=mendozajonas.com header.i=@mendozajonas.com header.b=z/qVsqo2; dkim-atps=neutral Received: from ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3sFrtZ71chzDr5d for ; Fri, 19 Aug 2016 15:21:58 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=mendozajonas.com header.i=@mendozajonas.com header.b=z/qVsqo2; dkim-atps=neutral X-Original-To: petitboot@lists.ozlabs.org Delivered-To: petitboot@lists.ozlabs.org Received: from mendozajonas.com (mendozajonas.com [188.166.185.233]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3sFrtW3HdZzDqd7 for ; Fri, 19 Aug 2016 15:21:55 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=mendozajonas.com header.i=@mendozajonas.com header.b=z/qVsqo2; dkim-atps=neutral Received: from skellige.ozlabs.ibm.com (unknown [122.99.82.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: sam@mendozajonas.com) by mendozajonas.com (Postfix) with ESMTPSA id E571A140055; Fri, 19 Aug 2016 13:21:51 +0800 (SGT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mendozajonas.com; s=mail; t=1471584112; bh=eanv+w/hJbY9gKmx/Jt0Xu9Cb+cPuwFHMGhFk1Cdhr8=; h=From:To:Cc:Subject:Date:From; b=z/qVsqo2qb0rEf1G6Pt2d575mWeZlrTXUBk3vkMcf+6MmVub36OLymOCp4ym7r2eY 4ppKEQvZZhswXFaIV7+2OpsMfjF9Y0VeI+M3hMP6z5E+tVqOCzjKyIZiQEWbBVNk3D TXqcLNq1kNsbK1ltjMdGfaynNGfm5hWeszuqoUZ0= From: Samuel Mendoza-Jonas To: petitboot@lists.ozlabs.org Subject: [PATCH] discover/boot: Always pass --append to kexec Date: Fri, 19 Aug 2016 15:21:40 +1000 Message-Id: <20160819052140.8004-1-sam@mendozajonas.com> X-Mailer: git-send-email 2.9.3 X-BeenThere: petitboot@lists.ozlabs.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: Petitboot bootloader development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Samuel Mendoza-Jonas MIME-Version: 1.0 Errors-To: petitboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Petitboot" If we don't specify command line arguments for the next kernel, kexec will add the contents of /chosen/bootargs if present. This is unintended and not obvious to the user, so explicitly add append="" to the kexec arguments if we have none to add instead. Signed-off-by: Samuel Mendoza-Jonas --- discover/boot.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/discover/boot.c b/discover/boot.c index ba6ce25..04e7a54 100644 --- a/discover/boot.c +++ b/discover/boot.c @@ -77,12 +77,10 @@ static int kexec_load(struct boot_task *boot_task) *p++ = s_dtb; /* 4 */ } - if (boot_task->args) { - s_args = talloc_asprintf(boot_task, "--append=%s", - boot_task->args); - assert(s_args); - *p++ = s_args; /* 5 */ - } + s_args = talloc_asprintf(boot_task, "--append=%s", + boot_task->args ?: "\"\""); + assert(s_args); + *p++ = s_args; /* 5 */ *p++ = boot_task->local_image; /* 6 */ *p++ = NULL; /* 7 */