From 03be728217019c05fb9d266a95a1bef1c1074d77 Mon Sep 17 00:00:00 2001
From: jkh <jkh@FreeBSD.org>
Date: Sat, 14 Dec 1996 22:18:43 +0000
Subject: Make the USERCONFIG_BOOT semantics closer to what was original
 intended.

---
 sys/amd64/amd64/machdep.c  | 16 +++++++---------
 sys/i386/i386/machdep.c    | 16 +++++++---------
 sys/i386/i386/userconfig.c |  6 +++---
 3 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
index ad0e5f1..0a21983 100644
--- a/sys/amd64/amd64/machdep.c
+++ b/sys/amd64/amd64/machdep.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)machdep.c	7.4 (Berkeley) 6/3/91
- *	$Id: machdep.c,v 1.218 1996/12/11 05:52:15 dyson Exp $
+ *	$Id: machdep.c,v 1.219 1996/12/12 04:20:50 davidg Exp $
  */
 
 #include "npx.h"
@@ -363,18 +363,16 @@ again:
 	for (i = 1; i < ncallout; i++)
 		callout[i-1].c_next = &callout[i];
 
-#if defined(USERCONFIG_BOOT) && defined(USERCONFIG)
-	boothowto |= RB_CONFIG;
-#endif
-
+#if defined(USERCONFIG)
+#if defined(USERCONFIG_BOOT)
+	if (1) {
+#else
         if (boothowto & RB_CONFIG) {
-#ifdef USERCONFIG
+#endif
 		userconfig();
 		cninit();	/* the preferred console may have changed */
-#else
-		printf("Sorry! no userconfig in this kernel\n");
-#endif 
 	}
+#endif
 
 #ifdef BOUNCE_BUFFERS
 	/*
diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c
index ad0e5f1..0a21983 100644
--- a/sys/i386/i386/machdep.c
+++ b/sys/i386/i386/machdep.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)machdep.c	7.4 (Berkeley) 6/3/91
- *	$Id: machdep.c,v 1.218 1996/12/11 05:52:15 dyson Exp $
+ *	$Id: machdep.c,v 1.219 1996/12/12 04:20:50 davidg Exp $
  */
 
 #include "npx.h"
@@ -363,18 +363,16 @@ again:
 	for (i = 1; i < ncallout; i++)
 		callout[i-1].c_next = &callout[i];
 
-#if defined(USERCONFIG_BOOT) && defined(USERCONFIG)
-	boothowto |= RB_CONFIG;
-#endif
-
+#if defined(USERCONFIG)
+#if defined(USERCONFIG_BOOT)
+	if (1) {
+#else
         if (boothowto & RB_CONFIG) {
-#ifdef USERCONFIG
+#endif
 		userconfig();
 		cninit();	/* the preferred console may have changed */
-#else
-		printf("Sorry! no userconfig in this kernel\n");
-#endif 
 	}
+#endif
 
 #ifdef BOUNCE_BUFFERS
 	/*
diff --git a/sys/i386/i386/userconfig.c b/sys/i386/i386/userconfig.c
index 35aba54..fc1932f 100644
--- a/sys/i386/i386/userconfig.c
+++ b/sys/i386/i386/userconfig.c
@@ -46,7 +46,7 @@
  ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  ** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  **
- **      $Id: userconfig.c,v 1.72 1996/12/14 18:07:17 joerg Exp $
+ **      $Id: userconfig.c,v 1.73 1996/12/14 22:02:58 joerg Exp $
  **/
 
 /**
@@ -132,7 +132,7 @@ getchar(void)
     if (next == userconfig_from_boot) {
 	if (strncmp(next, "USERCONFIG\n", 11)) {
 	    next++;
-	    strcpy(next, "quit\n");
+	    strcpy(next, "intro\n");
 	} else {
 	    next += 11;
 	}
@@ -2220,7 +2220,7 @@ visuserconfig(void)
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: userconfig.c,v 1.72 1996/12/14 18:07:17 joerg Exp $
+ *      $Id: userconfig.c,v 1.73 1996/12/14 22:02:58 joerg Exp $
  */
 
 #include "scbus.h"
-- 
cgit v1.1