diff options
| author |   Jeremy Olexa <darkside@gentoo.org> | 2009-06-16 20:44:22 +0000 |
|---|---|---|
| committer | Jeremy Olexa <darkside@gentoo.org> | 2009-06-16 20:44:22 +0000 |
| commit | c5cb2f2fcfcba5e098ef4cb0acf97082466dfa02 (patch) | |
| tree | 22168f8ba9223374c94c85b7af7ce5b89083dbd5 | |
| parent | Fix build failure with glibc-2.10, bug 274352. (diff) | |
| download | gentoo-2-c5cb2f2fcfcba5e098ef4cb0acf97082466dfa02.tar.gz gentoo-2-c5cb2f2fcfcba5e098ef4cb0acf97082466dfa02.tar.bz2 gentoo-2-c5cb2f2fcfcba5e098ef4cb0acf97082466dfa02.zip | |
Fix dm-crypt-start.sh file for passphrase at startup issue, bug 243216
(Portage version: 2.1.6.13/cvs/Linux x86_64)
| -rw-r--r-- | sys-fs/cryptsetup/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-fs/cryptsetup/files/1.0.6-r2-dm-crypt-start.sh | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/sys-fs/cryptsetup/ChangeLog b/sys-fs/cryptsetup/ChangeLog index 38dea5e69dcb..e2137753e797 100644 --- a/sys-fs/cryptsetup/ChangeLog +++ b/sys-fs/cryptsetup/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-fs/cryptsetup # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.64 2009/04/19 18:41:07 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.65 2009/06/16 20:44:22 darkside Exp $ + + 16 Jun 2009; Jeremy Olexa <darkside@gentoo.org> + files/1.0.6-r2-dm-crypt-start.sh: + Fix dm-crypt-start.sh file for passphrase at startup issue, bug 243216 19 Apr 2009; Doug Goldstein <cardoe@gentoo.org> -files/1.0.6-dm-crypt-start.sh, -cryptsetup-1.0.5.ebuild, diff --git a/sys-fs/cryptsetup/files/1.0.6-r2-dm-crypt-start.sh b/sys-fs/cryptsetup/files/1.0.6-r2-dm-crypt-start.sh index 6fbf7a1e81b1..44d2c4563b18 100644 --- a/sys-fs/cryptsetup/files/1.0.6-r2-dm-crypt-start.sh +++ b/sys-fs/cryptsetup/files/1.0.6-r2-dm-crypt-start.sh @@ -255,7 +255,7 @@ if [[ -f /etc/conf.d/dmcrypt ]] && [[ -x /sbin/cryptsetup ]] ; then # Fix for baselayout-1.12.10 (bug 174256) [ -z ${SVCNAME} ] && SVCNAME="${myservice}" - while read targetline ; do + while read -u 3 targetline ; do # skip comments and blank lines [[ ${targetline}\# == \#* ]] && continue @@ -283,7 +283,7 @@ if [[ -f /etc/conf.d/dmcrypt ]] && [[ -x /sbin/cryptsetup ]] ; then # Queue this setting for the next call to dm_crypt_execute_${SVCNAME} eval "${targetline}" - done < /etc/conf.d/dmcrypt + done 3< /etc/conf.d/dmcrypt # If we have a target queued up, then execute it dm_crypt_execute_${SVCNAME} |