Changes as suggested by bde

Submitted by:	bde
This commit is contained in:
Mark Newton 2000-01-07 14:41:12 +00:00
parent d2d012730f
commit 6e2972b825
3 changed files with 60 additions and 63 deletions

View File

@ -441,7 +441,6 @@ device mn0 # Munich32x/Falc54 Nx64kbit/sec cards.
# which throws away all packets sent and never receives any. It is
# included for testing purposes.
# The `tun' pseudo-device implements (user-)ppp and nos-tun
# The `streams' pseudo-device implements SysVR4 STREAMS emulation.
# The `gif' pseudo-device implements IPv6 over IP4 tunneling,
# IPv4 over IPv6 tunneling, IPv4 over IPv4 tunneling and
# IPv6 over IPv6 tunneling.
@ -2194,6 +2193,26 @@ options NSFBUFS=1024
#
options DEBUG_LOCKS
#
# SysVR4 ABI emulation
#
# The svr4 ABI emulator can be statically compiled into the kernel or loaded as
# a KLD module.
# The STREAMS network emulation code can also be compiled statically or as a
# module. If loaded as a module, it must be loaded before the svr4 module
# (the /usr/sbin/svr4 script does this for you). If compiling statically,
# the `streams' pseudo-device must be configured into any kernel which also
# specifies COMPAT_SVR4. It is possible to have a statically-configured
# STREAMS device and a dynamically loadable svr4 emulator; the /usr/sbin/svr4
# script understands that it doesn't need to load the `streams' module under
# those circumstances.
# Caveat: At this time, `options KTRACE' is required for the svr4 emulator
# (whether static or dynamic).
#
options COMPAT_SVR4 # build emulator statically
options DEBUG_SVR4 # enable verbose debugging
pseudo-device streams # STREAMS network driver (required for svr4).
# More undocumented options for linting.
# Note that documenting these are not considered an affront.
@ -2366,23 +2385,3 @@ makeoptions UKBD_DFLT_KEYMAP=it.iso
#
# An embedded system might want to run something other than init.
options INIT_PATH="/sbin/init:/stand/sysinstall"
#
# SysVR4 ABI emulation
#
# The svr4 ABI emulator can be statically compiled into the kernel or loaded as
# a KLD module.
# The STREAMS network emulation code can also be compiled statically or as a
# module. If loaded as a module, it must be loaded before the svr4 module
# (the /usr/sbin/svr4 script does this for you). If compiling statically,
# the "streams" pseudo-device must be configured into any kernel which also
# specifies COMPAT_SVR4. It is possible to have a statically-configured
# STREAMS device and a dynamically loadable svr4 emulator; the /usr/sbin/svr4
# script understands that it doesn't need to load the "streams" module under
# those circumstances.
# Caveat: At this time, "options KTRACE" is required for the svr4 emulator
# (whether static or dynamic).
#
options COMPAT_SVR4 # build emulator statically
options DEBUG_SVR4 # enable verbose debugging
pseudo-device streams # STREAMS network driver (required for svr4).

View File

@ -441,7 +441,6 @@ device mn0 # Munich32x/Falc54 Nx64kbit/sec cards.
# which throws away all packets sent and never receives any. It is
# included for testing purposes.
# The `tun' pseudo-device implements (user-)ppp and nos-tun
# The `streams' pseudo-device implements SysVR4 STREAMS emulation.
# The `gif' pseudo-device implements IPv6 over IP4 tunneling,
# IPv4 over IPv6 tunneling, IPv4 over IPv4 tunneling and
# IPv6 over IPv6 tunneling.
@ -2194,6 +2193,26 @@ options NSFBUFS=1024
#
options DEBUG_LOCKS
#
# SysVR4 ABI emulation
#
# The svr4 ABI emulator can be statically compiled into the kernel or loaded as
# a KLD module.
# The STREAMS network emulation code can also be compiled statically or as a
# module. If loaded as a module, it must be loaded before the svr4 module
# (the /usr/sbin/svr4 script does this for you). If compiling statically,
# the `streams' pseudo-device must be configured into any kernel which also
# specifies COMPAT_SVR4. It is possible to have a statically-configured
# STREAMS device and a dynamically loadable svr4 emulator; the /usr/sbin/svr4
# script understands that it doesn't need to load the `streams' module under
# those circumstances.
# Caveat: At this time, `options KTRACE' is required for the svr4 emulator
# (whether static or dynamic).
#
options COMPAT_SVR4 # build emulator statically
options DEBUG_SVR4 # enable verbose debugging
pseudo-device streams # STREAMS network driver (required for svr4).
# More undocumented options for linting.
# Note that documenting these are not considered an affront.
@ -2366,23 +2385,3 @@ makeoptions UKBD_DFLT_KEYMAP=it.iso
#
# An embedded system might want to run something other than init.
options INIT_PATH="/sbin/init:/stand/sysinstall"
#
# SysVR4 ABI emulation
#
# The svr4 ABI emulator can be statically compiled into the kernel or loaded as
# a KLD module.
# The STREAMS network emulation code can also be compiled statically or as a
# module. If loaded as a module, it must be loaded before the svr4 module
# (the /usr/sbin/svr4 script does this for you). If compiling statically,
# the "streams" pseudo-device must be configured into any kernel which also
# specifies COMPAT_SVR4. It is possible to have a statically-configured
# STREAMS device and a dynamically loadable svr4 emulator; the /usr/sbin/svr4
# script understands that it doesn't need to load the "streams" module under
# those circumstances.
# Caveat: At this time, "options KTRACE" is required for the svr4 emulator
# (whether static or dynamic).
#
options COMPAT_SVR4 # build emulator statically
options DEBUG_SVR4 # enable verbose debugging
pseudo-device streams # STREAMS network driver (required for svr4).

View File

@ -441,7 +441,6 @@ device mn0 # Munich32x/Falc54 Nx64kbit/sec cards.
# which throws away all packets sent and never receives any. It is
# included for testing purposes.
# The `tun' pseudo-device implements (user-)ppp and nos-tun
# The `streams' pseudo-device implements SysVR4 STREAMS emulation.
# The `gif' pseudo-device implements IPv6 over IP4 tunneling,
# IPv4 over IPv6 tunneling, IPv4 over IPv4 tunneling and
# IPv6 over IPv6 tunneling.
@ -2194,6 +2193,26 @@ options NSFBUFS=1024
#
options DEBUG_LOCKS
#
# SysVR4 ABI emulation
#
# The svr4 ABI emulator can be statically compiled into the kernel or loaded as
# a KLD module.
# The STREAMS network emulation code can also be compiled statically or as a
# module. If loaded as a module, it must be loaded before the svr4 module
# (the /usr/sbin/svr4 script does this for you). If compiling statically,
# the `streams' pseudo-device must be configured into any kernel which also
# specifies COMPAT_SVR4. It is possible to have a statically-configured
# STREAMS device and a dynamically loadable svr4 emulator; the /usr/sbin/svr4
# script understands that it doesn't need to load the `streams' module under
# those circumstances.
# Caveat: At this time, `options KTRACE' is required for the svr4 emulator
# (whether static or dynamic).
#
options COMPAT_SVR4 # build emulator statically
options DEBUG_SVR4 # enable verbose debugging
pseudo-device streams # STREAMS network driver (required for svr4).
# More undocumented options for linting.
# Note that documenting these are not considered an affront.
@ -2366,23 +2385,3 @@ makeoptions UKBD_DFLT_KEYMAP=it.iso
#
# An embedded system might want to run something other than init.
options INIT_PATH="/sbin/init:/stand/sysinstall"
#
# SysVR4 ABI emulation
#
# The svr4 ABI emulator can be statically compiled into the kernel or loaded as
# a KLD module.
# The STREAMS network emulation code can also be compiled statically or as a
# module. If loaded as a module, it must be loaded before the svr4 module
# (the /usr/sbin/svr4 script does this for you). If compiling statically,
# the "streams" pseudo-device must be configured into any kernel which also
# specifies COMPAT_SVR4. It is possible to have a statically-configured
# STREAMS device and a dynamically loadable svr4 emulator; the /usr/sbin/svr4
# script understands that it doesn't need to load the "streams" module under
# those circumstances.
# Caveat: At this time, "options KTRACE" is required for the svr4 emulator
# (whether static or dynamic).
#
options COMPAT_SVR4 # build emulator statically
options DEBUG_SVR4 # enable verbose debugging
pseudo-device streams # STREAMS network driver (required for svr4).