If the user did not chose a distribution from the menu, a sensible

default distribution (user) will be installed, however, no kernel
will be installed.  Fix this by installing a sensible default kernel,
SMP/GENERIC, depending on WITH_SMP and number of CPUS found.

Reviewed by:    jhb

3 files changed, 4 insertions, 1 deletions

diff --git a/usr.sbin/sysinstall/dist.c b/usr.sbin/sysinstall/dist.c
index b1eb018..87815f2 100644
--- a/usr.sbin/sysinstall/dist.c
+++ b/usr.sbin/sysinstall/dist.c
@@ -211,7 +211,7 @@ distSetX(void)
     return distSetXOrg(NULL);
 }
 
-static int
+int
 selectKernel(void)
 {
 #ifdef WITH_SMP
diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c
index e965520..33b8217 100644
--- a/usr.sbin/sysinstall/install.c
+++ b/usr.sbin/sysinstall/install.c
@@ -785,6 +785,8 @@ installCommit(dialogMenuItem *self)
 	/* select reasonable defaults if necessary */
 	if (!Dists)
 	    Dists = _DIST_USER;
+	if (!KernelDists)
+	    KernelDists = selectKernel();
     }
 
     if (!mediaVerify())
diff --git a/usr.sbin/sysinstall/sysinstall.h b/usr.sbin/sysinstall/sysinstall.h
index 4ec2bcf..9ac1214 100644
--- a/usr.sbin/sysinstall/sysinstall.h
+++ b/usr.sbin/sysinstall/sysinstall.h
@@ -616,6 +616,7 @@ extern int	distSetSrc(dialogMenuItem *self);
 extern int	distSetXOrg(dialogMenuItem *self);
 extern int	distSetKernel(dialogMenuItem *self);
 extern int	distExtractAll(dialogMenuItem *self);
+extern int	selectKernel(void);
 
 /* dmenu.c */
 extern int	dmenuDisplayFile(dialogMenuItem *tmp);