On Tue, Feb 22, 2011 at 07:18:56PM +0000, Josh Paetzel wrote: > Author: jpaetzel > Date: Tue Feb 22 19:18:56 2011 > New Revision: 218959 > URL: http://svn.freebsd.org/changeset/base/218959 > > Log: > Better method for grabbing disk name, dmesg may produce mangled output. > > 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 Tue Feb 22 > 19:05:42 2011 (r218958) > +++ head/usr.sbin/pc-sysinstall/backend-query/disk-list.sh Tue Feb 22 > 19:18:56 2011 (r218959) > @@ -74,7 +74,7 @@ do > fi > > # Check the dmesg output for some more info about this device Shouldn't the comment be updated ?
> - NEWLINE=$(dmesg | sed -n "s/^$DEV: .*<\(.*\)>.*$/ <\1>/p" | head -n 1) > + NEWLINE=$(camcontrol identify $DEV | grep "device model" | tr -s ' ' | sed > 's |device model ||g') > if [ -z "$NEWLINE" ]; then > NEWLINE=" <Unknown Device>" > fi
pgpUeKTNpnHBX.pgp
Description: PGP signature