From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
	by finch.gentoo.org with esmtp (Exim 4.60)
	(envelope-from <gentoo-commits+bounces-305401-garchives=archives.gentoo.org@lists.gentoo.org>)
	id 1PbN42-0002dj-Hg
	for garchives@archives.gentoo.org; Sat, 08 Jan 2011 00:53:50 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 35E40E07D6;
	Sat,  8 Jan 2011 00:53:43 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	by pigeon.gentoo.org (Postfix) with ESMTP id 0A702E07D6
	for <gentoo-commits@lists.gentoo.org>; Sat,  8 Jan 2011 00:53:42 +0000 (UTC)
Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6])
	(using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 7406F1B4207
	for <gentoo-commits@lists.gentoo.org>; Sat,  8 Jan 2011 00:53:42 +0000 (UTC)
Received: by flycatcher.gentoo.org (Postfix, from userid 559)
	id 16AD920057; Sat,  8 Jan 2011 00:53:41 +0000 (UTC)
From: "Mike Frysinger (vapier)" <vapier@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Reply-To: gentoo-dev@lists.gentoo.org, vapier@gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in sys-fs/cryptsetup/files: 1.1.3-dm-crypt-start.sh
X-VCS-Repository: gentoo-x86
X-VCS-Files: 1.1.3-dm-crypt-start.sh
X-VCS-Directories: sys-fs/cryptsetup/files
X-VCS-Committer: vapier
X-VCS-Committer-Name: Mike Frysinger
Content-Type: text/plain; charset=utf8
Message-Id: <20110108005341.16AD920057@flycatcher.gentoo.org>
Date: Sat,  8 Jan 2011 00:53:41 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt: 35acaff7-353a-4b1d-a0eb-442c5a720ee3
X-Archives-Hash: 034f9819fb11a3bff6c1c2ad1362bc85

vapier      11/01/08 00:53:41

  Modified:             1.1.3-dm-crypt-start.sh
  Log:
  Tweak status detection to work with newer cryptsetup output #350345 by =
Aaron Lewis.

Revision  Changes    Path
1.3                  sys-fs/cryptsetup/files/1.1.3-dm-crypt-start.sh

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/cryptsetup/=
files/1.1.3-dm-crypt-start.sh?rev=3D1.3&view=3Dmarkup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/cryptsetup/=
files/1.1.3-dm-crypt-start.sh?rev=3D1.3&content-type=3Dtext/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/cryptsetup/=
files/1.1.3-dm-crypt-start.sh?r1=3D1.2&r2=3D1.3

Index: 1.1.3-dm-crypt-start.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
RCS file: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/files/1.1.3-dm-crypt-=
start.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 1.1.3-dm-crypt-start.sh	6 Oct 2010 01:47:29 -0000	1.2
+++ 1.1.3-dm-crypt-start.sh	8 Jan 2011 00:53:41 -0000	1.3
@@ -54,7 +54,11 @@
=20
 	cryptsetup isLuks ${source} 2>/dev/null && { arg1=3D"luksOpen"; arg2=3D=
"$source"; arg3=3D"$target"; luks=3D1; }
=20
-	if /sbin/cryptsetup status ${target} | egrep -q '\<active:' ; then
+	# Older versions reported:
+	#	${target} is active:
+	# Newer versions report:
+	#	${target} is active[ and is in use.]
+	if cryptsetup status ${target} | egrep -q ' is active' ; then
 		einfo "dm-crypt mapping ${target} is already configured"
 		return
 	fi