Document that ``options xFS_ROOT'' requires the associated ``options xFS''.

Reordered xFS_ROOT's to be below the associated xFS.

5 files changed, 22 insertions, 19 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
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 7d96775..dc8ccff 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.480 1998/10/02 05:15:51 ken Exp $
+#	$Id: LINT,v 1.481 1998/10/02 21:00:58 ken Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -493,7 +493,7 @@ options		NFS			#Network File System
 
 # The rest are optional:
 # options	NFS_NOSERVER		#Disable the NFS-server code.
-options		"CD9660"		#ISO 9660 filesystem
+options		CD9660			#ISO 9660 filesystem
 options		FDESC			#File descriptor filesystem
 options		KERNFS			#Kernel filesystem
 options		MFS			#Memory File System
@@ -503,7 +503,8 @@ options		PORTAL			#Portal filesystem
 options		PROCFS			#Process filesystem
 options		UMAPFS			#UID map filesystem
 options		UNION			#Union filesystem
-options		"CD9660_ROOT"		#CD-ROM usable as root device
+# The xFS_ROOT options REQUIRE the associated ``options xFS''
+options		CD9660_ROOT		#CD-ROM usable as root device
 options		FFS_ROOT		#FFS usable as root device
 options		NFS_ROOT		#NFS usable as root device
 # This code is still experimental (e.g. doesn't handle disk slices well).
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 05ebe02..3b0d8d6 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/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
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index 7d96775..dc8ccff 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.480 1998/10/02 05:15:51 ken Exp $
+#	$Id: LINT,v 1.481 1998/10/02 21:00:58 ken Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -493,7 +493,7 @@ options		NFS			#Network File System
 
 # The rest are optional:
 # options	NFS_NOSERVER		#Disable the NFS-server code.
-options		"CD9660"		#ISO 9660 filesystem
+options		CD9660			#ISO 9660 filesystem
 options		FDESC			#File descriptor filesystem
 options		KERNFS			#Kernel filesystem
 options		MFS			#Memory File System
@@ -503,7 +503,8 @@ options		PORTAL			#Portal filesystem
 options		PROCFS			#Process filesystem
 options		UMAPFS			#UID map filesystem
 options		UNION			#Union filesystem
-options		"CD9660_ROOT"		#CD-ROM usable as root device
+# The xFS_ROOT options REQUIRE the associated ``options xFS''
+options		CD9660_ROOT		#CD-ROM usable as root device
 options		FFS_ROOT		#FFS usable as root device
 options		NFS_ROOT		#NFS usable as root device
 # This code is still experimental (e.g. doesn't handle disk slices well).
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 7d96775..dc8ccff 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.480 1998/10/02 05:15:51 ken Exp $
+#	$Id: LINT,v 1.481 1998/10/02 21:00:58 ken Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -493,7 +493,7 @@ options		NFS			#Network File System
 
 # The rest are optional:
 # options	NFS_NOSERVER		#Disable the NFS-server code.
-options		"CD9660"		#ISO 9660 filesystem
+options		CD9660			#ISO 9660 filesystem
 options		FDESC			#File descriptor filesystem
 options		KERNFS			#Kernel filesystem
 options		MFS			#Memory File System
@@ -503,7 +503,8 @@ options		PORTAL			#Portal filesystem
 options		PROCFS			#Process filesystem
 options		UMAPFS			#UID map filesystem
 options		UNION			#Union filesystem
-options		"CD9660_ROOT"		#CD-ROM usable as root device
+# The xFS_ROOT options REQUIRE the associated ``options xFS''
+options		CD9660_ROOT		#CD-ROM usable as root device
 options		FFS_ROOT		#FFS usable as root device
 options		NFS_ROOT		#NFS usable as root device
 # This code is still experimental (e.g. doesn't handle disk slices well).