vapier 15/04/12 20:19:59 Modified: 1.5.1-dmcrypt.rc Log: 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)
Revision Changes Path 1.5 sys-fs/cryptsetup/files/1.5.1-dmcrypt.rc file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/cryptsetup/files/1.5.1-dmcrypt.rc?rev=1.5&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/cryptsetup/files/1.5.1-dmcrypt.rc?rev=1.5&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/cryptsetup/files/1.5.1-dmcrypt.rc?r1=1.4&r2=1.5 Index: 1.5.1-dmcrypt.rc =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/files/1.5.1-dmcrypt.rc,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- 1.5.1-dmcrypt.rc 12 Apr 2015 20:13:24 -0000 1.4 +++ 1.5.1-dmcrypt.rc 12 Apr 2015 20:19:59 -0000 1.5 @@ -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 @@ 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