diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2005-05-20 04:03:12 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-05-20 04:03:12 +0000 |
| commit | a133cd13d2dd7f02b3ff99f8c2c67cdd44ac9554 (patch) | |
| tree | f2fdda7c309f1dd729a4d223e62981e3a6c6c04f /sys-fs/cryptsetup | |
| parent | Version bump. (diff) | |
| download | historical-a133cd13d2dd7f02b3ff99f8c2c67cdd44ac9554.tar.gz historical-a133cd13d2dd7f02b3ff99f8c2c67cdd44ac9554.tar.bz2 historical-a133cd13d2dd7f02b3ff99f8c2c67cdd44ac9554.zip | |
dont use here documents since it fails with r/o filesystems #93244 by chia.penguin
Package-Manager: portage-2.0.51.22-r1
Diffstat (limited to 'sys-fs/cryptsetup')
| -rw-r--r-- | sys-fs/cryptsetup/Manifest | 2 | ||||
| -rw-r--r-- | sys-fs/cryptsetup/files/dm-crypt-start.sh | 12 |
2 files changed, 6 insertions, 8 deletions
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest index 49f163c350ba..fcf6dd6a4dcc 100644 --- a/sys-fs/cryptsetup/Manifest +++ b/sys-fs/cryptsetup/Manifest @@ -5,5 +5,5 @@ MD5 d41101bdf9cd680f4fe41b7193c0f053 cryptsetup-0.1-r1.ebuild 1287 MD5 959c303c3bfeab6c12e28ae4e16400b3 files/digest-cryptsetup-0.1 67 MD5 0f3b17ce04a644eefd9272f05dd78d01 files/cryptfs.confd 1138 MD5 959c303c3bfeab6c12e28ae4e16400b3 files/digest-cryptsetup-0.1-r1 67 -MD5 5ac4e850a96f594041c85ebb05a1b4a9 files/dm-crypt-start.sh 3937 +MD5 9c063c64ead85a012d4cd3a719c5fbb7 files/dm-crypt-start.sh 3936 MD5 8619b3f74d4d362bab9f430b63243a74 files/dm-crypt-stop.sh 1290 diff --git a/sys-fs/cryptsetup/files/dm-crypt-start.sh b/sys-fs/cryptsetup/files/dm-crypt-start.sh index ddb2bdbedd72..747d4ac8ce6d 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.3 2005/05/15 00:44:56 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/files/dm-crypt-start.sh,v 1.4 2005/05/20 04:03:12 vapier Exp $ # Setup mappings for an individual mount/swap # @@ -27,7 +27,7 @@ dm-crypt-execute-checkfs() { return fi - if /bin/cryptsetup status ${target} | egrep -q '\<active:'; then + if /bin/cryptsetup status ${target} | egrep -q '\<active:' ; then einfo "dm-crypt mapping ${target} is already configured" return fi @@ -46,9 +46,7 @@ dm-crypt-execute-checkfs() { if [[ -z ${keystring} ]] ; then ret=5 else - /bin/cryptsetup ${options} create ${target} ${source} << EOF -${keystring} -EOF + echo ${keystring} | /bin/cryptsetup ${options} create ${target} ${source} ret=$? fi done @@ -83,7 +81,7 @@ dm-crypt-execute-localmount() { return fi - if ! /bin/cryptsetup status ${target} | egrep -q '\<active:'; then + if ! /bin/cryptsetup status ${target} | egrep -q '\<active:' ; then ewarn "Skipping unmapped target ${target}" cryptfs_status=1 return @@ -108,7 +106,7 @@ local gpg_options key loop_file mount mountline options pre_mount post_mount sou if [[ -f /etc/conf.d/cryptfs ]] && [[ -x /bin/cryptsetup ]] ; then ebegin "Setting up dm-crypt mappings" - while read mountline; do + while read mountline ; do # skip comments and blank lines [[ ${mountline}\# == \#* ]] && continue |