summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1996-06-27 06:13:45 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1996-06-27 06:13:45 +0000
commitc80ce6f661213850f45c98297e2573d191309e62 (patch)
treef197a3e2ae988f1789189b744901b080efca6157
parent585c795fb050abdab52804b83738c389da507d93 (diff)
throw user_config() into #ifdef BOOT_CONFIG
-rw-r--r--sys/arch/i386/i386/machdep.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c
index 666cc720fc0..e08454bff0a 100644
--- a/sys/arch/i386/i386/machdep.c
+++ b/sys/arch/i386/i386/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.21 1996/06/23 19:39:13 maja Exp $ */
+/* $OpenBSD: machdep.c,v 1.22 1996/06/27 06:13:44 deraadt Exp $ */
/* $NetBSD: machdep.c,v 1.202 1996/05/18 15:54:59 christos Exp $ */
/*-
@@ -277,7 +277,11 @@ cpu_startup()
* Configure the system.
*/
if (boothowto & RB_CONFIG) {
+#ifdef BOOT_CONFIG
user_config();
+#else
+ printf("kernel does not support -c; continuing..\n");
+#endif
}
configure();