Date: Wed, 23 Feb 2011 17:52:26 +0000 (UTC) From: Josh Paetzel <jpaetzel@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r218975 - head/usr.sbin/pc-sysinstall/backend-query Message-ID: <201102231752.p1NHqQkB002368@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jpaetzel Date: Wed Feb 23 17:52:26 2011 New Revision: 218975 URL: http://svn.freebsd.org/changeset/base/218975 Log: Alter comment to reflect change in code. Try atacontrol if camcontrol fails. Approved by: kib (mentor, implicit) Modified: head/usr.sbin/pc-sysinstall/backend-query/disk-list.sh Modified: head/usr.sbin/pc-sysinstall/backend-query/disk-list.sh ============================================================================== --- head/usr.sbin/pc-sysinstall/backend-query/disk-list.sh Wed Feb 23 17:17:05 2011 (r218974) +++ head/usr.sbin/pc-sysinstall/backend-query/disk-list.sh Wed Feb 23 17:52:26 2011 (r218975) @@ -73,10 +73,15 @@ do esac fi - # Check the dmesg output for some more info about this device - NEWLINE=$(camcontrol identify $DEV | grep "device model" | tr -s ' ' | sed 's |device model ||g') + # Try and find some identification information with camcontrol or atacontrol + NEWLINE=$(camcontrol identify $DEV | sed -ne 's/^device model *//p') if [ -z "$NEWLINE" ]; then - NEWLINE=" <Unknown Device>" + # Now try atacontrol + NEWLINE=$(atacontrol list | sed -n "s|^.*$DEV <\(.*\)>.*|\1|p") + + if [ -z "$NEWLINE" ]; then + NEWLINE=" <Unknown Device>" + fi 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?201102231752.p1NHqQkB002368>