summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick McLean <chutzpah@gentoo.org>2016-04-05 11:36:37 -0700
committerPatrick McLean <chutzpah@gentoo.org>2016-04-05 11:42:20 -0700
commit20416eac333b0e68913dc2f37b046a012bf155f9 (patch)
tree245f683b2fa48b6e06a821a00b3e247051977b78 /app-emulation/ganeti/files
parentapp-emulation/ganeti: revision bump, port to EAPI=6, force <sphinx-1.3 (diff)
downloadgentoo-20416eac333b0e68913dc2f37b046a012bf155f9.tar.gz
gentoo-20416eac333b0e68913dc2f37b046a012bf155f9.tar.bz2
gentoo-20416eac333b0e68913dc2f37b046a012bf155f9.zip
app-emulation/ganeti: Clean out old versions
Package-Manager: portage-2.2.28
Diffstat (limited to 'app-emulation/ganeti/files')
-rw-r--r--app-emulation/ganeti/files/ganeti-2.1.initd112
-rw-r--r--app-emulation/ganeti/files/ganeti-2.2.initd113
-rw-r--r--app-emulation/ganeti/files/ganeti-2.6-add-pgrep.patch38
-rw-r--r--app-emulation/ganeti/files/ganeti-2.6-fix-args.patch45
-rw-r--r--app-emulation/ganeti/files/ganeti-2.9-regex-builtin.patch22
-rw-r--r--app-emulation/ganeti/files/ganeti-fix-start-stop.patch47
-rw-r--r--app-emulation/ganeti/files/ganeti.confd16
-rw-r--r--app-emulation/ganeti/files/ganeti.initd57
-rw-r--r--app-emulation/ganeti/files/ganeti2.initd55
9 files changed, 0 insertions, 505 deletions
diff --git a/app-emulation/ganeti/files/ganeti-2.1.initd b/app-emulation/ganeti/files/ganeti-2.1.initd
deleted file mode 100644
index 111f75468999..000000000000
--- a/app-emulation/ganeti/files/ganeti-2.1.initd
+++ /dev/null
@@ -1,112 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-depend() {
- need localmount logger
- after bootmisc
-}
-
-DAEMON_UTIL="/usr/lib/ganeti/daemon-util"
-
-check_config() {
- if ! $DAEMON_UTIL check-config ; then
- eend 0 "Incomplete configuration, will not run."
- fi
-}
-
-check_exitcode() {
- RC=${1}
- if errmsg=$(${DAEMON_UTIL} check-exitcode ${RC}) ; then
- eend 0 "${errmsg}"
- else
- eend 1 "${errmsg}"
- fi
-}
-
-start_action() {
- # called as start_action daemon-name
- local daemon="${1}"
- ebegin "Starting ${daemon}"
- ${DAEMON_UTIL} start "${@}"
- check_exitcode ${?}
-}
-
-stop_action() {
- # called as stop_action daemon-name
- local daemon="${1}"
- ebegin "Stopping ${daemon}"
- ${DAEMON_UTIL} stop "${@}"
- check_exitcode ${?}
-}
-
-maybe_do() {
- requested="${1}"; shift
- action="${1}"; shift
- target="${1}"
- if [ -z "${requested}" -o "${requested}" = "${target}" ] ; then
- ${action} "${@}"
- fi
-}
-
-get_master_node() {
- MASTER_NODE="$(gnt-cluster getmaster)"
- NODE_HOSTNAME="$(hostname -f)"
- if [ "$MASTER_NODE" == "$NODE_HOSTNAME" ] ; then
- MASTER=1
- else
- MASTER=0
- fi
-}
-
-start_all() {
- check_config
- get_master_node
- for i in $($DAEMON_UTIL list-start-daemons); do \
- GANETI_START_OPTS="${GANETI_OPTS}"
- case "${i}" in
- ganeti-masterd)
- GANETI_OPTS="${GANETI_START_OPTS} ${GANETI_MASTERD_OPTS}"
- ;;
- ganeti-rapid)
- GANETI_OPTS="${GANETI_START_OPTS} ${GANETI_RAPI_OPTS}"
- ;;
- ganeti-noded)
- GANETI_OPTS="${GANETI_START_OPTS} ${GANETI_NODED_OPTS}"
- ;;
- ganeti-confd)
- GANETI_OPTS="${GANETI_START_OPTS} ${GANETI_CONFD_OPTS}"
- ;;
- esac
- # Don't start if not master
- if [ $MASTER = 0 -a $i = "ganeti-masterd" ] ; then
- continue
- elif [ $MASTER = 0 -a $i = "ganeti-rapi" ] ; then
- continue
- else
- maybe_do "${1}" start_action ${i} ${GANETI_OPTS}
- fi
- done
-}
-
-stop_all() {
- get_master_node
- for i in $($DAEMON_UTIL list-stop-daemons) ; do \
- if [ $MASTER = 0 -a $i = "ganeti-masterd" ] ; then
- continue
- elif [ $MASTER = 0 -a $i = "ganeti-rapi" ] ; then
- continue
- else
- maybe_do "${1}" stop_action ${i} ${GANETI_OPTS}
- fi
- done
-}
-
-start() {
- start_all
-}
-
-stop() {
- stop_all
-}
diff --git a/app-emulation/ganeti/files/ganeti-2.2.initd b/app-emulation/ganeti/files/ganeti-2.2.initd
deleted file mode 100644
index a270ac831e93..000000000000
--- a/app-emulation/ganeti/files/ganeti-2.2.initd
+++ /dev/null
@@ -1,113 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-depend() {
- need localmount logger
- after bootmisc
- use net
-}
-
-DAEMON_UTIL="/usr/lib/ganeti/daemon-util"
-
-check_config() {
- if ! $DAEMON_UTIL check-config ; then
- eend 0 "Incomplete configuration, will not run."
- fi
-}
-
-check_exitcode() {
- RC=${1}
- if errmsg=$(${DAEMON_UTIL} check-exitcode ${RC}) ; then
- eend 0 "${errmsg}"
- else
- eend 1 "${errmsg}"
- fi
-}
-
-start_action() {
- # called as start_action daemon-name
- local daemon="${1}"
- ebegin "Starting ${daemon}"
- ${DAEMON_UTIL} start "${@}"
- check_exitcode ${?}
-}
-
-stop_action() {
- # called as stop_action daemon-name
- local daemon="${1}"
- ebegin "Stopping ${daemon}"
- ${DAEMON_UTIL} stop "${@}"
- check_exitcode ${?}
-}
-
-maybe_do() {
- requested="${1}"; shift
- action="${1}"; shift
- target="${1}"
- if [ -z "${requested}" -o "${requested}" = "${target}" ] ; then
- ${action} "${@}"
- fi
-}
-
-get_master_node() {
- MASTER_NODE="$(gnt-cluster getmaster)"
- NODE_HOSTNAME="$(hostname -f)"
- if [ "$MASTER_NODE" == "$NODE_HOSTNAME" ] ; then
- MASTER=1
- else
- MASTER=0
- fi
-}
-
-start_all() {
- check_config
- get_master_node
- for i in $($DAEMON_UTIL list-start-daemons); do \
- GANETI_START_OPTS="${GANETI_OPTS}"
- case "${i}" in
- ganeti-masterd)
- GANETI_OPTS="${GANETI_START_OPTS} ${GANETI_MASTERD_OPTS}"
- ;;
- ganeti-rapid)
- GANETI_OPTS="${GANETI_START_OPTS} ${GANETI_RAPI_OPTS}"
- ;;
- ganeti-noded)
- GANETI_OPTS="${GANETI_START_OPTS} ${GANETI_NODED_OPTS}"
- ;;
- ganeti-confd)
- GANETI_OPTS="${GANETI_START_OPTS} ${GANETI_CONFD_OPTS}"
- ;;
- esac
- # Don't start if not master
- if [ $MASTER = 0 -a $i = "ganeti-masterd" ] ; then
- continue
- elif [ $MASTER = 0 -a $i = "ganeti-rapi" ] ; then
- continue
- else
- maybe_do "${1}" start_action ${i} ${GANETI_OPTS}
- fi
- done
-}
-
-stop_all() {
- get_master_node
- for i in $($DAEMON_UTIL list-stop-daemons) ; do \
- if [ $MASTER = 0 -a $i = "ganeti-masterd" ] ; then
- continue
- elif [ $MASTER = 0 -a $i = "ganeti-rapi" ] ; then
- continue
- else
- maybe_do "${1}" stop_action ${i} ${GANETI_OPTS}
- fi
- done
-}
-
-start() {
- start_all
-}
-
-stop() {
- stop_all
-}
diff --git a/app-emulation/ganeti/files/ganeti-2.6-add-pgrep.patch b/app-emulation/ganeti/files/ganeti-2.6-add-pgrep.patch
deleted file mode 100644
index c69128229a66..000000000000
--- a/app-emulation/ganeti/files/ganeti-2.6-add-pgrep.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 49767a66e27a1cb61abb8f812b2e61eba03a9594 Mon Sep 17 00:00:00 2001
-From: Lance Albertson <lance@osuosl.org>
-Date: Wed, 25 Jul 2012 16:21:21 -0700
-Subject: [PATCH 2/2] Check if process is already running and skip if so
-
-Gentoo uses a modified version of start-stop-daemon which returns an error if it
-sees another process running with the same name. This happens during cluster
-initialization since ganeti-noded gets fired off first.
----
- daemons/daemon-util.in | 12 +++++++-----
- 1 file changed, 7 insertions(+), 5 deletions(-)
-
-diff --git a/daemons/daemon-util.in b/daemons/daemon-util.in
-index c19daa7..7be9d8b 100644
---- a/daemons/daemon-util.in
-+++ b/daemons/daemon-util.in
-@@ -222,11 +222,13 @@ start() {
- @PKGLIBDIR@/ensure-dirs
-
- if type -p start-stop-daemon >/dev/null; then
-- start-stop-daemon --start --quiet \
-- --pidfile $pidfile \
-- --exec $daemonexec \
-- --user $usergroup \
-- -- $args "$@"
-+ if ! ret=$(/usr/bin/pgrep $name) ; then
-+ start-stop-daemon --start --quiet \
-+ --pidfile $pidfile \
-+ --exec $daemonexec \
-+ --user $usergroup \
-+ -- $args "$@"
-+ fi
- else
- # TODO: Find a way to start daemon with a group, until then the group must
- # be removed
---
-1.7.9.5
-
diff --git a/app-emulation/ganeti/files/ganeti-2.6-fix-args.patch b/app-emulation/ganeti/files/ganeti-2.6-fix-args.patch
deleted file mode 100644
index 6fb5bd0df62f..000000000000
--- a/app-emulation/ganeti/files/ganeti-2.6-fix-args.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 0491397d7648fd70ad0a6cef9e8626b9c2a968e9 Mon Sep 17 00:00:00 2001
-From: Lance Albertson <ramereth@gmail.com>
-Date: Mon, 8 Aug 2011 23:34:33 -0700
-Subject: [PATCH 1/2] Remove/fix deprecated start-stop-daemon functions
-
-daemon-util uses the deprecated functions --startas, --chuid and, most
-importantly, --oknodo. The last one causes start-stop-daemon to exit with a
-non-zero status, which makes openrc think it crashed (when in reality it just
-shut down properly) [1].
-
-[1] https://bugs.gentoo.org/show_bug.cgi?id=377905
----
- daemons/daemon-util.in | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/daemons/daemon-util.in b/daemons/daemon-util.in
-index b754e7f..c19daa7 100644
---- a/daemons/daemon-util.in
-+++ b/daemons/daemon-util.in
-@@ -222,10 +222,10 @@ start() {
- @PKGLIBDIR@/ensure-dirs
-
- if type -p start-stop-daemon >/dev/null; then
-- start-stop-daemon --start --quiet --oknodo \
-+ start-stop-daemon --start --quiet \
- --pidfile $pidfile \
-- --startas $daemonexec \
-- --chuid $usergroup \
-+ --exec $daemonexec \
-+ --user $usergroup \
- -- $args "$@"
- else
- # TODO: Find a way to start daemon with a group, until then the group must
-@@ -248,7 +248,7 @@ stop() {
- local pidfile=$(_daemon_pidfile $name)
-
- if type -p start-stop-daemon >/dev/null; then
-- start-stop-daemon --stop --quiet --oknodo --retry 30 \
-+ start-stop-daemon --stop --quiet --retry 30 \
- --pidfile $pidfile
- else
- _ignore_error killproc -p $pidfile $name
---
-1.7.9.5
-
diff --git a/app-emulation/ganeti/files/ganeti-2.9-regex-builtin.patch b/app-emulation/ganeti/files/ganeti-2.9-regex-builtin.patch
deleted file mode 100644
index f9aba9d4e2eb..000000000000
--- a/app-emulation/ganeti/files/ganeti-2.9-regex-builtin.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- configure.ac.orig 2013-11-13 01:56:03.819694900 +0000
-+++ configure.ac 2013-11-13 01:56:34.350116602 +0000
-@@ -493,8 +493,8 @@
- has_confd=False
- if test "$enable_confd" != no; then
- CONFD_PKG=
-- AC_GHC_PKG_CHECK([regex-pcre], [HS_REGEX_PCRE=],
-- [CONFD_PKG="$CONFD_PKG regex-pcre"])
-+ AC_GHC_PKG_CHECK([regex-pcre-builtin], [HS_REGEX_PCRE=],
-+ [CONFD_PKG="$CONFD_PKG regex-pcre-builtin"])
- AC_GHC_PKG_CHECK([Crypto], [], [CONFD_PKG="$CONFD_PKG Crypto"])
- AC_GHC_PKG_CHECK([text], [], [CONFD_PKG="$CONFD_PKG text"])
- AC_GHC_PKG_CHECK([hinotify], [], [CONFD_PKG="$CONFD_PKG hinotify"])
-@@ -578,7 +578,7 @@
- AC_GHC_PKG_CHECK([vector], [], [HS_NODEV=1])
- AC_GHC_PKG_CHECK([process], [], [HS_NODEV=1])
- AC_GHC_PKG_CHECK([snap-server], [], [HS_NODEV=1])
--AC_GHC_PKG_CHECK([regex-pcre], [], [HS_NODEV=1])
-+AC_GHC_PKG_CHECK([regex-pcre-builtin], [], [HS_NODEV=1])
- AC_GHC_PKG_CHECK([Crypto], [], [HS_NODEV=1])
- AC_GHC_PKG_CHECK([text], [], [HS_NODEV=1])
- AC_GHC_PKG_CHECK([hinotify], [], [HS_NODEV=1])
diff --git a/app-emulation/ganeti/files/ganeti-fix-start-stop.patch b/app-emulation/ganeti/files/ganeti-fix-start-stop.patch
deleted file mode 100644
index e53161a00b22..000000000000
--- a/app-emulation/ganeti/files/ganeti-fix-start-stop.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 9f8f304c983635e0ead6adadd1c4a62be6e92e01 Mon Sep 17 00:00:00 2001
-From: Lance Albertson <ramereth@gmail.com>
-Date: Mon, 8 Aug 2011 23:34:33 -0700
-Subject: [PATCH] Remove/fix deprecated start-stop-daemon functions
-
-daemon-util uses the deprecated functions --startas, --chuid and, most
-importantly, --oknodo. The last one causes start-stop-daemon to exit with a
-non-zero status, which makes openrc think it crashed (when in reality it just
-shut down properly) [1].
-
-[1] https://bugs.gentoo.org/show_bug.cgi?id=377905
-
-Signed-off-by: Lance Albertson <ramereth@gmail.com>
----
- daemons/daemon-util.in | 8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/daemons/daemon-util.in b/daemons/daemon-util.in
-index 819fd6b..00fe1b6 100644
---- a/daemons/daemon-util.in
-+++ b/daemons/daemon-util.in
-@@ -172,10 +172,10 @@ start() {
-
- @PKGLIBDIR@/ensure-dirs
-
-- start-stop-daemon --start --quiet --oknodo \
-+ start-stop-daemon --start --quiet \
- --pidfile $(_daemon_pidfile $name) \
-- --startas $(_daemon_executable $name) \
-- --chuid $(_daemon_usergroup $plain_name) \
-+ --exec $(_daemon_executable $name) \
-+ --user $(_daemon_usergroup $plain_name) \
- -- $args "$@"
- }
-
-@@ -188,7 +188,7 @@ stop() {
-
- local name="$1"; shift
-
-- start-stop-daemon --stop --quiet --oknodo --retry 30 \
-+ start-stop-daemon --stop --quiet --retry 30 \
- --pidfile $(_daemon_pidfile $name)
- }
-
---
-1.7.4.1
-
diff --git a/app-emulation/ganeti/files/ganeti.confd b/app-emulation/ganeti/files/ganeti.confd
deleted file mode 100644
index 3b71d7ee44a8..000000000000
--- a/app-emulation/ganeti/files/ganeti.confd
+++ /dev/null
@@ -1,16 +0,0 @@
-# /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=""
diff --git a/app-emulation/ganeti/files/ganeti.initd b/app-emulation/ganeti/files/ganeti.initd
deleted file mode 100644
index 8d31f1698490..000000000000
--- a/app-emulation/ganeti/files/ganeti.initd
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-depend() {
- need localmount xend drbd
- before ganeti-kvm-poweroff
- after bootmisc nfsmount
-}
-
-checkconfig() {
- for fname in /var/lib/ganeti/ssconf_node_pass /var/lib/ganeti/server.pem
- do
- if [[ ! -f "$fname" ]]
- then
- eerror "Config file $fname not found, will not run."
- return 1
- fi
- done
-
- return 0
-}
-
-start() {
- checkconfig || return 1
-
- ebegin "Starting ganeti-master"
- /usr/sbin/ganeti-master start
- ret=$?
- eend ${ret}
- [[ "${ret}" != 0 ]] && return 1
-
- ebegin "Starting ganeti-noded"
- start-stop-daemon --start --quiet --exec /usr/sbin/ganeti-noded
- ret=$?
- eend ${ret}
- [[ "${ret}" != 0 ]] && return 1
-
- return 0
-}
-
-stop() {
- ebegin "Stopping ganeti-noded"
- start-stop-daemon --stop --quiet --name ganeti-noded
- ret=$?
- eend ${ret}
- [[ "${ret}" != 0 ]] && return 1
-
- ebegin "Stopping ganeti-master"
- /usr/sbin/ganeti-master start
- ret=$?
- eend ${ret}
- [[ "${ret}" != 0 ]] && return 1
-
- return 0
-}
diff --git a/app-emulation/ganeti/files/ganeti2.initd b/app-emulation/ganeti/files/ganeti2.initd
deleted file mode 100644
index 74a748a73e38..000000000000
--- a/app-emulation/ganeti/files/ganeti2.initd
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-depend() {
- need localmount drbd
- after bootmisc
-}
-
-checkconfig() {
- for fname in /var/lib/ganeti/server.pem
- do
- if [[ ! -f "$fname" ]]
- then
- eerror "Config file $fname not found, will not run."
- return 1
- fi
- done
-
- return 0
-}
-
-start_action() {
- # called as start_action daemon pidfile
- local daemon="${1}"; shift
- local pidfile="${1}"; shift
- ebegin "Starting ${daemon}"
- start-stop-daemon --start --quiet --exec "${daemon}" --pidfile "${pidfile}" \
- -- "${@}"
- eend ${?}
-}
-
-stop_action() {
- # called as stop_action daemon pidfile
- ebegin "Stopping ${1}"
- start-stop-daemon --stop --quiet --oknodo --retry 30 --pidfile "${2}"
- eend ${?}
-}
-
-
-start() {
- checkconfig || return 1
- start_action /usr/sbin/ganeti-noded /var/run/ganeti/ganeti-noded.pid
- start_action /usr/sbin/ganeti-masterd /var/run/ganeti/ganeti-masterd.pid
- start_action /usr/sbin/ganeti-rapi /var/run/ganeti/ganeti-rapi.pid
- return 0
-}
-
-stop() {
- stop_action /usr/sbin/ganeti-rapi /var/run/ganeti/ganeti-rapi.pid
- stop_action /usr/sbin/ganeti-masterd /var/run/ganeti/ganeti-masterd.pid
- stop_action /usr/sbin/ganeti-noded /var/run/ganeti/ganeti-noded.pid
- return 0
-}