From alexandre.belloni@netasq.com  Wed Oct  4 12:30:35 2006
Return-Path: <alexandre.belloni@netasq.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id EBA1016A416
	for <FreeBSD-gnats-submit@freebsd.org>; 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 <FreeBSD-gnats-submit@freebsd.org>; 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 <FreeBSD-gnats-submit@freebsd.org>; 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 <alexandre.belloni@netasq.com>
Reply-To: Alexandre Belloni <alexandre.belloni@netasq.com>
To: FreeBSD-gnats-submit@freebsd.org
Subject: [boot] boot loader doesn't display right /boot.config parameters
X-Send-Pr-Version: 3.113

>Number:         103972
>Category:       i386
>Synopsis:       [boot] boot loader doesn't display right /boot.config parameters
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    jhb
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Oct 04 12:40:09 GMT 2006
>Closed-Date:    Mon Mar 17 18:05:26 UTC 2008
>Last-Modified:  Mon Mar 17 18:05:26 UTC 2008
>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:

From: Alexandre Belloni <alexandre.belloni@netasq.com>
To: remko@evilcoder.org, bug-followup@freebsd.org
Cc:  
Subject: Re: i386/103972: [boot] boot loader doesn't display right /boot.configparameters
Date: Wed, 4 Oct 2006 17:15:33 +0200

 --lrZ03NoBR/3+SXJZ
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 Content-Transfer-Encoding: quoted-printable
 
 On Wed, Oct 04, 2006 at 05:06:52PM +0200, remko@evilcoder.org wrote :
 > can you give an example for this?
 >=20
 > your information is sparse in my eyes and could use a little example so t=
 hat
 > the guys responsible for this know what to do.
 >=20
 
 Just put a line with -P -S115200 in /boot.config then reboot.
 
 The boot loader will display
 /boot.config: -P
 
 instead of
 /boot.config: -P -S115200
 
 --=20
 Alexandre Belloni
 
 --lrZ03NoBR/3+SXJZ
 Content-Type: application/x-pkcs7-signature
 Content-Disposition: attachment; filename="smime.p7s"
 Content-Transfer-Encoding: base64
 
 MIIMQwYJKoZIhvcNAQcCoIIMNDCCDDACAQExCzAJBgUrDgMCGgUAMAsGCSqGSIb3DQEHAaCC
 ChAwggYGMIIE7qADAgECAgpwxrFIFmvykFpgMA0GCSqGSIb3DQEBBAUAMIGRMQswCQYDVQQG
 EwJGUjENMAsGA1UECBMETm9yZDEaMBgGA1UEBxMRVmlsbGVuZXV2ZSBkJ0FzY3ExLjAsBgNV
 BAoTJU5FVEFTUSAtIFNlY3VyZSBJbnRlcm5ldCBDb25uZWN0aXZpdHkxJzAlBgNVBAsTHk5F
 VEFTUSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNjAxMzExMzM0MjJaFw0wODAxMzEx
 MzM0MjJaMIHaMQswCQYDVQQGFAJGUjENMAsGA1UECBQETm9yZDEuMCwGA1UEChQlTkVUQVNR
 IC0gU2VjdXJlIEludGVybmV0IENvbm5lY3Rpdml0eTEnMCUGA1UECxQeTkVUQVNRIENlcnRp
 ZmljYXRpb24gQXV0aG9yaXR5MRowGAYDVQQHFBFWaWxsZW5ldXZlIGQnQXNjcTEaMBgGA1UE
 AxQRQWxleGFuZHJlIEJFTExPTkkxKzApBgkqhkiG9w0BCQEWHGFsZXhhbmRyZS5iZWxsb25p
 QG5ldGFzcS5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAO5iWUp3TxMZQtTcQ3cy
 cFhsjuGUAvt6j42T12YmKQ66qFRRA8CjoNpiX1IfyUl66e3uH/DIcHhQKARNm9wCEFJbPFNh
 fdh/50we/IpeFvqLbsuG11moaleCZaq3S3fO0ZFDI1yLAWxQ4ayZyliQT/C5o6TIbbVZp96E
 Uz5OWhq3AgMBAAGjggKXMIICkzAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBRkywHa8HT+m+Bd
 G2EXKfd/YRByuDCBvgYDVR0jBIG2MIGzgBQnKusd2UTaOhdzagkgIMklqPl/sqGBl6SBlDCB
 kTELMAkGA1UEBhMCRlIxDTALBgNVBAgTBE5vcmQxGjAYBgNVBAcTEVZpbGxlbmV1dmUgZCdB
 c2NxMS4wLAYDVQQKEyVORVRBU1EgLSBTZWN1cmUgSW50ZXJuZXQgQ29ubmVjdGl2aXR5MScw
 JQYDVQQLEx5ORVRBU1EgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHmCAQAwDgYDVR0PAQH/BAQD
 AgXgMBEGCWCGSAGG+EIBAQQEAwIFoDArBgkrBgEEAYI3FAIEHh4cAFMAbQBhAHIAdABjAGEA
 cgBkAEwAbwBnAG8AbjApBgNVHSUEIjAgBggrBgEFBQcDBAYIKwYBBQUHAwIGCisGAQQBgjcU
 AgIwNwYDVR0RBDAwLqAsBgorBgEEAYI3FAIDoB4MHGFsZXhhbmRyZS5iZWxsb25pQG5ldGFz
 cS5jb20wgc0GA1UdHwSBxTCBwjBaoFigVoZUbGRhcDovL3BraS5uZXRhc3EuY29tL2NuPWZ3
 Y2Esb3U9Y2FzLG89bmV0YXNxLGRjPWZyP2NlcnRpZmljYXRlUmV2b2NhdGlvbkxpc3Q7Ymlu
 YXJ5MDigNqA0hjJodHRwOi8vaW50cmFuZXQubmV0YXNxLmNvbS9pbnRyYW5ldC9wa2kvbmV0
 YXNxLmNybDAqoCigJoYkaHR0cDovL3d3dy5uZXRhc3EuY29tL3BraS9uZXRhc3EuY3JsMB8G
 CWCGSAGG+EIBDQQSFhBVc2VyIENlcnRpZmljYXRlMA0GCSqGSIb3DQEBBAUAA4IBAQAXCdfl
 wDzt73EkLUWkMJAhJ9BPpJwQyzQyMW8XVbWfFczDSjuoYyghiezOaFKgW7+pGSb8J4k3aJBw
 ZJe4YGEqWhZP3pYvCY9yeBXS/ei3AXtsQV2mW6G0J9tx9P12aIOd5d/T13+drwJCGOFs4EFz
 n8XIBuY0A0Zw8hTqnQ5OmSEywXI4BzKDHeJrBmFoYk3a23e10eCwxl7+GrKHYA0y2rq8TIWj
 i9sL2DnWuPTp+urk9NjLcpmUijf6/GjiAf6k48vFGp/JaoMgjF2eG2TGtVFa50La6gzka+NB
 9B3gHf3/SVqxOLT7K2JCLzQKVGCxvZ5dgVW94ZkdRFrJqQFkMIIEAjCCAuqgAwIBAgIBADAN
 BgkqhkiG9w0BAQQFADCBkTELMAkGA1UEBhMCRlIxDTALBgNVBAgTBE5vcmQxGjAYBgNVBAcT
 EVZpbGxlbmV1dmUgZCdBc2NxMS4wLAYDVQQKEyVORVRBU1EgLSBTZWN1cmUgSW50ZXJuZXQg
 Q29ubmVjdGl2aXR5MScwJQYDVQQLEx5ORVRBU1EgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkw
 HhcNMDIwMjE5MTIzNDU1WhcNMjIwMjE0MTIzNDU1WjCBkTELMAkGA1UEBhMCRlIxDTALBgNV
 BAgTBE5vcmQxGjAYBgNVBAcTEVZpbGxlbmV1dmUgZCdBc2NxMS4wLAYDVQQKEyVORVRBU1Eg
 LSBTZWN1cmUgSW50ZXJuZXQgQ29ubmVjdGl2aXR5MScwJQYDVQQLEx5ORVRBU1EgQ2VydGlm
 aWNhdGlvbiBBdXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDBgE+L
 et5/q3S24kyiPlHgfuxr5YxJnAOHhceNlXl7o/os5vKuV4Lqg0UNkmuAG0qT1LDN+ed/ibfF
 zRBL2QoI8sXAumYgrdELHQrhhiL64GusvfjuQfhQ9+sjoq+thwWkbdjAVlQr7stmf9j0dIHq
 fiC92IKTtyaS4WvWJ8W0NhmqS01Syz3JAI+qHR311d+6FFXy/KCC9WRx9NlwLJWlFoNhoObS
 PfRSttrrYqwrF+HpwQC3qSY9TG+IZVqgSKJoAENlVK7o+NLXuoNxlpDOWfCEtpwrIzXNHv6W
 98VHTf+HqbwlgYE8w/vNxwfa4l+5+H45/cC858IVkVw2HMcLAgMBAAGjYzBhMB0GA1UdDgQW
 BBQnKusd2UTaOhdzagkgIMklqPl/sjAfBgNVHSMEGDAWgBQnKusd2UTaOhdzagkgIMklqPl/
 sjAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQQFAAOCAQEA
 lyWoU39apiaFxmVdpuvDoolA2r9MrpMsMfPBlVzKOfRCG6MdGv4RxWloTWkhLh+OzLDOkg0T
 d970NKULgjPJ6oOrcS0zh5ANJebhhEYtmnxfYzlN1xybGUSUOBnOVVcw6Wj8SGGHi+rNJtzU
 zgUR8ROIRX68tfkxpYQcfx2bOUQvrfaY6Z7X1Ak3oFAok+YIKPVVvEkOslKkXTWRcUlS3KsD
 SKWsQbSYD4UsWN+xa5lfNgQ+O/X8Ug8yVKcIKJbxlLPCy1BfYGEsSLS6BklGlqRUxj9OR2gs
 QSti3SaNkP53+hcVHtA3MzEAekMQ+aVlGi0/Vbuw7qSkE/uXKH9hzjGCAfswggH3AgEBMIGg
 MIGRMQswCQYDVQQGEwJGUjENMAsGA1UECBMETm9yZDEaMBgGA1UEBxMRVmlsbGVuZXV2ZSBk
 J0FzY3ExLjAsBgNVBAoTJU5FVEFTUSAtIFNlY3VyZSBJbnRlcm5ldCBDb25uZWN0aXZpdHkx
 JzAlBgNVBAsTHk5FVEFTUSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eQIKcMaxSBZr8pBaYDAJ
 BgUrDgMCGgUAoIGxMBgGCSqGSIb3DQEJAzELBgkqhkiG9w0BBwEwHAYJKoZIhvcNAQkFMQ8X
 DTA2MTAwNDE1MTUzM1owIwYJKoZIhvcNAQkEMRYEFA9T5/Pu2xSWE8H7WJF56t0ZhoapMFIG
 CSqGSIb3DQEJDzFFMEMwCgYIKoZIhvcNAwcwDgYIKoZIhvcNAwICAgCAMA0GCCqGSIb3DQMC
 AgFAMAcGBSsOAwIHMA0GCCqGSIb3DQMCAgEoMA0GCSqGSIb3DQEBAQUABIGAN5sjwRUeFCPT
 MfzOrAZmzFKbIjDjjrS8Yk0IQ0FJxen66BWZfskf1TgBSzKrNMa2OgFD/VsfVmNymfthKT1n
 6UcfWB/+T0+/N7F/ZCp8AH+Z4/4r6OchAYi/yRJEtBJ1UG3HnZdprshRc/TInpkZoj04/jV+
 i0lL1rT3s5cmq7c=
 
 --lrZ03NoBR/3+SXJZ--
Responsible-Changed-From-To: freebsd-i386->ru 
Responsible-Changed-By: ru 
Responsible-Changed-When: Wed Oct 4 18:42:05 UTC 2006 
Responsible-Changed-Why:  
Grab the PR. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=103972 
Responsible-Changed-From-To: ru->jhb 
Responsible-Changed-By: ru 
Responsible-Changed-When: Fri Oct 6 10:21:10 UTC 2006 
Responsible-Changed-Why:  
John, your boot2.c,v 1.72 change broke it (while fixing another bug). 
Could you take care of fixing it please?  I initially planned to fix 
it differently, by not modifying the original command string, but 
after some code inspection I think what's suggested in the PR is 
probably the best choice. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=103972 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: i386/103972: commit references a PR
Date: Thu, 28 Feb 2008 17:08:11 +0000 (UTC)

 jhb         2008-02-28 17:08:05 UTC
 
   FreeBSD src repository
 
   Modified files:
     sys/boot/i386/boot2  boot2.c 
     sys/boot/i386/gptboot gptboot.c 
   Log:
   Rev 1.72 fixed a bug where if /boot.config changed the console its contents
   weren't displayed on the new console.  However, the config string has been
   altered as part of being parsed so we only display the first option.  Fix
   this by saving a copy of /boot.config before parsing it and displaying the
   saved copy after parsing.
   
   MFC after:      1 week
   PR:             i386/103972
   Submitted by:   Alexandre Belloni  alexandre.belloni of netasq.com
   
   Revision  Changes    Path
   1.86      +3 -2      src/sys/boot/i386/boot2/boot2.c
   1.87      +3 -2      src/sys/boot/i386/gptboot/gptboot.c
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->patched 
State-Changed-By: jhb 
State-Changed-When: Thu Feb 28 17:55:38 UTC 2008 
State-Changed-Why:  
Fix tested and applied to HEAD. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=103972 
State-Changed-From-To: patched->closed 
State-Changed-By: jhb 
State-Changed-When: Mon Mar 17 18:05:11 UTC 2008 
State-Changed-Why:  
Fix MFC'd to RELENG_[67]. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=103972 
>Unformatted:
