svn commit: r218959 - head/usr.sbin/pc-sysinstall/backend-query

Josh Paetzel jpaetzel at FreeBSD.org
Tue Feb 22 19:18:56 UTC 2011


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


More information about the svn-src-head mailing list