Clean up some leftovers from the root mount cleanup that was done some
time ago. FFS_ROOT and CD9660_ROOT are obsolete.
This commit is contained in:
parent
185b71c73e
commit
bcf77694d1
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=72011
@ -27,8 +27,6 @@
|
||||
*/
|
||||
|
||||
#include "opt_bootp.h"
|
||||
#include "opt_ffs.h"
|
||||
#include "opt_cd9660.h"
|
||||
#include "opt_isa.h"
|
||||
#include "opt_nfs.h"
|
||||
#include "opt_nfsroot.h"
|
||||
@ -219,9 +217,5 @@ cpu_rootconf()
|
||||
#endif
|
||||
rootdevnames[order++] = "nfs:";
|
||||
#endif
|
||||
|
||||
#if defined(FFS) && defined(FFS_ROOT)
|
||||
rootdevnames[order++] = "ufs:da0a";
|
||||
#endif
|
||||
}
|
||||
SYSINIT(cpu_rootconf, SI_SUB_ROOT_CONF, SI_ORDER_FIRST, cpu_rootconf, NULL)
|
||||
|
@ -51,7 +51,6 @@ options DEC_KN300 # AlphaServer 4100 (Rawhide), 1200 (Tincup)
|
||||
options INET #InterNETworking
|
||||
options INET6 #IPv6 communications protocols
|
||||
options FFS #Berkeley Fast Filesystem
|
||||
options FFS_ROOT #FFS usable as root device [keep this!]
|
||||
options SOFTUPDATES #Enable FFS soft updates support
|
||||
options MFS #Memory Filesystem
|
||||
options MD_ROOT #MD is a potential root device
|
||||
@ -59,7 +58,6 @@ options NFS #Network Filesystem
|
||||
options NFS_ROOT #NFS usable as root device
|
||||
options MSDOSFS #MSDOS Filesystem
|
||||
options CD9660 #ISO 9660 Filesystem
|
||||
options CD9660_ROOT #CD-ROM usable as root device
|
||||
options DEVFS #Device Filesystem
|
||||
options PROCFS #Process filesystem
|
||||
options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!]
|
||||
|
@ -51,7 +51,6 @@ options DEC_KN300 # AlphaServer 4100 (Rawhide), 1200 (Tincup)
|
||||
options INET #InterNETworking
|
||||
options INET6 #IPv6 communications protocols
|
||||
options FFS #Berkeley Fast Filesystem
|
||||
options FFS_ROOT #FFS usable as root device [keep this!]
|
||||
options SOFTUPDATES #Enable FFS soft updates support
|
||||
options MFS #Memory Filesystem
|
||||
options MD_ROOT #MD is a potential root device
|
||||
@ -59,7 +58,6 @@ options NFS #Network Filesystem
|
||||
options NFS_ROOT #NFS usable as root device
|
||||
options MSDOSFS #MSDOS Filesystem
|
||||
options CD9660 #ISO 9660 Filesystem
|
||||
options CD9660_ROOT #CD-ROM usable as root device
|
||||
options DEVFS #Device Filesystem
|
||||
options PROCFS #Process filesystem
|
||||
options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!]
|
||||
|
@ -25,8 +25,6 @@ options FFS #Berkeley Fast Filesystem
|
||||
options NFS #Network Filesystem
|
||||
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 PROCFS #Process filesystem
|
||||
options "COMPAT_43" #Compatible with BSD 4.3 [KEEP THIS!]
|
||||
|
@ -46,13 +46,10 @@
|
||||
* and the drivers are initialized.
|
||||
*/
|
||||
#include "opt_bootp.h"
|
||||
#include "opt_ffs.h"
|
||||
#include "opt_cd9660.h"
|
||||
#include "opt_isa.h"
|
||||
#include "opt_nfs.h"
|
||||
#include "opt_nfsroot.h"
|
||||
#include "opt_bus.h"
|
||||
#include "opt_rootdevname.h"
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
|
@ -33,7 +33,6 @@ options MATH_EMULATE #Support for x87 emulation
|
||||
options INET #InterNETworking
|
||||
options INET6 #IPv6 communications protocols
|
||||
options FFS #Berkeley Fast Filesystem
|
||||
options FFS_ROOT #FFS usable as root device [keep this!]
|
||||
options SOFTUPDATES #Enable FFS soft updates support
|
||||
options MFS #Memory Filesystem
|
||||
options MD_ROOT #MD is a potential root device
|
||||
@ -41,7 +40,6 @@ options NFS #Network Filesystem
|
||||
options NFS_ROOT #NFS usable as root device, NFS required
|
||||
options MSDOSFS #MSDOS Filesystem
|
||||
options CD9660 #ISO 9660 Filesystem
|
||||
options CD9660_ROOT #CD-ROM usable as root, CD9660 required
|
||||
options DEVFS #Device Filesystem
|
||||
options PROCFS #Process filesystem
|
||||
options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!]
|
||||
|
@ -677,11 +677,9 @@ options PORTAL #Portal filesystem
|
||||
options PROCFS #Process filesystem
|
||||
options UMAPFS #UID map filesystem
|
||||
options UNION #Union filesystem
|
||||
# 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
|
||||
options DEVFS #devices filesystem
|
||||
# The xFS_ROOT options REQUIRE the associated ``options xFS''
|
||||
options NFS_ROOT #NFS usable as root device
|
||||
# This code enables IFS, an FFS which exports inodes as the namespace.
|
||||
# You can find details in src/sys/ufs/ifs/README .
|
||||
options IFS
|
||||
|
@ -105,11 +105,16 @@ INCLUDE_CONFIG_FILE opt_config.h
|
||||
# time, since the corresponding lkms cannot work if there are any static
|
||||
# dependencies. Unusability is enforced by hiding the defines for the
|
||||
# options in a never-included header.
|
||||
CD9660 opt_dontuse.h
|
||||
CODA opt_dontuse.h
|
||||
EXT2FS opt_dontuse.h
|
||||
FDESC opt_dontuse.h
|
||||
FFS opt_dontuse.h
|
||||
IFS opt_dontuse.h
|
||||
MFS opt_dontuse.h
|
||||
MSDOSFS opt_dontuse.h
|
||||
NULLFS opt_dontuse.h
|
||||
NWFS opt_dontuse.h
|
||||
PORTAL opt_dontuse.h
|
||||
PROCFS opt_dontuse.h
|
||||
UMAPFS opt_dontuse.h
|
||||
@ -119,14 +124,8 @@ HPFS opt_dontuse.h
|
||||
# These static filesystems has one slightly bogus static dependency in
|
||||
# sys/i386/i386/autoconf.c. If any of these filesystems are
|
||||
# statically compiled into the kernel, code for mounting them as root
|
||||
# filesystems will be enabled - but look below. Boot-code is purposely
|
||||
# unavailable for the LKM-based versions.
|
||||
CODA
|
||||
CD9660
|
||||
FFS
|
||||
IFS
|
||||
# filesystems will be enabled - but look below.
|
||||
NFS
|
||||
NWFS
|
||||
|
||||
# If you are following the conditions in the copyright,
|
||||
# you can enable soft-updates which will speed up a lot of thigs
|
||||
@ -143,8 +142,6 @@ FFS_EXTATTR opt_ffs.h
|
||||
# <filesystem>_ROOT option to control if it usable as root. This list
|
||||
# allows these options to be present in config files already (though
|
||||
# they won't make any difference yet).
|
||||
CD9660_ROOT opt_cd9660.h
|
||||
FFS_ROOT opt_ffs.h
|
||||
NFS_ROOT opt_nfsroot.h
|
||||
|
||||
# The union static file system has bogus static dependencies, so it isn't
|
||||
|
@ -33,7 +33,6 @@ options MATH_EMULATE #Support for x87 emulation
|
||||
options INET #InterNETworking
|
||||
options INET6 #IPv6 communications protocols
|
||||
options FFS #Berkeley Fast Filesystem
|
||||
options FFS_ROOT #FFS usable as root device [keep this!]
|
||||
options SOFTUPDATES #Enable FFS soft updates support
|
||||
options MFS #Memory Filesystem
|
||||
options MD_ROOT #MD is a potential root device
|
||||
@ -41,7 +40,6 @@ options NFS #Network Filesystem
|
||||
options NFS_ROOT #NFS usable as root device, NFS required
|
||||
options MSDOSFS #MSDOS Filesystem
|
||||
options CD9660 #ISO 9660 Filesystem
|
||||
options CD9660_ROOT #CD-ROM usable as root, CD9660 required
|
||||
options DEVFS #Device Filesystem
|
||||
options PROCFS #Process filesystem
|
||||
options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!]
|
||||
|
@ -42,7 +42,6 @@ options MATH_EMULATE #Support for x87 emulation
|
||||
options INET #InterNETworking
|
||||
options INET6 #IPv6 communications protocols
|
||||
options FFS #Berkeley Fast Filesystem
|
||||
options FFS_ROOT #FFS usable as root device [keep this!]
|
||||
options SOFTUPDATES #Enable FFS soft updates support
|
||||
options MFS #Memory Filesystem
|
||||
options MD_ROOT #MD is a potential root device
|
||||
@ -50,7 +49,6 @@ options NFS #Network Filesystem
|
||||
options NFS_ROOT #NFS usable as root device, NFS required
|
||||
options MSDOSFS #MSDOS Filesystem
|
||||
options CD9660 #ISO 9660 Filesystem
|
||||
options CD9660_ROOT #CD-ROM usable as root, CD9660 required
|
||||
#options DEVFS #Device Filesystem
|
||||
options PROCFS #Process filesystem
|
||||
options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!]
|
||||
|
@ -677,11 +677,9 @@ options PORTAL #Portal filesystem
|
||||
options PROCFS #Process filesystem
|
||||
options UMAPFS #UID map filesystem
|
||||
options UNION #Union filesystem
|
||||
# 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
|
||||
options DEVFS #devices filesystem
|
||||
# The xFS_ROOT options REQUIRE the associated ``options xFS''
|
||||
options NFS_ROOT #NFS usable as root device
|
||||
# This code enables IFS, an FFS which exports inodes as the namespace.
|
||||
# You can find details in src/sys/ufs/ifs/README .
|
||||
options IFS
|
||||
|
@ -46,13 +46,10 @@
|
||||
* and the drivers are initialized.
|
||||
*/
|
||||
#include "opt_bootp.h"
|
||||
#include "opt_ffs.h"
|
||||
#include "opt_cd9660.h"
|
||||
#include "opt_isa.h"
|
||||
#include "opt_nfs.h"
|
||||
#include "opt_nfsroot.h"
|
||||
#include "opt_bus.h"
|
||||
#include "opt_rootdevname.h"
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
|
@ -34,7 +34,6 @@ maxusers 32
|
||||
options INET #InterNETworking
|
||||
options INET6 #IPv6 communications protocols
|
||||
options FFS #Berkeley Fast Filesystem
|
||||
options FFS_ROOT #FFS usable as root device [keep this!]
|
||||
options SOFTUPDATES #Enable FFS soft updates support
|
||||
options MFS #Memory Filesystem
|
||||
#options DEVFS #Device Filesystem
|
||||
@ -43,7 +42,6 @@ options NFS #Network Filesystem
|
||||
options NFS_ROOT #NFS usable as root device
|
||||
options MSDOSFS #MSDOS Filesystem
|
||||
options CD9660 #ISO 9660 Filesystem
|
||||
options CD9660_ROOT #CD-ROM usable as root device
|
||||
options PROCFS #Process filesystem
|
||||
options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!]
|
||||
options SCSI_DELAY=15000 #Delay (in ms) before probing SCSI
|
||||
|
@ -27,8 +27,6 @@
|
||||
*/
|
||||
|
||||
#include "opt_bootp.h"
|
||||
#include "opt_ffs.h"
|
||||
#include "opt_cd9660.h"
|
||||
#include "opt_isa.h"
|
||||
#include "opt_nfs.h"
|
||||
#include "opt_nfsroot.h"
|
||||
@ -113,9 +111,5 @@ cpu_rootconf()
|
||||
#endif
|
||||
rootdevnames[order++] = "nfs:";
|
||||
#endif
|
||||
|
||||
#if defined(FFS) && defined(FFS_ROOT)
|
||||
rootdevnames[order++] = "ufs:da0a";
|
||||
#endif
|
||||
}
|
||||
SYSINIT(cpu_rootconf, SI_SUB_ROOT_CONF, SI_ORDER_FIRST, cpu_rootconf, NULL)
|
||||
|
@ -35,7 +35,6 @@ options MATH_EMULATE #Support for x87 emulation
|
||||
options INET #InterNETworking
|
||||
options INET6 #IPv6 communications protocols
|
||||
options FFS #Berkeley Fast Filesystem
|
||||
options FFS_ROOT #FFS usable as root device [keep this!]
|
||||
options SOFTUPDATES #Enable FFS soft updates support
|
||||
options MFS #Memory Filesystem
|
||||
options MD_ROOT #MD is a potential root device
|
||||
@ -43,7 +42,6 @@ options NFS #Network Filesystem
|
||||
options NFS_ROOT #NFS usable as root device, NFS required
|
||||
options MSDOSFS #MSDOS Filesystem
|
||||
options CD9660 #ISO 9660 Filesystem
|
||||
options CD9660_ROOT #CD-ROM usable as root, CD9660 required
|
||||
#options DEVFS #Device Filesystem
|
||||
options PROCFS #Process filesystem
|
||||
options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!]
|
||||
|
Loading…
Reference in New Issue
Block a user