diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2014-10-19 04:37:19 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2014-10-19 04:37:19 +0000 |
| commit | 5e248b8af2dc9c2fe50a9b0c92d8aa58556f18ce (patch) | |
| tree | 37c9e612630f0e24fe0642f6aab0e64ed54b902d /sys-fs/cryptsetup | |
| parent | Version bump #522566. (diff) | |
| download | gentoo-2-5e248b8af2dc9c2fe50a9b0c92d8aa58556f18ce.tar.gz gentoo-2-5e248b8af2dc9c2fe50a9b0c92d8aa58556f18ce.tar.bz2 gentoo-2-5e248b8af2dc9c2fe50a9b0c92d8aa58556f18ce.zip | |
Move from "luksOpen" to "open" since they are the same and the former is deprecated #525524 by tokiclover.
(Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Diffstat (limited to 'sys-fs/cryptsetup')
| -rw-r--r-- | sys-fs/cryptsetup/ChangeLog | 6 | ||||
| -rwxr-xr-x | sys-fs/cryptsetup/files/1.5.1-dmcrypt.rc | 17 |
2 files changed, 15 insertions, 8 deletions
diff --git a/sys-fs/cryptsetup/ChangeLog b/sys-fs/cryptsetup/ChangeLog index fa08f7f9b5d0..ca649c399c71 100644 --- a/sys-fs/cryptsetup/ChangeLog +++ b/sys-fs/cryptsetup/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-fs/cryptsetup # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.185 2014/10/12 08:44:48 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.186 2014/10/19 04:37:19 vapier Exp $ + + 19 Oct 2014; Mike Frysinger <vapier@gentoo.org> files/1.5.1-dmcrypt.rc: + Move from "luksOpen" to "open" since they are the same and the former is + deprecated #525524 by tokiclover. 12 Oct 2014; Agostino Sarubbo <ago@gentoo.org> cryptsetup-1.6.5.ebuild: Stable for x86, wrt bug #510342 diff --git a/sys-fs/cryptsetup/files/1.5.1-dmcrypt.rc b/sys-fs/cryptsetup/files/1.5.1-dmcrypt.rc index fed2cc6aec62..9415a0bcef56 100755 --- a/sys-fs/cryptsetup/files/1.5.1-dmcrypt.rc +++ b/sys-fs/cryptsetup/files/1.5.1-dmcrypt.rc @@ -1,7 +1,7 @@ #!/sbin/runscript -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/files/1.5.1-dmcrypt.rc,v 1.1 2013/01/17 23:35:08 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/files/1.5.1-dmcrypt.rc,v 1.2 2014/10/19 04:37:19 vapier Exp $ depend() { before checkfs fsck @@ -55,11 +55,14 @@ dm_crypt_execute_dmcrypt() { fi # cryptsetup: - # luksOpen <device> <name> # <device> is $source - # create <name> <device> # <name> is $target - local arg1="create" arg2="${target}" arg3="${source}" luks=0 - - cryptsetup isLuks ${source} 2>/dev/null && { arg1="luksOpen"; arg2="${source}"; arg3="${target}"; luks=1; } + # open <device> <name> # <device> is $source + # create <name> <device> # <name> is $target + local arg1="create" arg2="${target}" arg3="${source}" + if cryptsetup isLuks ${source} 2>/dev/null ; then + arg1="open" + arg2="${source}" + arg3="${target}" + fi # Older versions reported: # ${target} is active: |