svn commit: r297344 - stable/10/usr.sbin/pc-sysinstall/backend-query

[Alexander Motin]

Author: mav
Date: Mon Mar 28 09:34:14 2016
New Revision: 297344
URL: https://svnweb.freebsd.org/changeset/base/297344

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

Modified:
  stable/10/usr.sbin/pc-sysinstall/backend-query/disk-list.sh
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/pc-sysinstall/backend-query/disk-list.sh
==============================================================================
--- stable/10/usr.sbin/pc-sysinstall/backend-query/disk-list.sh	Mon Mar 28 09:29:14 2016	(r297343)
+++ stable/10/usr.sbin/pc-sysinstall/backend-query/disk-list.sh	Mon Mar 28 09:34:14 2016	(r297344)
@@ -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