summaryrefslogtreecommitdiffstats
path: root/sys/amd64
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>1998-10-05 07:45:54 +0000
committerobrien <obrien@FreeBSD.org>1998-10-05 07:45:54 +0000
commit694db7871e9ec5dd1e636b40701bb47842f0fcd4 (patch)
tree4cf069b36d3def1b3572e3040f03cfaa73f023fd /sys/amd64
parent3cdfede597d0da4bfa72357ab6dcc53330a301f3 (diff)
downloadFreeBSD-src-694db7871e9ec5dd1e636b40701bb47842f0fcd4.zip
FreeBSD-src-694db7871e9ec5dd1e636b40701bb47842f0fcd4.tar.gz
Document that ``options xFS_ROOT'' requires the associated ``options xFS''.
Reordered xFS_ROOT's to be below the associated xFS.
Diffstat (limited to 'sys/amd64')
-rw-r--r--sys/amd64/conf/GENERIC10
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 05ebe02..3b0d8d6 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -11,7 +11,7 @@
# device lines is present in the ./LINT configuration file. If you are
# in doubt as to the purpose or necessity of a line, check first in LINT.
#
-# $Id: GENERIC,v 1.119 1998/10/01 19:35:28 msmith Exp $
+# $Id: GENERIC,v 1.120 1998/10/03 17:09:00 jkh Exp $
machine "i386"
cpu "I386_CPU"
@@ -24,12 +24,12 @@ maxusers 32
options MATH_EMULATE #Support for x87 emulation
options INET #InterNETworking
options FFS #Berkeley Fast Filesystem
+options FFS_ROOT #FFS usable as root device [keep this!]
options NFS #Network Filesystem
+options NFS_ROOT #NFS usable as root device, "NFS" req'ed
options MSDOSFS #MSDOS Filesystem
-options "CD9660" #ISO 9660 Filesystem
-options "CD9660_ROOT" #CD-ROM usable as root device
-options FFS_ROOT #FFS usable as root device [keep this!]
-options NFS_ROOT #NFS usable as root device
+options CD9660 #ISO 9660 Filesystem
+options CD9660_ROOT #CD-ROM usable as root device, "CD9660" req'ed
options PROCFS #Process filesystem
options "COMPAT_43" #Compatible with BSD 4.3 [KEEP THIS!]
options SCSI_DELAY=15000 #Be pessimistic about Joe SCSI device
OpenPOWER on IntegriCloud