diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2015-04-12 20:19:59 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2015-04-12 20:19:59 +0000 |
| commit | ed9b329202853076ffa84de75558c0db94ec6bb2 (patch) | |
| tree | d451685d6ed8b13b327a9d1a03b84024539a8220 /sys-fs/cryptsetup/files | |
| parent | Automatically run before swap when creating swap files #509412 by Toralf För... (diff) | |
| download | gentoo-2-ed9b329202853076ffa84de75558c0db94ec6bb2.tar.gz gentoo-2-ed9b329202853076ffa84de75558c0db94ec6bb2.tar.bz2 gentoo-2-ed9b329202853076ffa84de75558c0db94ec6bb2.zip | |
Explicitly have cryptsetup read the key from stdin #266546 by forums.
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Diffstat (limited to 'sys-fs/cryptsetup/files')
| -rwxr-xr-x | sys-fs/cryptsetup/files/1.5.1-dmcrypt.rc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys-fs/cryptsetup/files/1.5.1-dmcrypt.rc b/sys-fs/cryptsetup/files/1.5.1-dmcrypt.rc index 4009bfd8cdab..37901de58db3 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-2015 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.4 2015/04/12 20:13:24 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/files/1.5.1-dmcrypt.rc,v 1.5 2015/04/12 20:19:59 vapier Exp $ depend() { before checkfs fsck @@ -170,7 +170,7 @@ dm_crypt_execute_dmcrypt() { for i in 0 1 2 ; do # paranoid, don't store key in a variable, pipe it so it stays very little in ram unprotected. # save stdin stdout stderr "values" - gpg ${gpg_options} ${key} 2>/dev/null | cryptsetup ${options} ${arg1} ${arg2} ${arg3} + gpg ${gpg_options} ${key} 2>/dev/null | cryptsetup --key-file - ${options} ${arg1} ${arg2} ${arg3} ret=$? [ ${ret} -eq 0 ] && break done |