Gentoo Archives: gentoo-commits

From: "Robin H. Johnson (robbat2)" <robbat2@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-fs/lvm2/files: clvmd.rc-2.02.39 device-mapper.rc-1.02.51-r2 lvm.rc-2.02.51-r2
Date: Sat, 01 May 2010 21:26:36
Message-Id: 20100501212633.390962C157@corvid.gentoo.org
1 robbat2 10/05/01 21:26:33
2
3 Modified: clvmd.rc-2.02.39 device-mapper.rc-1.02.51-r2
4 lvm.rc-2.02.51-r2
5 Log:
6 Bug #318051: In certain situations, LVM needs dmeventd to start before it, so ensure this enforced by the init system.
7 (Portage version: 2.2_rc67/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.2 sys-fs/lvm2/files/clvmd.rc-2.02.39
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/lvm2/files/clvmd.rc-2.02.39?rev=1.2&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/lvm2/files/clvmd.rc-2.02.39?rev=1.2&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/lvm2/files/clvmd.rc-2.02.39?r1=1.1&r2=1.2
15
16 Index: clvmd.rc-2.02.39
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/clvmd.rc-2.02.39,v
19 retrieving revision 1.1
20 retrieving revision 1.2
21 diff -p -w -b -B -u -u -r1.1 -r1.2
22 --- clvmd.rc-2.02.39 19 May 2009 00:08:35 -0000 1.1
23 +++ clvmd.rc-2.02.39 1 May 2010 21:26:32 -0000 1.2
24 @@ -1,7 +1,7 @@
25 #!/sbin/runscript
26 # Copyright 1999-2005 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $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 $
29 +# $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 $
30
31 [ -x /usr/sbin/clvmd ] && CLVMD_BIN="/usr/sbin/clvmd" || CLVMD_BIN="/sbin/clvmd"
32
33 @@ -14,8 +14,7 @@ VGDISPLAY="/sbin/vgdisplay"
34 CLVMD_PIDFILE="/var/run/clvmd.pid"
35
36 depend() {
37 - use dns logger
38 - use net
39 + use net dns logger dmeventd
40 need cman
41 }
42
43
44
45
46 1.2 sys-fs/lvm2/files/device-mapper.rc-1.02.51-r2
47
48 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/lvm2/files/device-mapper.rc-1.02.51-r2?rev=1.2&view=markup
49 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/lvm2/files/device-mapper.rc-1.02.51-r2?rev=1.2&content-type=text/plain
50 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/lvm2/files/device-mapper.rc-1.02.51-r2?r1=1.1&r2=1.2
51
52 Index: device-mapper.rc-1.02.51-r2
53 ===================================================================
54 RCS file: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/device-mapper.rc-1.02.51-r2,v
55 retrieving revision 1.1
56 retrieving revision 1.2
57 diff -p -w -b -B -u -u -r1.1 -r1.2
58 --- device-mapper.rc-1.02.51-r2 27 Oct 2009 15:34:08 -0000 1.1
59 +++ device-mapper.rc-1.02.51-r2 1 May 2010 21:26:33 -0000 1.2
60 @@ -1,15 +1,16 @@
61 #!/sbin/runscript
62 # Copyright 1999-2008 Gentoo Foundation
63 # Distributed under the terms of the GNU General Public License v2
64 -# $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 $
65 +# $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 $
66
67 depend() {
68 # necessary for services when using baselayout-2
69 # but conflict for baselayout-1
70 if [ -e /etc/init.d/root ] ; then
71 - after modules
72 before checkfs fsck
73 + after modules
74 fi
75 + after dmeventd
76 }
77
78 start() {
79
80
81
82 1.2 sys-fs/lvm2/files/lvm.rc-2.02.51-r2
83
84 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/lvm2/files/lvm.rc-2.02.51-r2?rev=1.2&view=markup
85 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/lvm2/files/lvm.rc-2.02.51-r2?rev=1.2&content-type=text/plain
86 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/lvm2/files/lvm.rc-2.02.51-r2?r1=1.1&r2=1.2
87
88 Index: lvm.rc-2.02.51-r2
89 ===================================================================
90 RCS file: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/lvm.rc-2.02.51-r2,v
91 retrieving revision 1.1
92 retrieving revision 1.2
93 diff -p -w -b -B -u -u -r1.1 -r1.2
94 --- lvm.rc-2.02.51-r2 27 Oct 2009 15:34:08 -0000 1.1
95 +++ lvm.rc-2.02.51-r2 1 May 2010 21:26:33 -0000 1.2
96 @@ -1,7 +1,7 @@
97 #!/sbin/runscript
98 # Copyright 1999-2007 Gentoo Foundation
99 # Distributed under the terms of the GNU General Public License v2
100 -# $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 $
101 +# $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 $
102
103 depend() {
104 if [ -f /etc/init.d/sysfs ]; then
105 @@ -10,6 +10,8 @@ depend() {
106 before checkfs fsck
107 after modules device-mapper
108 fi
109 + use dmeventd
110 + after dmeventd
111 }
112
113 run_addon() {