From a96b5bf11b733c515dcc4502edb77fedcc6f41d9 Mon Sep 17 00:00:00 2001
From: Matthew Dillon <dillon@apollo.backplane.com>
Date: Mon, 8 Nov 2010 13:12:23 -0800
Subject: [PATCH] boot - Remove improper setting of default_kernel

* Setting default_kernel in loader.conf prevents dloader.menu from
  conditionally setting it according to what it finds in /boot.  Remove
  the set.

* To be symmetrical add a selection (u) for kernel.UP in addition to the
  selection (m) for kernel.SMP, in case someone selects SMP and then wants
  to go back to UP before booting.
---
 sys/boot/dloader/dloader.menu | 8 ++++++++
 sys/boot/dloader/loader.conf  | 3 ++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/sys/boot/dloader/dloader.menu b/sys/boot/dloader/dloader.menu
index 06c486cf55..b73ba895b9 100644
--- a/sys/boot/dloader/dloader.menu
+++ b/sys/boot/dloader/dloader.menu
@@ -164,6 +164,14 @@ menuadd loadall
 menuadd boot
 menuadd set autoboot_delay=NO
 
+ifexists kernel.UP
+menuitem u "Select UP kernel"
+menuadd set default_kernel=kernel.UP
+menuadd include ${base}defaults/dloader.menu
+menuadd optinclude ${base}dloader.menu
+menuadd menu
+endif
+
 ifexists kernel.SMP
 menuitem m "Select SMP kernel"
 menuadd set default_kernel=kernel.SMP
diff --git a/sys/boot/dloader/loader.conf b/sys/boot/dloader/loader.conf
index 6a8d3e32c2..75daa34275 100644
--- a/sys/boot/dloader/loader.conf
+++ b/sys/boot/dloader/loader.conf
@@ -13,7 +13,8 @@
 ###  Basic configuration options  ############################
 ##############################################################
 
-default_kernel="kernel"
+# WARNING: Do not set default_kernel here, it is set conditionally
+#	   in dloader.menu
 kernel="kernel"
 bootfile="kernel"	# Kernel name (possibly absolute path)
 kernel_options=""
-- 
2.41.0