From owner-freebsd-i386@FreeBSD.ORG Wed Oct 4 12:40:18 2006 Return-Path: X-Original-To: freebsd-i386@hub.freebsd.org Delivered-To: freebsd-i386@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2083F16A4AB for ; Wed, 4 Oct 2006 12:40:18 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 92EEC43D5D for ; Wed, 4 Oct 2006 12:40:12 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k94CeCTd085322 for ; Wed, 4 Oct 2006 12:40:12 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k94CeCRB085321; Wed, 4 Oct 2006 12:40:12 GMT (envelope-from gnats) Resent-Date: Wed, 4 Oct 2006 12:40:12 GMT Resent-Message-Id: <200610041240.k94CeCRB085321@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-i386@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Alexandre Belloni Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EBA1016A416 for ; Wed, 4 Oct 2006 12:30:35 +0000 (UTC) (envelope-from alexandre.belloni@netasq.com) Received: from netasq.netasq.com (netasq.netasq.com [213.30.137.178]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7899643D7E for ; Wed, 4 Oct 2006 12:30:27 +0000 (GMT) (envelope-from alexandre.belloni@netasq.com) Received: from [10.2.0.2] (unknown [10.0.0.126]) by netasq.netasq.com (Postfix) with ESMTP id 22EA639E24 for ; Wed, 4 Oct 2006 14:30:25 +0200 (CEST) Message-Id: <20061004123030.GA6847@netasq.com> Date: Wed, 4 Oct 2006 14:30:30 +0200 From: Alexandre Belloni To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: i386/103972: [boot] boot loader doesn't display right /boot.config parameters X-BeenThere: freebsd-i386@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Alexandre Belloni List-Id: I386-specific issues for FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Oct 2006 12:40:18 -0000 >Number: 103972 >Category: i386 >Synopsis: [boot] boot loader doesn't display right /boot.config parameters >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-i386 >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Wed Oct 04 12:40:09 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Alexandre Belloni >Release: FreeBSD 6.1-STABLE i386 >Organization: Netasq >Environment: System: FreeBSD alexandreb.netasq.com 6.1-STABLE FreeBSD 6.1-STABLE #11: Fri Aug 11 14:04:23 CEST 2006 root@alexandreb.netasq.com:/usr/obj/usr/src/sys/GENERIC i386 >Description: The boot loader won't display all the parameters present in /boot.config because the parse() function will alter the string before displaying it. >How-To-Repeat: Put more than one parameter in /boot.config >Fix: Duplicate the string before displaying it. --- sys/boot/i386/boot2/boot2.c Tue Oct 3 18:00:22 2006 +++ sys/boot/i386/boot2/boot2.c Wed Oct 4 14:20:52 2006 @@ -252,10 +252,12 @@ fsread(ino, cmd, sizeof(cmd)); if (*cmd) { + char cmddup[512]; + memcpy(cmddup, cmd, sizeof(cmd)); if (parse()) autoboot = 0; if (!OPT_CHECK(RBX_QUIET)) - printf("%s: %s", PATH_CONFIG, cmd); + printf("%s: %s", PATH_CONFIG, cmddup); /* Do not process this command twice */ *cmd = 0; } >Release-Note: >Audit-Trail: >Unformatted: