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

[Alexander Motin]

Author: mav
Date: Fri Mar 11 13:06:11 2016
New Revision: 296654
URL: https://svnweb.freebsd.org/changeset/base/296654

Log:
  Use `geom disk list` instead `camcontrol identify`.
  
  The new way works for almost any disk, while the old only for ATA.
  
  MFC after:	2 weeks

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	Fri Mar 11 12:59:07 2016	(r296653)
+++ head/usr.sbin/pc-sysinstall/backend-query/disk-list.sh	Fri Mar 11 13:06:11 2016	(r296654)
@@ -82,8 +82,8 @@ do
     esac
   fi
 
-  # Try and find some identification information with camcontrol
-  NEWLINE=$(camcontrol identify $DEV 2>/dev/null | sed -ne 's/^device model *//p')
+  # Try and get some identification information from GEOM
+  NEWLINE=$(geom disk list $DEV 2>/dev/null | sed -ne 's/^   descr: *//p')
   if [ -z "$NEWLINE" ]; then
     	NEWLINE=" <Unknown Device>"
   fi