summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--release/sysinstall/devices.c10
-rw-r--r--release/sysinstall/disks.c3
-rw-r--r--usr.sbin/sade/devices.c10
-rw-r--r--usr.sbin/sade/disks.c3
-rw-r--r--usr.sbin/sysinstall/devices.c10
-rw-r--r--usr.sbin/sysinstall/disks.c3
6 files changed, 18 insertions, 21 deletions
diff --git a/release/sysinstall/devices.c b/release/sysinstall/devices.c
index 6a98f11..ae0c4a1 100644
--- a/release/sysinstall/devices.c
+++ b/release/sysinstall/devices.c
@@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $Id: devices.c,v 1.80 1998/07/18 09:41:57 jkh Exp $
+ * $Id: devices.c,v 1.81 1998/09/13 16:45:10 wpaul Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -67,15 +67,13 @@ static struct _devname {
{ DEVICE_TYPE_CDROM, "scd%da", "Sony CDROM drive - CDU31/33A type", 16, 0, 8, 4, 'b' },
{ DEVICE_TYPE_CDROM, "matcd%da", "Matsushita CDROM ('sound blaster' type)", 17, 0, 8, 4, 'b' },
{ DEVICE_TYPE_CDROM, "wcd%dc", "ATAPI IDE CDROM", 19, 2, 8, 4, 'b' },
- { DEVICE_TYPE_TAPE, "rst%d", "SCSI tape drive", 14, 0, 16, 4, 'c' },
+ { DEVICE_TYPE_TAPE, "rsa%d", "SCSI tape drive", 14, 0, 16, 4, 'c' },
{ DEVICE_TYPE_TAPE, "rft%d", "Floppy tape drive (QIC-02)", 9, 32, 64, 4, 'c' },
{ DEVICE_TYPE_TAPE, "rwt%d", "Wangtek tape drive", 10, 0, 1, 4, 'c' },
- { DEVICE_TYPE_DISK, "sd%d", "SCSI disk device", 4, 65538, 8, 16, 'b' },
- { DEVICE_TYPE_DISK, "rsd%d", "SCSI disk device", 13, 65538, 8, 16, 'c' },
+ { DEVICE_TYPE_DISK, "da%d", "SCSI disk device", 4, 65538, 8, 16, 'b' },
+ { DEVICE_TYPE_DISK, "rda%d", "SCSI disk device", 13, 65538, 8, 16, 'c' },
{ DEVICE_TYPE_DISK, "wd%d", "IDE/ESDI/MFM/ST506 disk device", 0, 65538, 8, 16, 'b' },
{ DEVICE_TYPE_DISK, "rwd%d", "IDE/ESDI/MFM/ST506 disk device", 3, 65538, 8, 16, 'c' },
- { DEVICE_TYPE_DISK, "od%d", "SCSI optical disk device", 20, 65538, 8, 4, 'b' },
- { DEVICE_TYPE_DISK, "rod%d", "SCSI optical disk device", 70, 65538, 8, 4, 'c' },
{ DEVICE_TYPE_DISK, "wfd%d", "ATAPI floppy device", 1, 65538, 8, 4, 'b' },
{ DEVICE_TYPE_DISK, "rwfd%d", "ATAPI floppy device", 87, 65538, 8, 4, 'c' },
{ DEVICE_TYPE_FLOPPY, "fd%d", "floppy drive unit A", 2, 0, 64, 4, 'b' },
diff --git a/release/sysinstall/disks.c b/release/sysinstall/disks.c
index b5ed7ab..9f08837 100644
--- a/release/sysinstall/disks.c
+++ b/release/sysinstall/disks.c
@@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $Id: disks.c,v 1.98 1998/03/23 08:36:26 jkh Exp $
+ * $Id: disks.c,v 1.99 1998/09/14 19:14:11 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -291,6 +291,7 @@ diskPartition(Device *dev)
if (chunk_info[current_chunk]->type != freebsd)
msg = "Can only scan for bad blocks in FreeBSD slice.";
else if (strncmp(d->name, "sd", 2) ||
+ strncmp(d->name, "da", 2) ||
!msgYesNo("This typically makes sense only for ESDI, IDE or MFM drives.\n"
"Are you sure you want to do this on a SCSI disk?")) {
if (chunk_info[current_chunk]->flags & CHUNK_BAD144)
diff --git a/usr.sbin/sade/devices.c b/usr.sbin/sade/devices.c
index 6a98f11..ae0c4a1 100644
--- a/usr.sbin/sade/devices.c
+++ b/usr.sbin/sade/devices.c
@@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $Id: devices.c,v 1.80 1998/07/18 09:41:57 jkh Exp $
+ * $Id: devices.c,v 1.81 1998/09/13 16:45:10 wpaul Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -67,15 +67,13 @@ static struct _devname {
{ DEVICE_TYPE_CDROM, "scd%da", "Sony CDROM drive - CDU31/33A type", 16, 0, 8, 4, 'b' },
{ DEVICE_TYPE_CDROM, "matcd%da", "Matsushita CDROM ('sound blaster' type)", 17, 0, 8, 4, 'b' },
{ DEVICE_TYPE_CDROM, "wcd%dc", "ATAPI IDE CDROM", 19, 2, 8, 4, 'b' },
- { DEVICE_TYPE_TAPE, "rst%d", "SCSI tape drive", 14, 0, 16, 4, 'c' },
+ { DEVICE_TYPE_TAPE, "rsa%d", "SCSI tape drive", 14, 0, 16, 4, 'c' },
{ DEVICE_TYPE_TAPE, "rft%d", "Floppy tape drive (QIC-02)", 9, 32, 64, 4, 'c' },
{ DEVICE_TYPE_TAPE, "rwt%d", "Wangtek tape drive", 10, 0, 1, 4, 'c' },
- { DEVICE_TYPE_DISK, "sd%d", "SCSI disk device", 4, 65538, 8, 16, 'b' },
- { DEVICE_TYPE_DISK, "rsd%d", "SCSI disk device", 13, 65538, 8, 16, 'c' },
+ { DEVICE_TYPE_DISK, "da%d", "SCSI disk device", 4, 65538, 8, 16, 'b' },
+ { DEVICE_TYPE_DISK, "rda%d", "SCSI disk device", 13, 65538, 8, 16, 'c' },
{ DEVICE_TYPE_DISK, "wd%d", "IDE/ESDI/MFM/ST506 disk device", 0, 65538, 8, 16, 'b' },
{ DEVICE_TYPE_DISK, "rwd%d", "IDE/ESDI/MFM/ST506 disk device", 3, 65538, 8, 16, 'c' },
- { DEVICE_TYPE_DISK, "od%d", "SCSI optical disk device", 20, 65538, 8, 4, 'b' },
- { DEVICE_TYPE_DISK, "rod%d", "SCSI optical disk device", 70, 65538, 8, 4, 'c' },
{ DEVICE_TYPE_DISK, "wfd%d", "ATAPI floppy device", 1, 65538, 8, 4, 'b' },
{ DEVICE_TYPE_DISK, "rwfd%d", "ATAPI floppy device", 87, 65538, 8, 4, 'c' },
{ DEVICE_TYPE_FLOPPY, "fd%d", "floppy drive unit A", 2, 0, 64, 4, 'b' },
diff --git a/usr.sbin/sade/disks.c b/usr.sbin/sade/disks.c
index b5ed7ab..9f08837 100644
--- a/usr.sbin/sade/disks.c
+++ b/usr.sbin/sade/disks.c
@@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $Id: disks.c,v 1.98 1998/03/23 08:36:26 jkh Exp $
+ * $Id: disks.c,v 1.99 1998/09/14 19:14:11 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -291,6 +291,7 @@ diskPartition(Device *dev)
if (chunk_info[current_chunk]->type != freebsd)
msg = "Can only scan for bad blocks in FreeBSD slice.";
else if (strncmp(d->name, "sd", 2) ||
+ strncmp(d->name, "da", 2) ||
!msgYesNo("This typically makes sense only for ESDI, IDE or MFM drives.\n"
"Are you sure you want to do this on a SCSI disk?")) {
if (chunk_info[current_chunk]->flags & CHUNK_BAD144)
diff --git a/usr.sbin/sysinstall/devices.c b/usr.sbin/sysinstall/devices.c
index 6a98f11..ae0c4a1 100644
--- a/usr.sbin/sysinstall/devices.c
+++ b/usr.sbin/sysinstall/devices.c
@@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $Id: devices.c,v 1.80 1998/07/18 09:41:57 jkh Exp $
+ * $Id: devices.c,v 1.81 1998/09/13 16:45:10 wpaul Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -67,15 +67,13 @@ static struct _devname {
{ DEVICE_TYPE_CDROM, "scd%da", "Sony CDROM drive - CDU31/33A type", 16, 0, 8, 4, 'b' },
{ DEVICE_TYPE_CDROM, "matcd%da", "Matsushita CDROM ('sound blaster' type)", 17, 0, 8, 4, 'b' },
{ DEVICE_TYPE_CDROM, "wcd%dc", "ATAPI IDE CDROM", 19, 2, 8, 4, 'b' },
- { DEVICE_TYPE_TAPE, "rst%d", "SCSI tape drive", 14, 0, 16, 4, 'c' },
+ { DEVICE_TYPE_TAPE, "rsa%d", "SCSI tape drive", 14, 0, 16, 4, 'c' },
{ DEVICE_TYPE_TAPE, "rft%d", "Floppy tape drive (QIC-02)", 9, 32, 64, 4, 'c' },
{ DEVICE_TYPE_TAPE, "rwt%d", "Wangtek tape drive", 10, 0, 1, 4, 'c' },
- { DEVICE_TYPE_DISK, "sd%d", "SCSI disk device", 4, 65538, 8, 16, 'b' },
- { DEVICE_TYPE_DISK, "rsd%d", "SCSI disk device", 13, 65538, 8, 16, 'c' },
+ { DEVICE_TYPE_DISK, "da%d", "SCSI disk device", 4, 65538, 8, 16, 'b' },
+ { DEVICE_TYPE_DISK, "rda%d", "SCSI disk device", 13, 65538, 8, 16, 'c' },
{ DEVICE_TYPE_DISK, "wd%d", "IDE/ESDI/MFM/ST506 disk device", 0, 65538, 8, 16, 'b' },
{ DEVICE_TYPE_DISK, "rwd%d", "IDE/ESDI/MFM/ST506 disk device", 3, 65538, 8, 16, 'c' },
- { DEVICE_TYPE_DISK, "od%d", "SCSI optical disk device", 20, 65538, 8, 4, 'b' },
- { DEVICE_TYPE_DISK, "rod%d", "SCSI optical disk device", 70, 65538, 8, 4, 'c' },
{ DEVICE_TYPE_DISK, "wfd%d", "ATAPI floppy device", 1, 65538, 8, 4, 'b' },
{ DEVICE_TYPE_DISK, "rwfd%d", "ATAPI floppy device", 87, 65538, 8, 4, 'c' },
{ DEVICE_TYPE_FLOPPY, "fd%d", "floppy drive unit A", 2, 0, 64, 4, 'b' },
diff --git a/usr.sbin/sysinstall/disks.c b/usr.sbin/sysinstall/disks.c
index b5ed7ab..9f08837 100644
--- a/usr.sbin/sysinstall/disks.c
+++ b/usr.sbin/sysinstall/disks.c
@@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $Id: disks.c,v 1.98 1998/03/23 08:36:26 jkh Exp $
+ * $Id: disks.c,v 1.99 1998/09/14 19:14:11 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -291,6 +291,7 @@ diskPartition(Device *dev)
if (chunk_info[current_chunk]->type != freebsd)
msg = "Can only scan for bad blocks in FreeBSD slice.";
else if (strncmp(d->name, "sd", 2) ||
+ strncmp(d->name, "da", 2) ||
!msgYesNo("This typically makes sense only for ESDI, IDE or MFM drives.\n"
"Are you sure you want to do this on a SCSI disk?")) {
if (chunk_info[current_chunk]->flags & CHUNK_BAD144)
OpenPOWER on IntegriCloud