Gentoo Archives: gentoo-commits

From: "Patrick McLean (chutzpah)" <chutzpah@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-emulation/ganeti/files: ganeti-2.11-regex-builtin.patch ganeti.confd-r2 ganeti.initd-r2
Date: Fri, 30 May 2014 22:07:28
Message-Id: 20140530220723.E56E92004E@flycatcher.gentoo.org
1 chutzpah 14/05/30 22:07:23
2
3 Added: ganeti-2.11-regex-builtin.patch ganeti.confd-r2
4 ganeti.initd-r2
5 Log:
6 Version bump, rework the init script.
7
8 (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0xE3F69979BB4B8928DA78E3D17CBF44EF)
9
10 Revision Changes Path
11 1.1 app-emulation/ganeti/files/ganeti-2.11-regex-builtin.patch
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/ganeti/files/ganeti-2.11-regex-builtin.patch?rev=1.1&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/ganeti/files/ganeti-2.11-regex-builtin.patch?rev=1.1&content-type=text/plain
15
16 Index: ganeti-2.11-regex-builtin.patch
17 ===================================================================
18 diff --git a/configure.ac b/configure.ac
19 index d70db62..f94043f 100644
20 --- a/configure.ac
21 +++ b/configure.ac
22 @@ -612,8 +612,8 @@ CONFD_PKG=
23 # if a new confd dependency is needed, add it here like:
24 # AC_GHC_PKG_CHECK([somepkg], [], [HS_NODEV=1; CONFD_PKG="$CONFD_PKG somepkg"])
25 HS_REGEX_PCRE=-DNO_REGEX_PCRE
26 -AC_GHC_PKG_CHECK([regex-pcre], [HS_REGEX_PCRE=],
27 - [HS_NODEV=1; CONFD_PKG="$CONFD_PKG regex-pcre"])
28 +AC_GHC_PKG_CHECK([regex-pcre-builtin], [HS_REGEX_PCRE=],
29 + [HS_NODEV=1; CONFD_PKG="$CONFD_PKG regex-pcre-builtin"])
30
31 has_confd=False
32 if test "$enable_confd" != no; then
33
34
35
36 1.1 app-emulation/ganeti/files/ganeti.confd-r2
37
38 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/ganeti/files/ganeti.confd-r2?rev=1.1&view=markup
39 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/ganeti/files/ganeti.confd-r2?rev=1.1&content-type=text/plain
40
41 Index: ganeti.confd-r2
42 ===================================================================
43 # /etc/conf.d/ganeti: config file for /etc/init.d/ganeti
44
45 # Extra options to pass to all of the ganeti daemons
46 # GANETI_OPTS="-d"
47
48 # Options to pass to ganeti-masterd
49 # GANETI_MASTERD_OPTS=""
50
51 # Options to pass to ganeti-rapi
52 # GANETI_RAPI_OPTS=""
53
54 # Options to pass to ganeti-noded
55 # GANETI_NODED_OPTS=""
56
57 # Options to pass to ganeti-confd
58 # GANETI_CONFD_OPTS=""
59
60 # Options to pass to ganeti-luxid
61 # GANETI_LUXID_OPTS=""
62
63
64
65 1.1 app-emulation/ganeti/files/ganeti.initd-r2
66
67 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/ganeti/files/ganeti.initd-r2?rev=1.1&view=markup
68 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/ganeti/files/ganeti.initd-r2?rev=1.1&content-type=text/plain
69
70 Index: ganeti.initd-r2
71 ===================================================================
72 #!/sbin/runscript
73 # Copyright 1999-2014 Gentoo Foundation
74 # Distributed under the terms of the GNU General Public License v2
75 # $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/files/ganeti.initd-r2,v 1.1 2014/05/30 22:07:23 chutzpah Exp $
76
77 depend() {
78 need localmount logger
79 after bootmisc sshd
80 use net
81 }
82
83 DAEMON_UTIL="/usr/lib/ganeti/daemon-util"
84
85 is_master() {
86 [ -z "${ganeti_master}" ] && ganeti_master="$(gnt-cluster getmaster)"
87 [ -z "${local_hostname}" ] && local_hostname="$(hostname -f)"
88 [ "${ganeti_master}" = "${local_hostname}" ]
89 }
90
91 start() {
92 if ! [ -e ${DAEMON_UTIL} ]; then
93 eerror "Could not find daemon utility at ${DAEMON_UTIL}"
94 return 1
95 elif ! ${DAEMON_UTIL} check-config ; then
96 eerror "Incomplete configuration, will not run."
97 return 1
98 fi
99
100 local daemon retval=0 optsvar started_daemons daemon_opts
101
102 for daemon in $(${DAEMON_UTIL} list-start-daemons); do
103 optsvar="${daemon//-/_}"
104
105 case "${daemon#ganeti-}" in
106 masterd|rapid|luxid) is_master || continue;;
107 esac
108
109 eval daemon_opts=\"\$\{${optsvar^^*}_OPTS\}\"
110
111 ebegin "Starting ${daemon}"
112 eindent
113 ${DAEMON_UTIL} start ${daemon} ${GANETI_OPTS} ${daemon_opts} || retval=${?}
114
115 if [ ${retval} != 0 ] && [ -n "${started_daemons}" ]; then
116 eerror "Stopping already started daemons"
117 eindent
118 eend ${code} "$(${DAEMON_UTIL} check-exitcode ${code})"
119
120 for daemon in ${started_daemons}; do
121 ebegin "Stopping ${daemon}"
122 ${DAEMON_UTIL} stop ${daemon} ${GANETI_OPTS}
123 eend ${?}
124 done
125 eoutdent; eoutdent
126 return ${retval}
127 fi
128 eoutdent
129 started_daemons="${started_daemons} ${daemon}"
130 done
131 }
132
133 stop() {
134 if ! [ -e ${DAEMON_UTIL} ]; then
135 eerror "Could not find daemon utility at ${DAEMON_UTIL}"
136 return 1
137 fi
138
139 local daemon
140
141 for daemon in $(${DAEMON_UTIL} list-stop-daemons) ; do \
142 case "${daemon}" in
143 ganeti-masterd|ganeti-rapi|ganeti-luxid)
144 is_master || continue
145 ;;
146 esac
147 ${DAEMON_UTIL} stop ${daemon} ${GANETI_OPTS}
148 done
149 }
150
151 # vim:ft=gentoo-init-d:ts=4:sts=4:sw=4:noet: