From owner-svn-src-head@FreeBSD.ORG  Wed Aug 22 22:17:36 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
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 A2B47106564A;
	Wed, 22 Aug 2012 22:17:36 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8E3BA8FC08;
	Wed, 22 Aug 2012 22:17:36 +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 q7MMHaZv007234;
	Wed, 22 Aug 2012 22:17:36 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7MMHa5U007231;
	Wed, 22 Aug 2012 22:17:36 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201208222217.q7MMHa5U007231@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Wed, 22 Aug 2012 22:17:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r239595 - head/etc/rc.d
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
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 22 Aug 2012 22:17:36 -0000

Author: delphij
Date: Wed Aug 22 22:17:35 2012
New Revision: 239595
URL: http://svn.freebsd.org/changeset/base/239595

Log:
  Allow - be used in the name of a provider.  Without this change it's not
  possible to specify a gptid in geli_devices.

Modified:
  head/etc/rc.d/geli
  head/etc/rc.d/geli2

Modified: head/etc/rc.d/geli
==============================================================================
--- head/etc/rc.d/geli	Wed Aug 22 21:14:59 2012	(r239594)
+++ head/etc/rc.d/geli	Wed Aug 22 22:17:35 2012	(r239595)
@@ -53,7 +53,7 @@ geli_start()
 	fi
 
 	for provider in ${devices}; do
-		provider_=`ltr ${provider} '/' '_'`
+		provider_=`ltr ${provider} '/-' '_'`
 
 		eval "flags=\${geli_${provider_}_flags}"
 		if [ -z "${flags}" ]; then

Modified: head/etc/rc.d/geli2
==============================================================================
--- head/etc/rc.d/geli2	Wed Aug 22 21:14:59 2012	(r239594)
+++ head/etc/rc.d/geli2	Wed Aug 22 22:17:35 2012	(r239595)
@@ -42,7 +42,7 @@ geli2_start()
 	devices=`geli_make_list`
 
 	for provider in ${devices}; do
-		provider_=`ltr ${provider} '/' '_'`
+		provider_=`ltr ${provider} '/-' '_'`
 
 		eval "autodetach=\${geli_${provider_}_autodetach}"
 		if [ -z "${autodetach}" ]; then