summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1996-07-27 11:31:02 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1996-07-27 11:31:02 +0000
commit6ed42e2e15d6c713d63f31748b8ec7d4e7b605bc (patch)
treee4e427ad11fa07544b46fc4977af1db498209f46
parent66dd1309925b92f65bf1bc12072f19ae4dbda99a (diff)
BOOT_CONFIG for all arch, not just i386
-rw-r--r--sys/arch/i386/conf/GENERIC4
-rw-r--r--sys/conf/GENERIC24
2 files changed, 14 insertions, 14 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 604fc470b62..3c692451f7c 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.27 1996/07/27 08:30:36 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.28 1996/07/27 11:31:01 deraadt Exp $
# $NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $
#
# GENERIC -- everything that's currently supported
@@ -28,8 +28,6 @@ option COMPAT_IBCS2 # binary compatibility with SCO and ISC
option COMPAT_LINUX # binary compatibility with Linux
option COMPAT_FREEBSD # binary compatibility with FreeBSD
-option BOOT_CONFIG # add support for boot -c
-
maxusers 32 # estimated number of users
config bsd swap generic
diff --git a/sys/conf/GENERIC b/sys/conf/GENERIC
index 4503eac3ee1..29e1b5f10fe 100644
--- a/sys/conf/GENERIC
+++ b/sys/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.3 1996/07/15 15:17:43 mickey Exp $
+# $OpenBSD: GENERIC,v 1.4 1996/07/27 11:31:00 deraadt Exp $
#
# Machine-independent option; used by all architectures for their
# GENERIC kernel
@@ -59,15 +59,17 @@ option EON # OSI tunneling over IP
option CCITT,LLC,HDLC # X.25
option IPFILTER # IP packet filter for security
-pseudo-device loop 1 # network loopback
-pseudo-device bpfilter 8 # packet filter
-pseudo-device sl 2 # CSLIP
-pseudo-device ppp 2 # PPP
-pseudo-device tun 2 # network tunneling over tty
+pseudo-device loop 1 # network loopback
+pseudo-device bpfilter 8 # packet filter
+pseudo-device sl 2 # CSLIP
+pseudo-device ppp 2 # PPP
+pseudo-device tun 2 # network tunneling over tty
-pseudo-device pty 64 # pseudo-terminals
-pseudo-device tb 1 # tablet line discipline
-pseudo-device vnd 4 # paging to files
-pseudo-device ccd 4 # concatenated disk devices
+pseudo-device pty 64 # pseudo-terminals
+pseudo-device tb 1 # tablet line discipline
+pseudo-device vnd 4 # paging to files
+pseudo-device ccd 4 # concatenated disk devices
-pseudo-device rnd # random data source
+pseudo-device rnd # random data source
+
+option BOOT_CONFIG # add support for boot -c