diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2005-05-21 06:10:25 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-05-21 06:10:25 +0000 |
| commit | 030f5ca0f07a9ebb9fc2b65e340922305c311451 (patch) | |
| tree | 262eae9a06dec63cc3dd3a065f3040a12ebb9e49 /sys-fs | |
| parent | add pumount patch (diff) | |
| download | historical-030f5ca0f07a9ebb9fc2b65e340922305c311451.tar.gz historical-030f5ca0f07a9ebb9fc2b65e340922305c311451.tar.bz2 historical-030f5ca0f07a9ebb9fc2b65e340922305c311451.zip | |
add some notes about using gpg and /usr on a different partition #90482
Package-Manager: portage-2.0.51.22-r1
Diffstat (limited to 'sys-fs')
| -rw-r--r-- | sys-fs/cryptsetup/Manifest | 4 | ||||
| -rw-r--r-- | sys-fs/cryptsetup/files/cryptfs.confd | 6 | ||||
| -rw-r--r-- | sys-fs/cryptsetup/files/dm-crypt-start.sh | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest index fcf6dd6a4dcc..07ef0570cfe1 100644 --- a/sys-fs/cryptsetup/Manifest +++ b/sys-fs/cryptsetup/Manifest @@ -3,7 +3,7 @@ MD5 a562ab3dfba05c3f52de4afde1a829de cryptsetup-0.1.ebuild 1147 MD5 5be5a7266a46591bb4db0cacd9ac8af3 metadata.xml 226 MD5 d41101bdf9cd680f4fe41b7193c0f053 cryptsetup-0.1-r1.ebuild 1287 MD5 959c303c3bfeab6c12e28ae4e16400b3 files/digest-cryptsetup-0.1 67 -MD5 0f3b17ce04a644eefd9272f05dd78d01 files/cryptfs.confd 1138 +MD5 327d83538ed5305bdc3568cd353410bb files/cryptfs.confd 1337 MD5 959c303c3bfeab6c12e28ae4e16400b3 files/digest-cryptsetup-0.1-r1 67 -MD5 9c063c64ead85a012d4cd3a719c5fbb7 files/dm-crypt-start.sh 3936 +MD5 3232a190894a35b7d2f3610f2eb652dc files/dm-crypt-start.sh 3937 MD5 8619b3f74d4d362bab9f430b63243a74 files/dm-crypt-stop.sh 1290 diff --git a/sys-fs/cryptsetup/files/cryptfs.confd b/sys-fs/cryptsetup/files/cryptfs.confd index a11e116f9245..9fcc3cce6678 100644 --- a/sys-fs/cryptsetup/files/cryptfs.confd +++ b/sys-fs/cryptsetup/files/cryptfs.confd @@ -1,5 +1,5 @@ # /etc/conf.d/cryptfs -# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/files/cryptfs.confd,v 1.1 2005/03/01 23:25:14 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/files/cryptfs.confd,v 1.2 2005/05/21 06:10:25 vapier Exp $ # Note regarding the syntax of this file. This file is *almost* bash, # but each line is evaluated separately. Separate swaps/mounts can be @@ -7,6 +7,10 @@ # swap= or mount= line starts a new section, similar to lilo or grub # configuration. +# Note when using gpg keys and /usr on a separate partition, you will +# have to copy /usr/bin/gpg to /bin/gpg so that it will work properly. +# See http://bugs.gentoo.org/90482 for more information. + # Swap partitions. These should come first so that no keys make their # way into unencrypted swap. # If no options are given, they will default to: -c aes -h sha1 -d /dev/urandom diff --git a/sys-fs/cryptsetup/files/dm-crypt-start.sh b/sys-fs/cryptsetup/files/dm-crypt-start.sh index 747d4ac8ce6d..b5704e8e3e69 100644 --- a/sys-fs/cryptsetup/files/dm-crypt-start.sh +++ b/sys-fs/cryptsetup/files/dm-crypt-start.sh @@ -1,7 +1,7 @@ # /lib/rcscripts/addons/dm-crypt-start.sh # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/files/dm-crypt-start.sh,v 1.4 2005/05/20 04:03:12 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/files/dm-crypt-start.sh,v 1.5 2005/05/21 06:10:25 vapier Exp $ # Setup mappings for an individual mount/swap # @@ -39,7 +39,7 @@ dm-crypt-execute-checkfs() { ret=$? eend ${ret} "failure running cryptsetup" else - if [[ -x /usr/bin/gpg ]] ; then + if type -p gpg >/dev/null ; then ret=1 while [[ ${ret} -gt 0 ]] ; do keystring=$(gpg ${gpg_options} ${key} 2>/dev/null </dev/console) |