From doug@dt051n0b.san.rr.com  Fri Mar 24 22:39:00 2000
Return-Path: <doug@dt051n0b.san.rr.com>
Received: from dt051n0b.san.rr.com (dt051n0b.san.rr.com [204.210.32.11])
	by hub.freebsd.org (Postfix) with ESMTP id 1824937B6A1
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 24 Mar 2000 22:38:58 -0800 (PST)
	(envelope-from doug@dt051n0b.san.rr.com)
Received: (from doug@localhost)
	by dt051n0b.san.rr.com (8.9.3/8.9.3) id WAA49553;
	Fri, 24 Mar 2000 22:38:56 -0800 (PST)
	(envelope-from doug)
Message-Id: <200003250638.WAA49553@dt051n0b.san.rr.com>
Date: Fri, 24 Mar 2000 22:38:56 -0800 (PST)
From: Doug@gorean.org
Sender: doug@dt051n0b.san.rr.com
Reply-To: Doug@gorean.org
To: FreeBSD-gnats-submit@freebsd.org
Subject: [PATCH] Add KERNEL identifier to GENERIC
X-Send-Pr-Version: 3.2

>Number:         17593
>Category:       kern
>Synopsis:       [PATCH] Add KERNEL identifier to GENERIC
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    marcel
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Mar 24 22:40:01 PST 2000
>Closed-Date:    Sun Jul 23 10:49:49 PDT 2000
>Last-Modified:  Sun Jul 23 11:00:59 PDT 2000
>Originator:     Doug
>Release:        FreeBSD 3.4-STABLE-0219 i386
>Organization:
AAAG
>Environment:

	Any FreeBSD system

>Description:

	This small patch adds a kernel identifier to the GENERIC kernel file.
This allows the user to keep their GENERIC kernel up to date as a backup
while not influencing their "regular" kernel. It also has the benefit of
moving the old kernel.GENERIC to kernel.GENERIC.old during the
'make install' step. 

>How-To-Repeat:

	Track a -stable release, have your real kernel blow up, have
kernel.GENERIC not work because it's too out of date. :)

>Fix:
	
	Apply the following patch:


Index: GENERIC
===================================================================
RCS file: /usr/ncvs/src/sys/i386/conf/GENERIC,v
retrieving revision 1.249
diff -u -r1.249 GENERIC
--- GENERIC	2000/03/21 17:00:58	1.249
+++ GENERIC	2000/03/23 07:47:11
@@ -26,6 +26,7 @@
 maxusers	32
 
 #makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
+makeoptions 	KERNEL=kernel.GENERIC	#Remove this line to build custom kernel
 
 options 	MATH_EMULATE		#Support for x87 emulation
 options 	INET			#InterNETworking


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->sheldonh 
Responsible-Changed-By: sheldonh 
Responsible-Changed-When: Wed Mar 29 02:12:29 PST 2000 
Responsible-Changed-Why:  
I'll take this one.  If the patch on 17536 works as advertised, I'd 
prefer that solution, but we'll see. 

From: Sheldon Hearn <sheldonh@uunet.co.za>
To: Doug@gorean.org
Cc: freebsd-gnats-submit@FreeBSD.org
Subject: Re: kern/17593: [PATCH] Add KERNEL identifier to GENERIC
Date: Thu, 30 Mar 2000 16:06:01 +0200

 ------- =_aaaaaaaaaa0
 Content-Type: text/plain; charset="us-ascii"
 Content-ID: <26101.954425143.1@axl.ops.uunet.co.za>
 
 Hi Doug,
 
 Here's what I sent the originator of PR 17536 regarding additional work
 on the buildkernel and installkernel targets.  I hope this explains why
 I haven't gone ahead with your patch.
 
 Ciao,
 Sheldon.
 
 
 ------- =_aaaaaaaaaa0
 Content-Type: message/rfc822
 Content-ID: <26101.954425143.2@axl.ops.uunet.co.za>
 
 From: Sheldon Hearn <sheldonh@uunet.co.za>
 To: Johan Karlsson <k@numeri.campus.luth.se>
 Subject: Re: kern/17536: KERNEL used both by Makefile.inc1 and Makefile.${MACHINE} 
 In-reply-to: Your message of "Thu, 30 Mar 2000 15:22:02 +0200."
              <200003301322.PAA19231@numeri.campus.luth.se> 
 Date: Thu, 30 Mar 2000 15:30:49 +0200
 Message-ID: <25420.954423049@axl.ops.uunet.co.za>
 Sender: sheldonh@axl.ops.uunet.co.za
 
 
 
 On Thu, 30 Mar 2000 15:22:02 +0200, Johan Karlsson wrote:
 
 > However this does not alowe one to install multiple kernels :-(
 > The second patch in the PR alows that.
 
 Hmmm..  Okay, this is what I think we want.  The first (or only) kernel
 listed in INSTALLKERNEL should be installed as /kernel, no matter what
 its name.  The remaining kernels (if any) in INSTALLKERNEL should be
 installed as /kernel.FOO.  Obviously, existing /kernel and /kernel.FOO
 files should be moved to /kernel.old and /kernel.FOO.old first.  Also,
 /var/db/kvm_kernel.db should be moved to /var/db/kvm_kernel.db.old
 before being replaced.
 
 Agreed?
 
 Ciao,
 Sheldon.
 
 ------- =_aaaaaaaaaa0--
 

From: Sheldon Hearn <sheldonh@uunet.co.za>
To: freebsd-gnats-submit@FreeBSD.org
Cc:  
Subject: Re: kern/17593: [PATCH] Add KERNEL identifier to GENERIC
Date: Tue, 11 Apr 2000 11:42:53 +0200

 Hi Doug,
 
 Have you had time to test whether "makeoptions KERNEL?=kernel.GENERIC"
 is allowed?
 
 Ciao,
 Sheldon.
 
Responsible-Changed-From-To: sheldonh->freebsd-bugs 
Responsible-Changed-By: sheldonh 
Responsible-Changed-When: Thu Jun 22 06:08:35 PDT 2000 
Responsible-Changed-Why:  
Divest myself of another PR so that I can focus on my only 
goal for 5.0-RELEASE. 
Sorry about this, Doug. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=17593 
Responsible-Changed-From-To: freebsd-bugs->marcel 
Responsible-Changed-By: marcel 
Responsible-Changed-When: Wed Jul 12 12:06:53 PDT 2000 
Responsible-Changed-Why:  
My plate as well. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=17593 
State-Changed-From-To: open->closed 
State-Changed-By: marcel 
State-Changed-When: Sun Jul 23 10:49:49 PDT 2000 
State-Changed-Why:  
We won't support installing multiple kernels with the 
installkernel target. With this path, the default case 
(ie KERNEL=GENERIC) would not install a kernel named 
'kernel'. This is potentially harmful. The problem the 
patch tries to solve is more pilot error than anything 
else. Remember that installing a new kernel always 
leaves the old kernel under 'kernel.old'... 

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