diff options
author | jhb <jhb@FreeBSD.org> | 2002-11-27 17:56:27 +0000 |
---|---|---|
committer | jhb <jhb@FreeBSD.org> | 2002-11-27 17:56:27 +0000 |
commit | 2897e2728d2060055931ead3c876fadfc0eb41e0 (patch) | |
tree | 933ea0f42ac891ff6b9564e60c2442709ce56fe4 /usr.sbin | |
parent | 580898be412559d648c0454fd631ca1bc63562a5 (diff) | |
download | FreeBSD-src-2897e2728d2060055931ead3c876fadfc0eb41e0.zip FreeBSD-src-2897e2728d2060055931ead3c876fadfc0eb41e0.tar.gz |
Don't use fake 'c' or 'a' BSD partitions for CD-ROM devices. This fixes
sysinstall to create /cdrom entries in /etc/fstab that just use the
raw CD-ROM device /dev/cd0, etc.
Approved by: re
Diffstat (limited to 'usr.sbin')
-rw-r--r-- | usr.sbin/sade/devices.c | 10 | ||||
-rw-r--r-- | usr.sbin/sysinstall/devices.c | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/usr.sbin/sade/devices.c b/usr.sbin/sade/devices.c index e675ae1..c64d6de 100644 --- a/usr.sbin/sade/devices.c +++ b/usr.sbin/sade/devices.c @@ -61,13 +61,13 @@ static struct _devname { char *description; int major, minor, delta, max; } device_names[] = { - { DEVICE_TYPE_CDROM, "cd%dc", "SCSI CDROM drive", 15, 2, 8, 4 }, - { DEVICE_TYPE_CDROM, "mcd%da", "Mitsumi (old model) CDROM drive", 29, 0, 8, 4 }, - { DEVICE_TYPE_CDROM, "scd%da", "Sony CDROM drive - CDU31/33A type", 45, 0, 8, 4 }, + { DEVICE_TYPE_CDROM, "cd%d", "SCSI CDROM drive", 15, 2, 8, 4 }, + { DEVICE_TYPE_CDROM, "mcd%d", "Mitsumi (old model) CDROM drive", 29, 0, 8, 4 }, + { DEVICE_TYPE_CDROM, "scd%d", "Sony CDROM drive - CDU31/33A type", 45, 0, 8, 4 }, #ifdef notdef - { DEVICE_TYPE_CDROM, "matcd%da", "Matsushita CDROM ('sound blaster' type)", 46, 0, 8, 4 }, + { DEVICE_TYPE_CDROM, "matcd%d", "Matsushita CDROM ('sound blaster' type)", 46, 0, 8, 4 }, #endif - { DEVICE_TYPE_CDROM, "acd%dc", "ATAPI/IDE CDROM", 117, 0, 8, 4 }, + { DEVICE_TYPE_CDROM, "acd%d", "ATAPI/IDE CDROM", 117, 0, 8, 4 }, { DEVICE_TYPE_TAPE, "rsa%d", "SCSI tape drive", 14, 0, 16, 4 }, { DEVICE_TYPE_TAPE, "rwt%d", "Wangtek tape drive", 10, 0, 1, 4 }, { DEVICE_TYPE_DISK, "da%d", "SCSI disk device", 13, 65538, 8, 16 }, diff --git a/usr.sbin/sysinstall/devices.c b/usr.sbin/sysinstall/devices.c index e675ae1..c64d6de 100644 --- a/usr.sbin/sysinstall/devices.c +++ b/usr.sbin/sysinstall/devices.c @@ -61,13 +61,13 @@ static struct _devname { char *description; int major, minor, delta, max; } device_names[] = { - { DEVICE_TYPE_CDROM, "cd%dc", "SCSI CDROM drive", 15, 2, 8, 4 }, - { DEVICE_TYPE_CDROM, "mcd%da", "Mitsumi (old model) CDROM drive", 29, 0, 8, 4 }, - { DEVICE_TYPE_CDROM, "scd%da", "Sony CDROM drive - CDU31/33A type", 45, 0, 8, 4 }, + { DEVICE_TYPE_CDROM, "cd%d", "SCSI CDROM drive", 15, 2, 8, 4 }, + { DEVICE_TYPE_CDROM, "mcd%d", "Mitsumi (old model) CDROM drive", 29, 0, 8, 4 }, + { DEVICE_TYPE_CDROM, "scd%d", "Sony CDROM drive - CDU31/33A type", 45, 0, 8, 4 }, #ifdef notdef - { DEVICE_TYPE_CDROM, "matcd%da", "Matsushita CDROM ('sound blaster' type)", 46, 0, 8, 4 }, + { DEVICE_TYPE_CDROM, "matcd%d", "Matsushita CDROM ('sound blaster' type)", 46, 0, 8, 4 }, #endif - { DEVICE_TYPE_CDROM, "acd%dc", "ATAPI/IDE CDROM", 117, 0, 8, 4 }, + { DEVICE_TYPE_CDROM, "acd%d", "ATAPI/IDE CDROM", 117, 0, 8, 4 }, { DEVICE_TYPE_TAPE, "rsa%d", "SCSI tape drive", 14, 0, 16, 4 }, { DEVICE_TYPE_TAPE, "rwt%d", "Wangtek tape drive", 10, 0, 1, 4 }, { DEVICE_TYPE_DISK, "da%d", "SCSI disk device", 13, 65538, 8, 16 }, |