From 1f4fb096600219d4a2e8eead7cafb9ef3bb60bab Mon Sep 17 00:00:00 2001 From: "Todd C. Miller" Date: Wed, 10 Oct 2001 23:43:44 +0000 Subject: gc SWAPPAGER and DEVPAGER options --- sys/arch/amiga/conf/std.draco | 5 +---- sys/arch/hp300/conf/RAMDISK | 5 +---- sys/arch/hp300/conf/std.hp300 | 5 +---- sys/arch/hppa/conf/SHEPHERD_PIE | 4 +--- sys/arch/i386/conf/DISKLESS | 5 +---- sys/arch/i386/conf/RAMDISK | 5 +---- sys/arch/i386/conf/RAMDISKB | 5 +---- sys/arch/i386/conf/RAMDISKC | 5 +---- sys/arch/i386/conf/RAMDISK_CD | 5 +---- sys/arch/macppc/conf/RAMDISK | 4 +--- sys/arch/sun3/conf/RAMDISK | 4 +--- sys/arch/vax/conf/NANCY | 6 +----- sys/arch/vax/conf/RAMDISK | 5 +---- sys/arch/vax/conf/VOX | 6 +----- 14 files changed, 14 insertions(+), 55 deletions(-) (limited to 'sys/arch') diff --git a/sys/arch/amiga/conf/std.draco b/sys/arch/amiga/conf/std.draco index 8a1031023c7..6b4b4f8beb5 100644 --- a/sys/arch/amiga/conf/std.draco +++ b/sys/arch/amiga/conf/std.draco @@ -1,4 +1,4 @@ -# $OpenBSD: std.draco,v 1.3 1997/01/16 09:23:41 niklas Exp $ +# $OpenBSD: std.draco,v 1.4 2001/10/10 23:43:42 millert Exp $ # $NetBSD: std.draco,v 1.2 1996/12/20 19:15:07 veego Exp $ # standard DraCo information @@ -10,6 +10,3 @@ mainbus0 at root clock0 at mainbus0 kbd0 at mainbus0 zbus0 at mainbus0 - -#options SWAPPAGER # paging -#options DEVPAGER # mmap() of devices diff --git a/sys/arch/hp300/conf/RAMDISK b/sys/arch/hp300/conf/RAMDISK index 88e4529a672..34d4e29b69a 100644 --- a/sys/arch/hp300/conf/RAMDISK +++ b/sys/arch/hp300/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.13 2001/10/06 18:07:54 miod Exp $ +# $OpenBSD: RAMDISK,v 1.14 2001/10/10 23:43:42 millert Exp $ # # Ram disk kernel. # @@ -25,9 +25,6 @@ maxusers 8 option TIMEZONE=0 # time zone to adjust RTC time by option DST=0 # daylight saving time used by RTC -option SWAPPAGER # paging; REQUIRED -option DEVPAGER # mmap() of devices - option DIAGNOSTIC # internal consistency checks option FFS # UFS diff --git a/sys/arch/hp300/conf/std.hp300 b/sys/arch/hp300/conf/std.hp300 index 0009741d301..70dcb3d3f4f 100644 --- a/sys/arch/hp300/conf/std.hp300 +++ b/sys/arch/hp300/conf/std.hp300 @@ -1,10 +1,7 @@ -# $OpenBSD: std.hp300,v 1.3 1997/02/05 17:41:52 downsj Exp $ +# $OpenBSD: std.hp300,v 1.4 2001/10/10 23:43:42 millert Exp $ # $NetBSD: std.hp300,v 1.2 1997/01/30 09:55:45 thorpej Exp $ # # Options/devices that all hp300s should have # machine hp300 m68k - -option SWAPPAGER # swap pager (anonymous and swap space) -option DEVPAGER # device pager (mapped devices) diff --git a/sys/arch/hppa/conf/SHEPHERD_PIE b/sys/arch/hppa/conf/SHEPHERD_PIE index fb62a71c744..3906bdb3967 100644 --- a/sys/arch/hppa/conf/SHEPHERD_PIE +++ b/sys/arch/hppa/conf/SHEPHERD_PIE @@ -1,4 +1,4 @@ -# $OpenBSD: SHEPHERD_PIE,v 1.12 2001/05/17 00:57:54 pvalchev Exp $ +# $OpenBSD: SHEPHERD_PIE,v 1.13 2001/10/10 23:43:42 millert Exp $ # # Diskless kernel config # @@ -16,8 +16,6 @@ option HP7200_CPU,HP7250_CPU # PCXT, PCXT' #option HP8200_CPU # PCXU2 #option HP8500_CPU # PCXW -option SWAPPAGER, DEVPAGER - option DDB # in-kernel debugger #makeoptions DEBUG="-g" # compile full symbol table option DIAGNOSTIC # internal consistency checks diff --git a/sys/arch/i386/conf/DISKLESS b/sys/arch/i386/conf/DISKLESS index 048a24f7614..42509cbc794 100644 --- a/sys/arch/i386/conf/DISKLESS +++ b/sys/arch/i386/conf/DISKLESS @@ -1,4 +1,4 @@ -# $OpenBSD: DISKLESS,v 1.37 2001/06/27 06:19:51 angelos Exp $ +# $OpenBSD: DISKLESS,v 1.38 2001/10/10 23:43:43 millert Exp $ # $NetBSD: DISKLESS,v 1.26 1996/05/20 18:17:16 mrg Exp $ # # DISKLESS -- Generic machine setup for diskless boot. @@ -39,9 +39,6 @@ option TIMEZONE=0 # time zone to adjust RTC time by option DST=0 # daylight saving time used by RTC option NTP # hooks supporting the Network Time Protocol -option SWAPPAGER # paging; REQUIRED -option DEVPAGER # mmap() of devices - option DDB # in-kernel debugger #option DDB_SAFE_CONSOLE # allow break into ddb during boot diff --git a/sys/arch/i386/conf/RAMDISK b/sys/arch/i386/conf/RAMDISK index 3be94ee070d..c937253c342 100644 --- a/sys/arch/i386/conf/RAMDISK +++ b/sys/arch/i386/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.109 2001/09/22 20:44:48 deraadt Exp $ +# $OpenBSD: RAMDISK,v 1.110 2001/10/10 23:43:43 millert Exp $ machine i386 # architecture, used by config; REQUIRED @@ -19,9 +19,6 @@ maxusers 4 # estimated number of users option TIMEZONE=0 # time zone to adjust RTC time by option DST=0 # daylight saving time used by RTC -option SWAPPAGER # paging; REQUIRED -option DEVPAGER # mmap() of devices - #makeoptions DEBUG="-g" # compile full symbol table option FFS # UFS diff --git a/sys/arch/i386/conf/RAMDISKB b/sys/arch/i386/conf/RAMDISKB index 00b7e36cc3f..e7b64a874f8 100644 --- a/sys/arch/i386/conf/RAMDISKB +++ b/sys/arch/i386/conf/RAMDISKB @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISKB,v 1.44 2001/10/10 20:11:50 deraadt Exp $ +# $OpenBSD: RAMDISKB,v 1.45 2001/10/10 23:43:43 millert Exp $ machine i386 # architecture, used by config; REQUIRED @@ -19,9 +19,6 @@ maxusers 4 # estimated number of users option TIMEZONE=0 # time zone to adjust RTC time by option DST=0 # daylight saving time used by RTC -option SWAPPAGER # paging; REQUIRED -option DEVPAGER # mmap() of devices - #makeoptions DEBUG="-g" # compile full symbol table option FFS # UFS diff --git a/sys/arch/i386/conf/RAMDISKC b/sys/arch/i386/conf/RAMDISKC index ba0f768b2ba..9c2e2ebbb8d 100644 --- a/sys/arch/i386/conf/RAMDISKC +++ b/sys/arch/i386/conf/RAMDISKC @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISKC,v 1.24 2001/09/22 20:44:48 deraadt Exp $ +# $OpenBSD: RAMDISKC,v 1.25 2001/10/10 23:43:43 millert Exp $ machine i386 # architecture, used by config; REQUIRED @@ -19,9 +19,6 @@ maxusers 4 # estimated number of users option TIMEZONE=0 # time zone to adjust RTC time by option DST=0 # daylight saving time used by RTC -option SWAPPAGER # paging; REQUIRED -option DEVPAGER # mmap() of devices - #makeoptions DEBUG="-g" # compile full symbol table option FFS # UFS diff --git a/sys/arch/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD index f631d3e9031..3f75ce3eac0 100644 --- a/sys/arch/i386/conf/RAMDISK_CD +++ b/sys/arch/i386/conf/RAMDISK_CD @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK_CD,v 1.50 2001/10/08 03:56:25 nate Exp $ +# $OpenBSD: RAMDISK_CD,v 1.51 2001/10/10 23:43:43 millert Exp $ machine i386 # architecture, used by config; REQUIRED @@ -17,9 +17,6 @@ maxusers 4 # estimated number of users option TIMEZONE=0 # time zone to adjust RTC time by option DST=0 # daylight saving time used by RTC -option SWAPPAGER # paging; REQUIRED -option DEVPAGER # mmap() of devices - #makeoptions DEBUG="-g" # compile full symbol table option FFS # UFS diff --git a/sys/arch/macppc/conf/RAMDISK b/sys/arch/macppc/conf/RAMDISK index 210fa220977..9b739fad8d6 100644 --- a/sys/arch/macppc/conf/RAMDISK +++ b/sys/arch/macppc/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.2 2001/09/22 20:44:48 deraadt Exp $ +# $OpenBSD: RAMDISK,v 1.3 2001/10/10 23:43:42 millert Exp $ # # PPC GENERIC config file # @@ -19,8 +19,6 @@ option WSEMUL_NO_DUMB # include "../../../conf/GENERIC" option TIMEZONE=0 # time zone to adjust RTC time by option DST=0 # daylight saving time used by RTC -option SWAPPAGER # paging; REQUIRED -option DEVPAGER # mmap() of devices option COMPAT_43 # and 4.3BSD option FFS # UFS option MFS # memory file system diff --git a/sys/arch/sun3/conf/RAMDISK b/sys/arch/sun3/conf/RAMDISK index f89544666f6..8165e800ef9 100644 --- a/sys/arch/sun3/conf/RAMDISK +++ b/sys/arch/sun3/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.19 2001/09/22 20:44:48 deraadt Exp $ +# $OpenBSD: RAMDISK,v 1.20 2001/10/10 23:43:42 millert Exp $ # $NetBSD: RAMDISK,v 1.3.4.1 1996/08/19 23:35:10 gwr Exp $ # Machine architecture; required by config(8) @@ -24,8 +24,6 @@ option NFSCLIENT #option CD9660 option INET option BOOT_CONFIG -option SWAPPAGER -option DEVPAGER # XXX - Work-around for root on slow SunOS/Sun3 servers (sigh...) option NFS_BOOT_RWSIZE=1024 diff --git a/sys/arch/vax/conf/NANCY b/sys/arch/vax/conf/NANCY index 8c207f9a72d..472c8b7d3fb 100644 --- a/sys/arch/vax/conf/NANCY +++ b/sys/arch/vax/conf/NANCY @@ -1,4 +1,4 @@ -# $OpenBSD: NANCY,v 1.6 2001/05/16 05:07:50 millert Exp $ +# $OpenBSD: NANCY,v 1.7 2001/10/10 23:43:42 millert Exp $ # # NANCY MV3600 configuration file. # @@ -24,10 +24,6 @@ option "VAX43" # VS 3100/76 # Max users on system; this is just a hint maxusers 8 -# standard system options -options SWAPPAGER # swap and anonymous memory -options DEVPAGER # mapped devices - # Kernel compiled-in symbolic debugger & system call tracer option DDB option KTRACE diff --git a/sys/arch/vax/conf/RAMDISK b/sys/arch/vax/conf/RAMDISK index 429a3e49c99..7e4061d5008 100644 --- a/sys/arch/vax/conf/RAMDISK +++ b/sys/arch/vax/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.11 2001/10/06 18:07:57 miod Exp $ +# $OpenBSD: RAMDISK,v 1.12 2001/10/10 23:43:42 millert Exp $ machine vax # machine type @@ -30,9 +30,6 @@ maxusers 8 # estimated number of users option TIMEZONE=0 # time zone to adjust RTC time by option DST=0 # daylight saving time used by RTC -option SWAPPAGER # paging; REQUIRED -option DEVPAGER # mmap() of devices - option FFS # UFS option NFSCLIENT # Network File System client diff --git a/sys/arch/vax/conf/VOX b/sys/arch/vax/conf/VOX index ca9ba5510ab..bc54ec92938 100644 --- a/sys/arch/vax/conf/VOX +++ b/sys/arch/vax/conf/VOX @@ -1,4 +1,4 @@ -# $OpenBSD: VOX,v 1.3 2001/05/16 05:07:50 millert Exp $ +# $OpenBSD: VOX,v 1.4 2001/10/10 23:43:42 millert Exp $ # # simple VS2000 configuration file. # @@ -14,10 +14,6 @@ option "VAX410" # VS 2000 # Max users on system; this is just a hint maxusers 8 -# pagers -option SWAPPAGER -option DEVPAGER - # Kernel compiled-in symbolic debugger & system call tracer option DDB option KTRACE -- cgit v1.2.3