Date: Thu, 4 Apr 2013 12:03:31 +0000 (UTC) From: Alexander Motin <mav@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r249094 - in head/usr.sbin: bsdconfig/share pc-sysinstall/backend-query Message-ID: <201304041203.r34C3V9M041454@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mav Date: Thu Apr 4 12:03:30 2013 New Revision: 249094 URL: http://svnweb.freebsd.org/changeset/base/249094 Log: Remove some more references to legacy ATA. Submitted by: Dmitry Luhtionov <dmitryluhtionov@gmail.com> Modified: head/usr.sbin/bsdconfig/share/device.subr head/usr.sbin/pc-sysinstall/backend-query/disk-list.sh Modified: head/usr.sbin/bsdconfig/share/device.subr ============================================================================== --- head/usr.sbin/bsdconfig/share/device.subr Thu Apr 4 10:46:33 2013 (r249093) +++ head/usr.sbin/bsdconfig/share/device.subr Thu Apr 4 12:03:30 2013 (r249094) @@ -663,16 +663,12 @@ f_network() { f_device_name_set $DEVICE ############################################################ 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 Modified: head/usr.sbin/pc-sysinstall/backend-query/disk-list.sh ============================================================================== --- head/usr.sbin/pc-sysinstall/backend-query/disk-list.sh Thu Apr 4 10:46:33 2013 (r249093) +++ head/usr.sbin/pc-sysinstall/backend-query/disk-list.sh Thu Apr 4 12:03:30 2013 (r249094) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201304041203.r34C3V9M041454>