Gentoo Archives: gentoo-commits

From: "Lance Albertson (ramereth)" <ramereth@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-emulation/ganeti/files: ganeti2.initd ganeti-2.0.3-gentoo-brctl-path.patch
Date: Fri, 02 Oct 2009 22:12:21
Message-Id: E1MtqMN-0007cN-TL@stork.gentoo.org
1 ramereth 09/10/02 22:12:19
2
3 Added: ganeti2.initd ganeti-2.0.3-gentoo-brctl-path.patch
4 Log:
5 Version bump to 2.x
6 (Portage version: 2.1.6.13/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 app-emulation/ganeti/files/ganeti2.initd
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/ganeti/files/ganeti2.initd?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/ganeti/files/ganeti2.initd?rev=1.1&content-type=text/plain
13
14 Index: ganeti2.initd
15 ===================================================================
16 #!/sbin/runscript
17 # Copyright 1999-2007 Gentoo Foundation
18 # Distributed under the terms of the GNU General Public License v2
19 # $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/files/ganeti2.initd,v 1.1 2009/10/02 22:12:19 ramereth Exp $
20
21 depend() {
22 need localmount drbd
23 after bootmisc
24 }
25
26 checkconfig() {
27 for fname in /var/lib/ganeti/server.pem
28 do
29 if [[ ! -f "$fname" ]]
30 then
31 eerror "Config file $fname not found, will not run."
32 return 1
33 fi
34 done
35
36 return 0
37 }
38
39 start_action() {
40 # called as start_action daemon pidfile
41 local daemon="${1}"; shift
42 local pidfile="${1}"; shift
43 ebegin "Starting ${daemon}"
44 start-stop-daemon --start --quiet --exec "${daemon}" --pidfile "${pidfile}" \
45 -- "${@}"
46 eend ${?}
47 }
48
49 stop_action() {
50 # called as stop_action daemon pidfile
51 ebegin "Stopping ${1}"
52 start-stop-daemon --stop --quiet --oknodo --retry 30 --pidfile "${2}"
53 eend ${?}
54 }
55
56
57 start() {
58 checkconfig || return 1
59 start_action /usr/sbin/ganeti-noded /var/run/ganeti/ganeti-noded.pid
60 start_action /usr/sbin/ganeti-masterd /var/run/ganeti/ganeti-masterd.pid
61 start_action /usr/sbin/ganeti-rapi /var/run/ganeti/ganeti-rapi.pid
62 return 0
63 }
64
65 stop() {
66 stop_action /usr/sbin/ganeti-rapi /var/run/ganeti/ganeti-rapi.pid
67 stop_action /usr/sbin/ganeti-masterd /var/run/ganeti/ganeti-masterd.pid
68 stop_action /usr/sbin/ganeti-noded /var/run/ganeti/ganeti-noded.pid
69 return 0
70 }
71
72
73
74 1.1 app-emulation/ganeti/files/ganeti-2.0.3-gentoo-brctl-path.patch
75
76 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/ganeti/files/ganeti-2.0.3-gentoo-brctl-path.patch?rev=1.1&view=markup
77 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/ganeti/files/ganeti-2.0.3-gentoo-brctl-path.patch?rev=1.1&content-type=text/plain
78
79 Index: ganeti-2.0.3-gentoo-brctl-path.patch
80 ===================================================================
81 diff -ruN work.orig/ganeti-2.0.3/lib/hypervisor/hv_kvm.py work/ganeti-2.0.3/lib/hypervisor/hv_kvm.py
82 --- a/ganeti-2.0.3/lib/hypervisor/hv_kvm.py 2009-09-23 09:56:34.000000000 -0700
83 +++ b/ganeti-2.0.3/lib/hypervisor/hv_kvm.py 2009-09-23 09:56:50.000000000 -0700
84 @@ -137,7 +137,7 @@
85 script.write("else\n")
86 script.write(" # Connect the interface to the bridge\n")
87 script.write(" /sbin/ifconfig $INTERFACE 0.0.0.0 up\n")
88 - script.write(" /usr/sbin/brctl addif $BRIDGE $INTERFACE\n")
89 + script.write(" /sbin/brctl addif $BRIDGE $INTERFACE\n")
90 script.write("fi\n\n")
91 # As much as we'd like to put this in our _ROOT_DIR, that will happen to be
92 # mounted noexec sometimes, so we'll have to find another place.