From owner-svn-src-head@FreeBSD.ORG Tue Feb 22 21:21:47 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EE1F6106564A; Tue, 22 Feb 2011 21:21:47 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from mail.zoral.com.ua (mx0.zoral.com.ua [91.193.166.200]) by mx1.freebsd.org (Postfix) with ESMTP id 4A2FB8FC14; Tue, 22 Feb 2011 21:21:46 +0000 (UTC) Received: from deviant.kiev.zoral.com.ua (root@deviant.kiev.zoral.com.ua [10.1.1.148]) by mail.zoral.com.ua (8.14.2/8.14.2) with ESMTP id p1MLLhem032298 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 22 Feb 2011 23:21:43 +0200 (EET) (envelope-from kostikbel@gmail.com) Received: from deviant.kiev.zoral.com.ua (kostik@localhost [127.0.0.1]) by deviant.kiev.zoral.com.ua (8.14.4/8.14.4) with ESMTP id p1MLLh5T062542; Tue, 22 Feb 2011 23:21:43 +0200 (EET) (envelope-from kostikbel@gmail.com) Received: (from kostik@localhost) by deviant.kiev.zoral.com.ua (8.14.4/8.14.4/Submit) id p1MLLhuF062541; Tue, 22 Feb 2011 23:21:43 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: deviant.kiev.zoral.com.ua: kostik set sender to kostikbel@gmail.com using -f Date: Tue, 22 Feb 2011 23:21:43 +0200 From: Kostik Belousov To: Josh Paetzel Message-ID: <20110222212143.GE78089@deviant.kiev.zoral.com.ua> References: <201102221918.p1MJIukV018893@svn.freebsd.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="ys1XzWHRwUoZRcaf" Content-Disposition: inline In-Reply-To: <201102221918.p1MJIukV018893@svn.freebsd.org> User-Agent: Mutt/1.4.2.3i X-Spam-Status: No, score=-3.4 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00, DNS_FROM_OPENWHOIS autolearn=no version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on skuns.kiev.zoral.com.ua Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r218959 - head/usr.sbin/pc-sysinstall/backend-query X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Feb 2011 21:21:48 -0000 --ys1XzWHRwUoZRcaf Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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 >=20 > Log: > Better method for grabbing disk name, dmesg may produce mangled output. > =20 > Approved by: kib (mentor, implicit) >=20 > Modified: > head/usr.sbin/pc-sysinstall/backend-query/disk-list.sh >=20 > Modified: head/usr.sbin/pc-sysinstall/backend-query/disk-list.sh > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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 > =20 > # Check the dmesg output for some more info about this device Shouldn't the comment be updated ? > - NEWLINE=3D$(dmesg | sed -n "s/^$DEV: .*<\(.*\)>.*$/ <\1>/p" | head -n = 1) > + NEWLINE=3D$(camcontrol identify $DEV | grep "device model" | tr -s ' '= | sed 's |device model ||g') > if [ -z "$NEWLINE" ]; then > NEWLINE=3D" " > fi --ys1XzWHRwUoZRcaf Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (FreeBSD) iEYEARECAAYFAk1kKOcACgkQC3+MBN1Mb4iHlACg4YCP2uWYkixh8S9tuwqK3rY+ nbYAoKlpuht0mekRtlgOiLEG8ulixev/ =SWa4 -----END PGP SIGNATURE----- --ys1XzWHRwUoZRcaf--