bin/102638: [PATCH] sysinstall - custom dist set always install SMP kernel

[Artis Caune]

>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: