From owner-svn-src-stable-9@FreeBSD.ORG Mon Mar 19 23:25:11 2012 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 61C201065688; Mon, 19 Mar 2012 23:25:11 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4CE528FC1A; Mon, 19 Mar 2012 23:25:11 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2JNPBJ4091791; Mon, 19 Mar 2012 23:25:11 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2JNPBnw091789; Mon, 19 Mar 2012 23:25:11 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201203192325.q2JNPBnw091789@svn.freebsd.org> From: Eitan Adler Date: Mon, 19 Mar 2012 23:25:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r233225 - stable/9/usr.sbin/pc-sysinstall/backend X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Mar 2012 23:25:11 -0000 Author: eadler Date: Mon Mar 19 23:25:10 2012 New Revision: 233225 URL: http://svn.freebsd.org/changeset/base/233225 Log: MFC 232510: Permit the use of raidz3 in pc-sysinstall PR: conf/164709 Approved by: cperciva (implicit) Modified: stable/9/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh Directory Properties: stable/9/usr.sbin/pc-sysinstall/ (props changed) Modified: stable/9/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh ============================================================================== --- stable/9/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh Mon Mar 19 23:20:52 2012 (r233224) +++ stable/9/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh Mon Mar 19 23:25:10 2012 (r233225) @@ -59,7 +59,7 @@ get_fs_line_xvars() ZTYPE="NONE" ZFSVARS="`echo $LINE | cut -d ' ' -f 4 |cut -d '(' -f 2- | cut -d ')' -f 1 | xargs`" - echo $ZFSVARS | grep -qE "^(disk|file|mirror|raidz(1|2)?|spare|log|cache):" 2>/dev/null + echo $ZFSVARS | grep -qE "^(disk|file|mirror|raidz(1|2|3)?|spare|log|cache):" 2>/dev/null if [ $? -eq 0 ] ; then ZTYPE=`echo $ZFSVARS | cut -f1 -d:` ZFSVARS=`echo $ZFSVARS | sed "s|$ZTYPE: ||g" | sed "s|$ZTYPE:||g"`