From 751e9ca70644346abc78025a47d72dcea434816d Mon Sep 17 00:00:00 2001
From: Julian Elischer <julian@FreeBSD.org>
Date: Mon, 20 Apr 1998 21:53:07 +0000
Subject: [PATCH] Remove an LFS clause, now that it is in the history, anyone
 who wants to see what was needed cto revive LFS can see it.

---
 sys/amd64/amd64/autoconf.c | 20 +-------------------
 sys/i386/i386/autoconf.c   | 20 +-------------------
 2 files changed, 2 insertions(+), 38 deletions(-)

diff --git a/sys/amd64/amd64/autoconf.c b/sys/amd64/amd64/autoconf.c
index 6c544401da78..ff061a605ec8 100644
--- a/sys/amd64/amd64/autoconf.c
+++ b/sys/amd64/amd64/autoconf.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)autoconf.c	7.1 (Berkeley) 5/9/91
- *	$Id: autoconf.c,v 1.93 1998/04/19 23:31:33 julian Exp $
+ *	$Id: autoconf.c,v 1.94 1998/04/20 03:57:23 julian Exp $
  */
 
 /*
@@ -376,24 +376,6 @@ cpu_rootconf()
 	}
 #endif
 
-#if defined(LFS) || defined(LFS_ROOT)
-	if (!mountrootfsname) {
-		if (bootverbose)
-			printf("Considering LFS root f/s.\n");
-		mountrootfsname = "lfs";
-		/*
-		 * Ignore the -a flag if this kernel isn't compiled
-		 * with a generic root/swap configuration: if we skip
-		 * setroot() and we aren't a generic kernel, chaos
-		 * will ensue because setconf() will be a no-op.
-		 * (rootdev is always initialized to NODEV in a
-		 * generic configuration, so we test for that.)
-		 */
-		if ((boothowto & RB_ASKNAME) == 0 || rootdev != NODEV)
-			setroot();
-	}
-#endif
-
 	if (!mountrootfsname) {
 		panic("Nobody wants to mount my root for me");
 	}
diff --git a/sys/i386/i386/autoconf.c b/sys/i386/i386/autoconf.c
index 6c544401da78..ff061a605ec8 100644
--- a/sys/i386/i386/autoconf.c
+++ b/sys/i386/i386/autoconf.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)autoconf.c	7.1 (Berkeley) 5/9/91
- *	$Id: autoconf.c,v 1.93 1998/04/19 23:31:33 julian Exp $
+ *	$Id: autoconf.c,v 1.94 1998/04/20 03:57:23 julian Exp $
  */
 
 /*
@@ -376,24 +376,6 @@ cpu_rootconf()
 	}
 #endif
 
-#if defined(LFS) || defined(LFS_ROOT)
-	if (!mountrootfsname) {
-		if (bootverbose)
-			printf("Considering LFS root f/s.\n");
-		mountrootfsname = "lfs";
-		/*
-		 * Ignore the -a flag if this kernel isn't compiled
-		 * with a generic root/swap configuration: if we skip
-		 * setroot() and we aren't a generic kernel, chaos
-		 * will ensue because setconf() will be a no-op.
-		 * (rootdev is always initialized to NODEV in a
-		 * generic configuration, so we test for that.)
-		 */
-		if ((boothowto & RB_ASKNAME) == 0 || rootdev != NODEV)
-			setroot();
-	}
-#endif
-
 	if (!mountrootfsname) {
 		panic("Nobody wants to mount my root for me");
 	}