From 3163236a7b197f05703803cfe5e72bf72095565a Mon Sep 17 00:00:00 2001
From: Matthew Dillon <dillon@dragonflybsd.org>
Date: Thu, 14 Oct 2004 09:47:47 +0000
Subject: [PATCH] Final cleanup.  After giving up on trying to avoid having two
 loader*.conf files, move the kernel= variable back into the (now separate)
 files for bootp and normal boots.

---
 sys/boot/forth/loader-bootp.conf | 6 ++----
 sys/boot/forth/loader.4th        | 4 +---
 sys/boot/forth/loader.conf       | 6 ++----
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/sys/boot/forth/loader-bootp.conf b/sys/boot/forth/loader-bootp.conf
index 903f3c135d..e8045d01e0 100644
--- a/sys/boot/forth/loader-bootp.conf
+++ b/sys/boot/forth/loader-bootp.conf
@@ -7,7 +7,7 @@
 # All arguments must be in double quotes.
 #
 # $FreeBSD: src/sys/boot/forth/loader.conf,v 1.72 2003/07/01 01:03:32 brueffer Exp $
-# $DragonFly: src/sys/boot/forth/loader-bootp.conf,v 1.1 2004/10/14 09:40:57 dillon Exp $
+# $DragonFly: src/sys/boot/forth/loader-bootp.conf,v 1.2 2004/10/14 09:47:47 dillon Exp $
 
 ##############################################################
 ###  Basic configuration options  ############################
@@ -15,9 +15,7 @@
 
 exec=".( Loading /boot/defaults/loader-bootp.conf ) cr"
 
-# NOTE: the default 'kernel' environment variable is not set
-# in the default/loader-bootp.conf file any more, it is set based on
-# whether we pxebooted or not in loader.4th
+kernel="kernel.BOOTP"
 bootfile="kernel.BOOTP"	# Kernel name (possibly absolute path)
 kernel_options=""
 
diff --git a/sys/boot/forth/loader.4th b/sys/boot/forth/loader.4th
index 913ca35f41..7431e90115 100644
--- a/sys/boot/forth/loader.4th
+++ b/sys/boot/forth/loader.4th
@@ -23,7 +23,7 @@
 \ SUCH DAMAGE.
 \
 \ $FreeBSD: src/sys/boot/forth/loader.4th,v 1.24 2002/05/24 02:28:58 gordon Exp $
-\ $DragonFly: src/sys/boot/forth/loader.4th,v 1.5 2004/10/14 09:06:21 dillon Exp $
+\ $DragonFly: src/sys/boot/forth/loader.4th,v 1.6 2004/10/14 09:47:47 dillon Exp $
 
 s" arch-alpha" environment? [if] [if]
 	s" loader_version" environment?  [if]
@@ -134,10 +134,8 @@ only forth definitions also support-functions
 
 : start  ( -- ) ( throws: abort & user-defined )
   s" boot.nfsroot.path" getenv? if
-    s" kernel.BOOTP" s" kernel" setenv
     s" /boot/defaults/loader-bootp.conf" initialize
   else
-    s" kernel" s" kernel" setenv
     s" /boot/defaults/loader.conf" initialize
   then
   include_conf_files
diff --git a/sys/boot/forth/loader.conf b/sys/boot/forth/loader.conf
index 7b3573e522..f4d3cd00f9 100644
--- a/sys/boot/forth/loader.conf
+++ b/sys/boot/forth/loader.conf
@@ -7,7 +7,7 @@
 # All arguments must be in double quotes.
 #
 # $FreeBSD: src/sys/boot/forth/loader.conf,v 1.72 2003/07/01 01:03:32 brueffer Exp $
-# $DragonFly: src/sys/boot/forth/loader.conf,v 1.6 2004/10/14 08:44:34 dillon Exp $
+# $DragonFly: src/sys/boot/forth/loader.conf,v 1.7 2004/10/14 09:47:47 dillon Exp $
 
 ##############################################################
 ###  Basic configuration options  ############################
@@ -15,9 +15,7 @@
 
 exec=".( Loading /boot/defaults/loader.conf ) cr"
 
-# NOTE: the default 'kernel' environment variable is not set
-# in the default/loader.conf file any more, it is set based on
-# whether we pxebooted or not in loader.4th
+kernel="kernel"
 bootfile="kernel"	# Kernel name (possibly absolute path)
 kernel_options=""
 
-- 
2.35.2