diff options
| -rw-r--r-- | usr.sbin/bsdconfig/share/device.subr | 6 | ||||
| -rwxr-xr-x | usr.sbin/pc-sysinstall/backend-query/disk-list.sh | 9 |
2 files changed, 3 insertions, 12 deletions
diff --git a/usr.sbin/bsdconfig/share/device.subr b/usr.sbin/bsdconfig/share/device.subr index 473838b..07b3f87 100644 --- a/usr.sbin/bsdconfig/share/device.subr +++ b/usr.sbin/bsdconfig/share/device.subr @@ -663,16 +663,12 @@ f_network() { f_device_name_set $DEVICE_TYPE_NETWORK "$1" "$2"; } ############################################################ MAIN # CDROM, Disk, Floppy, Serial, and USB devices/names -f_cdrom "acd%d" "ATAPI/IDE CDROM" 4 f_cdrom "cd%d" "SCSI CDROM drive" 4 f_cdrom "mcd%d" "Mitsumi (old model) CDROM drive" 4 f_cdrom "scd%d" "Sony CDROM drive - CDU31/33A type" 4 f_disk "aacd%d" "Adaptec FSA RAID array" 4 -f_disk "ad%d" "ATA/IDE disk device" 16 -f_disk "ada%d" "SATA disk device" 16 -f_disk "afd%d" "ATAPI/IDE floppy device" 4 +f_disk "ada%d" "ATA/SATA disk device" 16 f_disk "amrd%d" "AMI MegaRAID drive" 4 -f_disk "ar%d" "ATA/IDE RAID device" 16 f_disk "da%d" "SCSI disk device" 16 f_disk "idad%d" "Compaq RAID array" 4 f_disk "ipsd%d" "IBM ServeRAID RAID array" 4 diff --git a/usr.sbin/pc-sysinstall/backend-query/disk-list.sh b/usr.sbin/pc-sysinstall/backend-query/disk-list.sh index d390cbb..2616ef9 100755 --- a/usr.sbin/pc-sysinstall/backend-query/disk-list.sh +++ b/usr.sbin/pc-sysinstall/backend-query/disk-list.sh @@ -82,15 +82,10 @@ do esac fi - # Try and find some identification information with camcontrol or atacontrol + # Try and find some identification information with camcontrol NEWLINE=$(camcontrol identify $DEV 2>/dev/null | sed -ne 's/^device model *//p') if [ -z "$NEWLINE" ]; then - # Now try atacontrol - NEWLINE=$(atacontrol list 2>/dev/null | sed -n "s|^.*$DEV <\(.*\)>.*|\1|p") - - if [ -z "$NEWLINE" ]; then - NEWLINE=" <Unknown Device>" - fi + NEWLINE=" <Unknown Device>" fi if [ -n "${FLAGS_MD}" ] && echo "${DEV}" | grep -E '^md[0-9]+' >/dev/null 2>/dev/null |
