From owner-svn-src-stable@freebsd.org  Mon Mar 28 09:34:16 2016
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1DDBDADFB2A;
 Mon, 28 Mar 2016 09:34:16 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id E0F9E18D3;
 Mon, 28 Mar 2016 09:34:15 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2S9YF5k005308;
 Mon, 28 Mar 2016 09:34:15 GMT (envelope-from mav@FreeBSD.org)
Received: (from mav@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2S9YFkQ005307;
 Mon, 28 Mar 2016 09:34:15 GMT (envelope-from mav@FreeBSD.org)
Message-Id: <201603280934.u2S9YFkQ005307@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org
 using -f
From: Alexander Motin <mav@FreeBSD.org>
Date: Mon, 28 Mar 2016 09:34:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r297344 - stable/10/usr.sbin/pc-sysinstall/backend-query
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 28 Mar 2016 09:34:16 -0000

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