summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2011-08-07 23:41:05 +0000
committerMike Frysinger <vapier@gentoo.org>2011-08-07 23:41:05 +0000
commit7159b4b3b97ac912997c4974c04bcebd87e20c7d (patch)
tree486c83166e1d745ee602bc8fb65ca8b4fa7bb680 /sys-fs/cryptsetup
parentFix building with libpng15 wrt #378147 by Diego Elio Pettenò (diff)
downloadgentoo-2-7159b4b3b97ac912997c4974c04bcebd87e20c7d.tar.gz
gentoo-2-7159b4b3b97ac912997c4974c04bcebd87e20c7d.tar.bz2
gentoo-2-7159b4b3b97ac912997c4974c04bcebd87e20c7d.zip
Patch by ekass to skip service-specific openrc configs #377927.
(Portage version: 2.2.0_alpha46/cvs/Linux x86_64)
Diffstat (limited to 'sys-fs/cryptsetup')
-rw-r--r--sys-fs/cryptsetup/ChangeLog6
-rw-r--r--sys-fs/cryptsetup/files/1.1.3-dm-crypt-start.sh3
2 files changed, 8 insertions, 1 deletions
diff --git a/sys-fs/cryptsetup/ChangeLog b/sys-fs/cryptsetup/ChangeLog
index 294d42c641c7..f60c90f1a4f3 100644
--- a/sys-fs/cryptsetup/ChangeLog
+++ b/sys-fs/cryptsetup/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-fs/cryptsetup
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.115 2011/03/17 16:25:12 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.116 2011/08/07 23:41:05 vapier Exp $
+
+ 07 Aug 2011; Mike Frysinger <vapier@gentoo.org>
+ files/1.1.3-dm-crypt-start.sh:
+ Patch by ekass to skip service-specific openrc configs #377927.
17 Mar 2011; Samuli Suominen <ssuominen@gentoo.org>
cryptsetup-1.1.3-r3.ebuild, cryptsetup-1.2.0-r1.ebuild:
diff --git a/sys-fs/cryptsetup/files/1.1.3-dm-crypt-start.sh b/sys-fs/cryptsetup/files/1.1.3-dm-crypt-start.sh
index c78f0bcaedaf..e56dbc97815d 100644
--- a/sys-fs/cryptsetup/files/1.1.3-dm-crypt-start.sh
+++ b/sys-fs/cryptsetup/files/1.1.3-dm-crypt-start.sh
@@ -266,6 +266,9 @@ if [[ -f ${conf_file} ]] && [[ -x /sbin/cryptsetup ]] ; then
# skip comments and blank lines
[[ ${targetline}\# == \#* ]] && continue
+ # skip service-specific openrc configs #377927
+ [[ ${targetline} == rc_* ]] && continue
+
# check for the start of a new target/swap
case ${targetline} in
target=*|swap=*)