summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sys-fs/lvm2')
-rw-r--r--sys-fs/lvm2/ChangeLog8
-rwxr-xr-xsys-fs/lvm2/files/clvmd.rc-2.02.395
-rw-r--r--sys-fs/lvm2/files/device-mapper.rc-1.02.51-r25
-rw-r--r--sys-fs/lvm2/files/lvm.rc-2.02.51-r24
4 files changed, 15 insertions, 7 deletions
diff --git a/sys-fs/lvm2/ChangeLog b/sys-fs/lvm2/ChangeLog
index 2d4c1721081f..8bdf5cc270ec 100644
--- a/sys-fs/lvm2/ChangeLog
+++ b/sys-fs/lvm2/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for sys-fs/lvm2
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.206 2010/05/01 21:21:04 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.207 2010/05/01 21:26:33 robbat2 Exp $
+
+ 01 May 2010; Robin H. Johnson <robbat2@gentoo.org>
+ files/device-mapper.rc-1.02.51-r2, files/clvmd.rc-2.02.39,
+ files/lvm.rc-2.02.51-r2:
+ Bug #318051: In certain situations, LVM needs dmeventd to start before it,
+ so ensure this enforced by the init system.
*lvm2-2.02.64 (01 May 2010)
diff --git a/sys-fs/lvm2/files/clvmd.rc-2.02.39 b/sys-fs/lvm2/files/clvmd.rc-2.02.39
index 6bff777132b5..764aeabc9603 100755
--- a/sys-fs/lvm2/files/clvmd.rc-2.02.39
+++ b/sys-fs/lvm2/files/clvmd.rc-2.02.39
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/clvmd.rc-2.02.39,v 1.1 2009/05/19 00:08:35 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/clvmd.rc-2.02.39,v 1.2 2010/05/01 21:26:32 robbat2 Exp $
[ -x /usr/sbin/clvmd ] && CLVMD_BIN="/usr/sbin/clvmd" || CLVMD_BIN="/sbin/clvmd"
@@ -14,8 +14,7 @@ VGDISPLAY="/sbin/vgdisplay"
CLVMD_PIDFILE="/var/run/clvmd.pid"
depend() {
- use dns logger
- use net
+ use net dns logger dmeventd
need cman
}
diff --git a/sys-fs/lvm2/files/device-mapper.rc-1.02.51-r2 b/sys-fs/lvm2/files/device-mapper.rc-1.02.51-r2
index 768549d3a67a..9eb3d3ccb7a0 100644
--- a/sys-fs/lvm2/files/device-mapper.rc-1.02.51-r2
+++ b/sys-fs/lvm2/files/device-mapper.rc-1.02.51-r2
@@ -1,15 +1,16 @@
#!/sbin/runscript
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/device-mapper.rc-1.02.51-r2,v 1.1 2009/10/27 15:34:08 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/device-mapper.rc-1.02.51-r2,v 1.2 2010/05/01 21:26:33 robbat2 Exp $
depend() {
# necessary for services when using baselayout-2
# but conflict for baselayout-1
if [ -e /etc/init.d/root ] ; then
- after modules
before checkfs fsck
+ after modules
fi
+ after dmeventd
}
start() {
diff --git a/sys-fs/lvm2/files/lvm.rc-2.02.51-r2 b/sys-fs/lvm2/files/lvm.rc-2.02.51-r2
index f05b22c59b10..ca2084eeb64d 100644
--- a/sys-fs/lvm2/files/lvm.rc-2.02.51-r2
+++ b/sys-fs/lvm2/files/lvm.rc-2.02.51-r2
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/lvm.rc-2.02.51-r2,v 1.1 2009/10/27 15:34:08 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/lvm.rc-2.02.51-r2,v 1.2 2010/05/01 21:26:33 robbat2 Exp $
depend() {
if [ -f /etc/init.d/sysfs ]; then
@@ -10,6 +10,8 @@ depend() {
before checkfs fsck
after modules device-mapper
fi
+ use dmeventd
+ after dmeventd
}
run_addon() {