[gentoo-commits] gentoo-x86 commit in app-emulation/ganeti/files: ganeti-2.11-regex-builtin.patch ganeti.confd-r2 ganeti.initd-r2

[Patrick McLean (chutzpah)]

chutzpah    14/05/30 22:07:23

  Added:                ganeti-2.11-regex-builtin.patch ganeti.confd-r2
                        ganeti.initd-r2
  Log:
  Version bump, rework the init script.
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 
0xE3F69979BB4B8928DA78E3D17CBF44EF)

Revision  Changes    Path
1.1                  app-emulation/ganeti/files/ganeti-2.11-regex-builtin.patch

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/ganeti/files/ganeti-2.11-regex-builtin.patch?rev=1.1&view=markup
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

Index: ganeti-2.11-regex-builtin.patch
===================================================================
diff --git a/configure.ac b/configure.ac
index d70db62..f94043f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -612,8 +612,8 @@ CONFD_PKG=
 # if a new confd dependency is needed, add it here like:
 # AC_GHC_PKG_CHECK([somepkg], [], [HS_NODEV=1; CONFD_PKG="$CONFD_PKG somepkg"])
 HS_REGEX_PCRE=-DNO_REGEX_PCRE
-AC_GHC_PKG_CHECK([regex-pcre], [HS_REGEX_PCRE=],
-                 [HS_NODEV=1; CONFD_PKG="$CONFD_PKG regex-pcre"])
+AC_GHC_PKG_CHECK([regex-pcre-builtin], [HS_REGEX_PCRE=],
+                 [HS_NODEV=1; CONFD_PKG="$CONFD_PKG regex-pcre-builtin"])
 
 has_confd=False
 if test "$enable_confd" != no; then



1.1                  app-emulation/ganeti/files/ganeti.confd-r2

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/ganeti/files/ganeti.confd-r2?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/ganeti/files/ganeti.confd-r2?rev=1.1&content-type=text/plain

Index: ganeti.confd-r2
===================================================================
# /etc/conf.d/ganeti: config file for /etc/init.d/ganeti

# Extra options to pass to all of the ganeti daemons
# GANETI_OPTS="-d"

# Options to pass to ganeti-masterd
# GANETI_MASTERD_OPTS=""

# Options to pass to ganeti-rapi
# GANETI_RAPI_OPTS=""

# Options to pass to ganeti-noded
# GANETI_NODED_OPTS=""

# Options to pass to ganeti-confd
# GANETI_CONFD_OPTS=""

# Options to pass to ganeti-luxid
# GANETI_LUXID_OPTS=""



1.1                  app-emulation/ganeti/files/ganeti.initd-r2

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/ganeti/files/ganeti.initd-r2?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/ganeti/files/ganeti.initd-r2?rev=1.1&content-type=text/plain

Index: ganeti.initd-r2
===================================================================
#!/sbin/runscript
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/files/ganeti.initd-r2,v 
1.1 2014/05/30 22:07:23 chutzpah Exp $

depend() {
        need localmount logger
        after bootmisc sshd
        use net
}

DAEMON_UTIL="/usr/lib/ganeti/daemon-util"

is_master() {
        [ -z "${ganeti_master}" ] && ganeti_master="$(gnt-cluster getmaster)"
        [ -z "${local_hostname}" ] && local_hostname="$(hostname -f)"
        [ "${ganeti_master}" = "${local_hostname}" ]
}

start() {
        if ! [ -e ${DAEMON_UTIL} ]; then
                eerror "Could not find daemon utility at ${DAEMON_UTIL}"
                return 1
        elif ! ${DAEMON_UTIL} check-config ; then
                eerror "Incomplete configuration, will not run."
                return 1
        fi

        local daemon retval=0 optsvar started_daemons daemon_opts

        for daemon in $(${DAEMON_UTIL} list-start-daemons); do
                optsvar="${daemon//-/_}"

                case "${daemon#ganeti-}" in
                        masterd|rapid|luxid) is_master || continue;;
                esac

                eval daemon_opts=\"\$\{${optsvar^^*}_OPTS\}\"

                ebegin "Starting ${daemon}"
                eindent
                ${DAEMON_UTIL} start ${daemon} ${GANETI_OPTS} ${daemon_opts} || 
retval=${?}

                if [ ${retval} != 0  ] && [ -n "${started_daemons}" ]; then
                        eerror "Stopping already started daemons"
                        eindent
                        eend ${code} "$(${DAEMON_UTIL} check-exitcode ${code})"

                        for daemon in ${started_daemons}; do
                                ebegin "Stopping ${daemon}"
                                ${DAEMON_UTIL} stop ${daemon} ${GANETI_OPTS}
                                eend ${?}
                        done
                        eoutdent; eoutdent
                        return ${retval}
                fi
                eoutdent
                started_daemons="${started_daemons} ${daemon}"
        done
}

stop() {
        if ! [ -e ${DAEMON_UTIL} ]; then
                eerror "Could not find daemon utility at ${DAEMON_UTIL}"
                return 1
        fi

        local daemon

        for daemon in $(${DAEMON_UTIL} list-stop-daemons) ; do \
                case "${daemon}" in
                        ganeti-masterd|ganeti-rapi|ganeti-luxid)
                                is_master || continue
                        ;;
                esac
                ${DAEMON_UTIL} stop ${daemon} ${GANETI_OPTS}
        done
}

# vim:ft=gentoo-init-d:ts=4:sts=4:sw=4:noet: