diff options
| author | msmith <msmith@FreeBSD.org> | 2000-05-30 15:18:30 +0000 |
|---|---|---|
| committer | msmith <msmith@FreeBSD.org> | 2000-05-30 15:18:30 +0000 |
| commit | 6af3825c82c787ac338dc18d0360380600e586e2 (patch) | |
| tree | 3141d517a8f627f1e794934c9f76b600db31662d /lib/libdisk | |
| parent | 0e201f3645c702f6f4a4e3b53c31362feafcfe3f (diff) | |
| download | FreeBSD-src-6af3825c82c787ac338dc18d0360380600e586e2.zip FreeBSD-src-6af3825c82c787ac338dc18d0360380600e586e2.tar.gz | |
De-support 'wd'; with it making a dual appearance with 'ad', things
depending on libdisk to detect a list of actually-there disk devices
were providing duplicate entries (eg. sysinstall).
Diffstat (limited to 'lib/libdisk')
| -rw-r--r-- | lib/libdisk/create_chunk.c | 4 | ||||
| -rw-r--r-- | lib/libdisk/disk.c | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/lib/libdisk/create_chunk.c b/lib/libdisk/create_chunk.c index 9292664..5273428 100644 --- a/lib/libdisk/create_chunk.c +++ b/lib/libdisk/create_chunk.c @@ -279,9 +279,7 @@ MakeDev(struct chunk *c1, const char *path) if (!strcmp(p, "X")) return 0; - if (!strncmp(p, "wd", 2)) - cmaj = 3, p += 2; - else if (!strncmp(p, "ad", 2)) + if (!strncmp(p, "ad", 2)) cmaj = 116, p += 2; else if (!strncmp(p, "wfd", 3)) cmaj = 87, p += 3; diff --git a/lib/libdisk/disk.c b/lib/libdisk/disk.c index 396dcfe..b05571c 100644 --- a/lib/libdisk/disk.c +++ b/lib/libdisk/disk.c @@ -441,7 +441,7 @@ Collapse_Disk(struct disk *d) } #endif -static char * device_list[] = {"wd", "ad", "da", "afd", "fla", "idad", "mlxd", "amrd", "twed", "fd", 0}; +static char * device_list[] = {"ad", "da", "afd", "fla", "idad", "mlxd", "amrd", "twed", "fd", 0}; char ** Disk_Names() |
