diff options
author | phk <phk@FreeBSD.org> | 1999-11-26 20:08:44 +0000 |
---|---|---|
committer | phk <phk@FreeBSD.org> | 1999-11-26 20:08:44 +0000 |
commit | ccda399c7212987131af26c9939c9d18ff81bf06 (patch) | |
tree | da5d1958e9ff3ca5620bb5bef78b93937354a8c0 /sys/i386/conf | |
parent | c7fbb8b2a29b3c0b3a8336742840797f3fb94657 (diff) | |
download | FreeBSD-src-ccda399c7212987131af26c9939c9d18ff81bf06.zip FreeBSD-src-ccda399c7212987131af26c9939c9d18ff81bf06.tar.gz |
Retire MFS_ROOT and MFS_ROOT_SIZE options from the MFS implementation.
Add MD_ROOT and MD_ROOT_SIZE options to the md driver.
Make the md driver handle MFS_ROOT and MFS_ROOT_SIZE options for compatibility.
Add md driver to GENERIC, PCCARD and LINT.
This is a cleanup which removes the need for some of the worse hacks in
MFS: We really want to have a rootvnode but MFS on a preloaded image
doesn't really have one. md is a true device, so it is less trouble.
This has been tested with make release, and if people remember to add
the "md" pseudo-device to their kernels, PicoBSD should be just fine
as well. If people have no other use for MFS, it can be removed from
the kernel.
Diffstat (limited to 'sys/i386/conf')
-rw-r--r-- | sys/i386/conf/GENERIC | 3 | ||||
-rw-r--r-- | sys/i386/conf/LINT | 11 | ||||
-rw-r--r-- | sys/i386/conf/NOTES | 11 | ||||
-rw-r--r-- | sys/i386/conf/PCCARD | 3 |
4 files changed, 18 insertions, 10 deletions
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index 60c5e9a..81d9e00 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -31,8 +31,8 @@ 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 MD_ROOT #MD is a potential root device options MFS #Memory Filesystem -options MFS_ROOT #MFS usable as root device, "MFS" req'ed options NFS #Network Filesystem options NFS_ROOT #NFS usable as root device, "NFS" req'ed options MSDOSFS #MSDOS Filesystem @@ -206,6 +206,7 @@ pseudo-device ppp 1 # Kernel PPP pseudo-device tun # Packet tunnel. pseudo-device pty # Pseudo-ttys (telnet etc) pseudo-device gzip # Exec gzipped a.out's +pseudo-device md # Memory "disks" # The `bpf' pseudo-device enables the Berkeley Packet Filter. # Be aware of the administrative consequences of enabling this! diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT index 00ee4f4..9bd94fc 100644 --- a/sys/i386/conf/LINT +++ b/sys/i386/conf/LINT @@ -604,7 +604,6 @@ 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 MFS_ROOT #MFS 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). # Also, 'options MFS' is currently incompatible with DEVFS. @@ -620,9 +619,13 @@ options DEVFS #devices filesystem # #options SOFTUPDATES -# Make space in the kernel for a MFS root filesystem. Define to the number -# of kilobytes to reserve for the filesystem. -options MFS_ROOT_SIZE=10 +# Make space in the kernel for a root filesystem on a md device. +# Define to the number of kilobytes to reserve for the filesystem. +options MD_ROOT_SIZE=10 + +# Make the md device a potential root device, either with preloaded +# images of type mfs_root or md_root. +options MD_ROOT # Allow this many swap-devices. options NSWAPDEV=20 diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index 00ee4f4..9bd94fc 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -604,7 +604,6 @@ 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 MFS_ROOT #MFS 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). # Also, 'options MFS' is currently incompatible with DEVFS. @@ -620,9 +619,13 @@ options DEVFS #devices filesystem # #options SOFTUPDATES -# Make space in the kernel for a MFS root filesystem. Define to the number -# of kilobytes to reserve for the filesystem. -options MFS_ROOT_SIZE=10 +# Make space in the kernel for a root filesystem on a md device. +# Define to the number of kilobytes to reserve for the filesystem. +options MD_ROOT_SIZE=10 + +# Make the md device a potential root device, either with preloaded +# images of type mfs_root or md_root. +options MD_ROOT # Allow this many swap-devices. options NSWAPDEV=20 diff --git a/sys/i386/conf/PCCARD b/sys/i386/conf/PCCARD index 52b5947..e783794 100644 --- a/sys/i386/conf/PCCARD +++ b/sys/i386/conf/PCCARD @@ -33,7 +33,7 @@ options INET #InterNETworking options FFS #Berkeley Fast Filesystem options FFS_ROOT #FFS usable as root device [keep this!] options MFS #Memory Filesystem -options MFS_ROOT #MFS usable as root device, "MFS" req'ed +options MD_ROOT #MD is a potential root device options NFS #Network Filesystem options NFS_ROOT #NFS usable as root device, "NFS" req'ed options MSDOSFS #MSDOS Filesystem @@ -213,6 +213,7 @@ pseudo-device ppp 1 # Kernel PPP pseudo-device tun # Packet tunnel. pseudo-device pty # Pseudo-ttys (telnet etc) pseudo-device gzip # Exec gzipped a.out's +pseudo-device md # Memory "disks" # The `bpf' pseudo-device enables the Berkeley Packet Filter. # Be aware of the administrative consequences of enabling this! |