diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2015-04-12 20:40:40 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2015-04-12 20:40:40 +0000 |
| commit | f09efc2a2f437f3b3472d27266dacc3491d72dbe (patch) | |
| tree | 390cfe9825b8afaa5c85237bdffcec021632636e /sys-fs | |
| parent | Version bump, bug 545382 (diff) | |
| download | gentoo-2-f09efc2a2f437f3b3472d27266dacc3491d72dbe.tar.gz gentoo-2-f09efc2a2f437f3b3472d27266dacc3491d72dbe.tar.bz2 gentoo-2-f09efc2a2f437f3b3472d27266dacc3491d72dbe.zip | |
Run ebegin message through eval so the output is expanded #442374 by Toralf Förster.
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Diffstat (limited to 'sys-fs')
| -rw-r--r-- | sys-fs/cryptsetup/ChangeLog | 6 | ||||
| -rwxr-xr-x | sys-fs/cryptsetup/files/1.5.1-dmcrypt.rc | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/sys-fs/cryptsetup/ChangeLog b/sys-fs/cryptsetup/ChangeLog index 26940bd84c03..b6c1c2f6baa7 100644 --- a/sys-fs/cryptsetup/ChangeLog +++ b/sys-fs/cryptsetup/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-fs/cryptsetup # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.202 2015/04/12 20:32:45 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.203 2015/04/12 20:40:40 vapier Exp $ + + 12 Apr 2015; Mike Frysinger <vapier@gentoo.org> files/1.5.1-dmcrypt.rc: + Run ebegin message through eval so the output is expanded #442374 by Toralf + Förster. 12 Apr 2015; Mike Frysinger <vapier@gentoo.org> files/1.0.6-dmcrypt.confd: Note that the config file must be terminated by a newline #426986 by klamp. diff --git a/sys-fs/cryptsetup/files/1.5.1-dmcrypt.rc b/sys-fs/cryptsetup/files/1.5.1-dmcrypt.rc index 37901de58db3..d5662ed6fdb5 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.5 2015/04/12 20:19:59 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/files/1.5.1-dmcrypt.rc,v 1.6 2015/04/12 20:40:40 vapier Exp $ depend() { before checkfs fsck @@ -203,7 +203,7 @@ dm_crypt_execute_dmcrypt() { else if [ -n "${pre_mount}" ] ; then dev="/dev/mapper/${target}" - ebegin " pre_mount: ${pre_mount}" + eval ebegin \"" pre_mount: ${pre_mount}"\" eval "${pre_mount}" > /dev/null ewend $? || cryptfs_status=1 fi |