From owner-freebsd-bugs@FreeBSD.ORG  Tue Aug 29 10:30:22 2006
Return-Path: <owner-freebsd-bugs@FreeBSD.ORG>
X-Original-To: freebsd-bugs@hub.freebsd.org
Delivered-To: freebsd-bugs@hub.freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 4D07916A4E2
	for <freebsd-bugs@hub.freebsd.org>;
	Tue, 29 Aug 2006 10:30:22 +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 5BA7C43D4C
	for <freebsd-bugs@hub.freebsd.org>;
	Tue, 29 Aug 2006 10:30:21 +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 k7TAUL41041804
	for <freebsd-bugs@freefall.freebsd.org>; Tue, 29 Aug 2006 10:30:21 GMT
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k7TAULqe041798;
	Tue, 29 Aug 2006 10:30:21 GMT (envelope-from gnats)
Resent-Date: Tue, 29 Aug 2006 10:30:21 GMT
Resent-Message-Id: <200608291030.k7TAULqe041798@freefall.freebsd.org>
Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer)
Resent-To: freebsd-bugs@FreeBSD.org
Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org,
	Artis Caune <Artis.Caune@latnet.lv>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id B5E8616A4DA
	for <freebsd-gnats-submit@FreeBSD.org>;
	Tue, 29 Aug 2006 10:25:34 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [216.136.204.117])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 84D4C43D4C
	for <freebsd-gnats-submit@FreeBSD.org>;
	Tue, 29 Aug 2006 10:25:34 +0000 (GMT)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.13.1/8.13.1) with ESMTP id k7TAPY0t082958
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 29 Aug 2006 10:25:34 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.13.1/8.13.1/Submit) id k7TAPYYa082956;
	Tue, 29 Aug 2006 10:25:34 GMT (envelope-from nobody)
Message-Id: <200608291025.k7TAPYYa082956@www.freebsd.org>
Date: Tue, 29 Aug 2006 10:25:34 GMT
From: Artis Caune <Artis.Caune@latnet.lv>
To: freebsd-gnats-submit@FreeBSD.org
X-Send-Pr-Version: www-2.3
Cc: 
Subject: bin/102638: [PATCH] sysinstall - custom dist set always install SMP
	kernel
X-BeenThere: freebsd-bugs@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Bug reports <freebsd-bugs.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-bugs>,
	<mailto:freebsd-bugs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-bugs>
List-Post: <mailto:freebsd-bugs@freebsd.org>
List-Help: <mailto:freebsd-bugs-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-bugs>,
	<mailto:freebsd-bugs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 29 Aug 2006 10:30:22 -0000


>Number:         102638
>Category:       bin
>Synopsis:       [PATCH] sysinstall - custom dist set always install SMP kernel
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Aug 29 10:30:20 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Artis Caune
>Release:        6.1
>Organization:
>Environment:
>Description:
During install, when selecting custom distribution set and both GENERIC AND SMP kernels, sysinstall always install SMP kernel.

p.s. this is update to bin/97888.
>How-To-Repeat:

>Fix:
--- install.c.orig      Tue Aug 29 13:15:03 2006
+++ install.c   Tue Aug 29 13:17:03 2006
@@ -910,7 +910,12 @@
         */
        vsystem("rm -rf /boot/kernel");
 #if WITH_SMP
-       if (dists & DIST_KERNEL_SMP)
+       if ((dists & DIST_KERNEL_SMP) && (dists & DIST_KERNEL_GENERIC))
+               if (NCpus > 1)
+                       vsystem("mv /boot/SMP /boot/kernel");
+               else
+                       vsystem("mv /boot/GENERIC /boot/kernel");
+       else if ((dists & DIST_KERNEL_SMP) && !(dists & DIST_KERNEL_GENERIC))
                vsystem("mv /boot/SMP /boot/kernel");
        else
 #endif

>Release-Note:
>Audit-Trail:
>Unformatted: