From daved@orion.tamu.edu  Mon Oct 19 15:29:28 1998
Received: from orion.tamu.edu (orion.tamu.edu [128.194.177.3])
          by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id PAA27090
          for <FreeBSD-gnats-submit@freebsd.org>; Mon, 19 Oct 1998 15:29:27 -0700 (PDT)
          (envelope-from daved@orion.tamu.edu)
Received: (from daved@localhost)
	by orion.tamu.edu (8.8.8/8.8.8) id RAA21591;
	Mon, 19 Oct 1998 17:30:32 -0500 (CDT)
	(envelope-from daved)
Message-Id: <199810192230.RAA21591@orion.tamu.edu>
Date: Mon, 19 Oct 1998 17:30:32 -0500 (CDT)
From: daved@tamu.edu
Reply-To: daved@tamu.edu
To: FreeBSD-gnats-submit@freebsd.org
Subject: boot.config not being used.
X-Send-Pr-Version: 3.2

>Number:         8377
>Category:       kern
>Synopsis:       [patch] boot.config not being used.
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Oct 19 15:30:00 PDT 1998
>Closed-Date:    Mon Jan 18 13:02:45 PST 1999
>Last-Modified:  Mon Jan 18 13:03:40 PST 1999
>Originator:     Dave Duchscher
>Release:        FreeBSD 2.2.7-RELEASE i386
>Organization:
Texas A&M University
>Environment:



>Description:

boot.config file is read but the settings are not used.  I have made
the following changes to get things to work but someone should really
sanity check this patch.  My problem was that the -P switch would not
work with out this change.

>How-To-Repeat:

	

>Fix:
	
diff -Nur sys-dist/i386/boot/biosboot/boot.c sys/i386/boot/biosboot/boot.c
--- sys-dist/i386/boot/biosboot/boot.c	Fri Feb 27 16:56:14 1998
+++ sys/i386/boot/biosboot/boot.c	Sun Aug  9 08:51:14 1998
@@ -140,13 +140,18 @@
 	} else
 #endif	/*NAMEBLOCK*/
 		name = "kernel";
+loadstart:
+	/*
+	 * Ignore flags from previous attempted boot, if any.
+	 */
+	loadflags &= (RB_DUAL | RB_SERIAL);
+
 	if (boot_config[0] != '\0') {
 		printf("boot.config: %s", boot_config);
 		getbootdev(boot_config, &loadflags);
 		if (openrd() != 0)
 			name = "kernel";
 	}
-loadstart:
 	/* print this all each time.. (saves space to do so) */
 	/* If we have looped, use the previous entries as defaults */
 	printf("\r \n>> FreeBSD BOOT @ 0x%x: %d/%d k of memory, %s%s console\n"
@@ -159,13 +164,6 @@
 	       dosdev & 0x7f, devs[maj], unit, 'a' + part,
 	       name ? name : "*specify_a_kernel_name*",
 	       boot_help);
-
-	/*
-	 * Ignore flags from previous attempted boot, if any.
-	 * XXX this is now too strict.  Settings given in boot.config should
-	 * not be changed.
-	 */
-	loadflags &= (RB_DUAL | RB_SERIAL);
 
 	/*
 	 * Be paranoid and make doubly sure that the input buffer is empty.
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: rnordier 
State-Changed-When: Mon Jan 18 13:02:45 PST 1999 
State-Changed-Why:  
Fixed in the new bootblocks. 
>Unformatted:
