diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2010-10-06 01:47:29 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2010-10-06 01:47:29 +0000 |
| commit | 0401353677cb597a3ad01c2580f5eb67d898d692 (patch) | |
| tree | 9a802c821c16a4a5c297a5346aafa58ffb076c5f /sys-fs/cryptsetup | |
| parent | Patch to prevent html docs installation with -doc (diff) | |
| download | gentoo-2-0401353677cb597a3ad01c2580f5eb67d898d692.tar.gz gentoo-2-0401353677cb597a3ad01c2580f5eb67d898d692.tar.bz2 gentoo-2-0401353677cb597a3ad01c2580f5eb67d898d692.zip | |
Do not warn about global options #329437 by Marcin Mirosław.
(Portage version: 2.2_rc86/cvs/Linux x86_64)
Diffstat (limited to 'sys-fs/cryptsetup')
| -rw-r--r-- | sys-fs/cryptsetup/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-fs/cryptsetup/files/1.1.3-dm-crypt-start.sh | 5 |
2 files changed, 10 insertions, 1 deletions
diff --git a/sys-fs/cryptsetup/ChangeLog b/sys-fs/cryptsetup/ChangeLog index cce2ba9979f3..8b3d6983c217 100644 --- a/sys-fs/cryptsetup/ChangeLog +++ b/sys-fs/cryptsetup/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-fs/cryptsetup # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.95 2010/09/30 01:35:24 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.96 2010/10/06 01:47:29 vapier Exp $ + + 06 Oct 2010; Mike Frysinger <vapier@gentoo.org> + files/1.1.3-dm-crypt-start.sh: + Do not warn about global options #329437 by Marcin Mirosław. *cryptsetup-1.1.3-r1 (30 Sep 2010) 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 084701c33750..6b0d1c1f077d 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 @@ -274,6 +274,11 @@ if [[ -f /etc/conf.d/${SVCNAME} ]] && [[ -x /sbin/cryptsetup ]] ; then fi ;; + dmcrypt_max_timeout=*) + # ignore global options + continue + ;; + *) ewarn "Skipping invalid line in /etc/conf.d/${SVCNAME}: ${targetline}" ;; |