From owner-svn-src-head@freebsd.org Sat Mar 26 12:19:28 2016 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 50C82ADD4F4; Sat, 26 Mar 2016 12:19:28 +0000 (UTC) (envelope-from mmel@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2228C13CA; Sat, 26 Mar 2016 12:19:28 +0000 (UTC) (envelope-from mmel@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2QCJRHc075198; Sat, 26 Mar 2016 12:19:27 GMT (envelope-from mmel@FreeBSD.org) Received: (from mmel@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2QCJRqX075197; Sat, 26 Mar 2016 12:19:27 GMT (envelope-from mmel@FreeBSD.org) Message-Id: <201603261219.u2QCJRqX075197@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mmel set sender to mmel@FreeBSD.org using -f From: Michal Meloun Date: Sat, 26 Mar 2016 12:19:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r297292 - head/sys/arm/arm X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Mar 2016 12:19:28 -0000 Author: mmel Date: Sat Mar 26 12:19:27 2016 New Revision: 297292 URL: https://svnweb.freebsd.org/changeset/base/297292 Log: ARM: Fix bug introduced in r297286. - don't put command line without guard to kernel environment. - kernel environment delivered from ubldr must have absolute precedence. Modified: head/sys/arm/arm/machdep.c Modified: head/sys/arm/arm/machdep.c ============================================================================== --- head/sys/arm/arm/machdep.c Sat Mar 26 12:11:46 2016 (r297291) +++ head/sys/arm/arm/machdep.c Sat Mar 26 12:19:27 2016 (r297292) @@ -1049,13 +1049,10 @@ cmdline_set_env(char *cmdline, const cha /* Test and remove guard. */ if (guard != NULL && guard[0] != '\0') { guard_len = strlen(guard); - if (strncasecmp(cmdline, guard, guard_len) != 0){ - init_static_kenv(cmdline, 0); + if (strncasecmp(cmdline, guard, guard_len) != 0) return; - - cmdline += guard_len; - size -= guard_len; - } + cmdline += guard_len; + size -= guard_len; } /* Skip leading spaces. */ @@ -1833,7 +1830,7 @@ initarm(struct arm_boot_params *abp) panic("OF_init failed with the found device tree"); #if defined(LINUX_BOOT_ABI) - if (fdt_get_chosen_bootargs(linux_command_line, + if (loader_envp == NULL && fdt_get_chosen_bootargs(linux_command_line, LBABI_MAX_COMMAND_LINE) == 0) cmdline_set_env(linux_command_line, CMDLINE_GUARD); #endif