diff --git a/sys/alpha/alpha/autoconf.c b/sys/alpha/alpha/autoconf.c index 2bacd25b6bc..42696dfed2d 100644 --- a/sys/alpha/alpha/autoconf.c +++ b/sys/alpha/alpha/autoconf.c @@ -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) diff --git a/sys/alpha/conf/GENERIC b/sys/alpha/conf/GENERIC index e7fa03a7db3..6340bb2ad21 100644 --- a/sys/alpha/conf/GENERIC +++ b/sys/alpha/conf/GENERIC @@ -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!] diff --git a/sys/alpha/conf/NOTES b/sys/alpha/conf/NOTES index e7fa03a7db3..6340bb2ad21 100644 --- a/sys/alpha/conf/NOTES +++ b/sys/alpha/conf/NOTES @@ -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!] diff --git a/sys/alpha/conf/SIMOS b/sys/alpha/conf/SIMOS index 83d9dd2b507..ec314be1b56 100644 --- a/sys/alpha/conf/SIMOS +++ b/sys/alpha/conf/SIMOS @@ -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!] diff --git a/sys/amd64/amd64/autoconf.c b/sys/amd64/amd64/autoconf.c index eb8eb8dd971..b6700be6466 100644 --- a/sys/amd64/amd64/autoconf.c +++ b/sys/amd64/amd64/autoconf.c @@ -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 #include diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index d1d5754d3d2..f71310ca010 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -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!] diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 53b692f42d2..f0835e8b96b 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -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 diff --git a/sys/conf/options b/sys/conf/options index 97420fdac20..4c97dc4ce8b 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -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 # _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 diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index d1d5754d3d2..f71310ca010 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -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!] diff --git a/sys/i386/conf/NEWCARD b/sys/i386/conf/NEWCARD index 71921a89c06..65e9b7f2941 100644 --- a/sys/i386/conf/NEWCARD +++ b/sys/i386/conf/NEWCARD @@ -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!] diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index 53b692f42d2..f0835e8b96b 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -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 diff --git a/sys/i386/i386/autoconf.c b/sys/i386/i386/autoconf.c index eb8eb8dd971..b6700be6466 100644 --- a/sys/i386/i386/autoconf.c +++ b/sys/i386/i386/autoconf.c @@ -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 #include diff --git a/sys/ia64/conf/GENERIC b/sys/ia64/conf/GENERIC index 9d8a5c4a35d..effabbcca0b 100644 --- a/sys/ia64/conf/GENERIC +++ b/sys/ia64/conf/GENERIC @@ -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 diff --git a/sys/ia64/ia64/autoconf.c b/sys/ia64/ia64/autoconf.c index fb5578d6cd9..6c6dec840b9 100644 --- a/sys/ia64/ia64/autoconf.c +++ b/sys/ia64/ia64/autoconf.c @@ -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) diff --git a/sys/pc98/conf/GENERIC b/sys/pc98/conf/GENERIC index ddc58bf35d5..c8e5d0ad779 100644 --- a/sys/pc98/conf/GENERIC +++ b/sys/pc98/conf/GENERIC @@ -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!]