d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove some more references to legacy ATA.

Browse Source 
Submitted by:	Dmitry Luhtionov <dmitryluhtionov@gmail.com>
This commit is contained in:
Alexander Motin 2013-04-04 12:03:30 +00:00
parent ae0ac787f2
commit b296309582
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
usr.sbin/bsdconfig/share/device.subr
View File

@ -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

9
usr.sbin/pc-sysinstall/backend-query/disk-list.sh
View File

@ -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