From owner-svn-src-all@FreeBSD.ORG  Fri Aug 14 13:26:50 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 80B75106568B;
	Fri, 14 Aug 2009 13:26:50 +0000 (UTC)
	(envelope-from cperciva@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6E9148FC4D;
	Fri, 14 Aug 2009 13:26:50 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n7EDQoh8035357;
	Fri, 14 Aug 2009 13:26:50 GMT
	(envelope-from cperciva@svn.freebsd.org)
Received: (from cperciva@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n7EDQoSC035355;
	Fri, 14 Aug 2009 13:26:50 GMT
	(envelope-from cperciva@svn.freebsd.org)
Message-Id: <200908141326.n7EDQoSC035355@svn.freebsd.org>
From: Colin Percival <cperciva@FreeBSD.org>
Date: Fri, 14 Aug 2009 13:26:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r196214 - stable/8/usr.sbin/sysinstall
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 14 Aug 2009 13:26:50 -0000

Author: cperciva
Date: Fri Aug 14 13:26:50 2009
New Revision: 196214
URL: http://svn.freebsd.org/changeset/base/196214

Log:
  Merge r196213 to stable/8.
  
  Approved by:	re (rwatson)

Modified:
  stable/8/usr.sbin/sysinstall/   (props changed)
  stable/8/usr.sbin/sysinstall/devices.c

Modified: stable/8/usr.sbin/sysinstall/devices.c
==============================================================================
--- stable/8/usr.sbin/sysinstall/devices.c	Fri Aug 14 13:24:44 2009	(r196213)
+++ stable/8/usr.sbin/sysinstall/devices.c	Fri Aug 14 13:26:50 2009	(r196214)
@@ -80,6 +80,7 @@ static struct _devname {
     CDROM("acd%d",	"ATAPI/IDE CDROM",			4),
     DISK("da%d",	"SCSI disk device",			16),
     DISK("ad%d",	"ATA/IDE disk device",			16),
+    DISK("ada%d",	"SATA disk device",			16),
     DISK("ar%d",	"ATA/IDE RAID device",			16),
     DISK("afd%d",	"ATAPI/IDE floppy device",		4),
     DISK("mlxd%d",	"Mylex RAID disk",			4),