diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2011-01-08 00:53:41 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2011-01-08 00:53:41 +0000 |
| commit | 41dc5f091f5c15debebf343adfb30b4d6ffdb150 (patch) | |
| tree | bbd4effc41c0ff0a98c28a324c53b458d7ba1d63 /sys-fs | |
| parent | Marking emacs-updater-1.7 ppc for bug 348505 (diff) | |
| download | gentoo-2-41dc5f091f5c15debebf343adfb30b4d6ffdb150.tar.gz gentoo-2-41dc5f091f5c15debebf343adfb30b4d6ffdb150.tar.bz2 gentoo-2-41dc5f091f5c15debebf343adfb30b4d6ffdb150.zip | |
Tweak status detection to work with newer cryptsetup output #350345 by Aaron Lewis.
Diffstat (limited to 'sys-fs')
| -rw-r--r-- | sys-fs/cryptsetup/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-fs/cryptsetup/files/1.1.3-dm-crypt-start.sh | 6 |
2 files changed, 11 insertions, 2 deletions
diff --git a/sys-fs/cryptsetup/ChangeLog b/sys-fs/cryptsetup/ChangeLog index 152a82ff2031..378e31f247f8 100644 --- a/sys-fs/cryptsetup/ChangeLog +++ b/sys-fs/cryptsetup/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-fs/cryptsetup # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.104 2011/01/08 00:52:21 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.105 2011/01/08 00:53:40 vapier Exp $ + + 08 Jan 2011; Mike Frysinger <vapier@gentoo.org> + files/1.1.3-dm-crypt-start.sh: + Tweak status detection to work with newer cryptsetup output #350345 by + Aaron Lewis. 08 Jan 2011; Mike Frysinger <vapier@gentoo.org> cryptsetup-1.2.0-r1.ebuild: diff --git a/sys-fs/cryptsetup/files/1.1.3-dm-crypt-start.sh b/sys-fs/cryptsetup/files/1.1.3-dm-crypt-start.sh index 6b0d1c1f077d..49bf9e16771b 100644 --- a/sys-fs/cryptsetup/files/1.1.3-dm-crypt-start.sh +++ b/sys-fs/cryptsetup/files/1.1.3-dm-crypt-start.sh @@ -54,7 +54,11 @@ dm_crypt_execute_dmcrypt() { cryptsetup isLuks ${source} 2>/dev/null && { arg1="luksOpen"; arg2="$source"; arg3="$target"; luks=1; } - 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 |