diff options
| author | phk <phk@FreeBSD.org> | 2002-10-05 16:35:33 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2002-10-05 16:35:33 +0000 |
| commit | 951c3e53b2ed3b6d204d571d81928a44baf1a85e (patch) | |
| tree | 281a4e3831a5ca364a19928efbfe097201919121 /sys/kern/subr_disk.c | |
| parent | ca4946005d763c5181649378e37809110aa0e1b5 (diff) | |
| download | FreeBSD-src-951c3e53b2ed3b6d204d571d81928a44baf1a85e.zip FreeBSD-src-951c3e53b2ed3b6d204d571d81928a44baf1a85e.tar.gz | |
NB: This commit does *NOT* make GEOM the default in FreeBSD
NB: But it will enable it in all kernels not having options "NO_GEOM"
Put the GEOM related options into the intended order.
Add "options NO_GEOM" to all kernel configs apart from NOTES.
In some order of controlled fashion, the NO_GEOM options will be
removed, architecture by architecture in the coming days.
There are currently three known issues which may force people to
need the NO_GEOM option:
boot0cfg/fdisk:
Tries to update the MBR while it is being used to control
slices. GEOM does not allow this as a direct operation.
SCSI floppy drives:
Appearantly the scsi-da driver return "EBUSY" if no media
is inserted. This is wrong, it should return ENXIO.
PC98:
It is unclear if GEOM correctly recognizes all variants of
PC98 disklabels. (Help Wanted! I have neither docs nor HW)
These issues are all being worked.
Sponsored by: DARPA & NAI Labs.
Diffstat (limited to 'sys/kern/subr_disk.c')
| -rw-r--r-- | sys/kern/subr_disk.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/kern/subr_disk.c b/sys/kern/subr_disk.c index d6c6643..d233f3c 100644 --- a/sys/kern/subr_disk.c +++ b/sys/kern/subr_disk.c @@ -20,7 +20,7 @@ #include <sys/disk.h> #include <sys/diskslice.h> #include <sys/disklabel.h> -#ifndef GEOM +#ifdef NO_GEOM #include <sys/kernel.h> #include <sys/sysctl.h> #include <sys/malloc.h> @@ -440,7 +440,7 @@ SYSCTL_INT(_debug_sizeof, OID_AUTO, diskslices, CTLFLAG_RD, SYSCTL_INT(_debug_sizeof, OID_AUTO, disk, CTLFLAG_RD, 0, sizeof(struct disk), "sizeof(struct disk)"); -#endif +#endif /* NO_GEOM */ /*- * Disk error is the preface to plaintive error messages |
