Permalink
Browse files

import changes from portage tree

  • Loading branch information...
ramereth committed Aug 15, 2011
1 parent 2c4df32 commit b0622a90faec53a037ccc704048acd85da3a13bc
@@ -1,6 +1,6 @@
-AUX ganeti-2.1.initd 2014 RMD160 44996bf7d50b8ac70df572daafa5f5d04be021a8 SHA1 ceda61da3b3099292f4cd5ab41b5e02f2666dc6b SHA256 37fd18b914846e5fb8d984db7162b230ac3488ec530aaddda7b63bd72cc70117
+AUX ganeti-2.1.initd 1748 RMD160 83e3a40e944c4572d1d4e43cb68a5eeaecdb860b SHA1 a86e81d427d525cdc58258bec8221447558c4019 SHA256 9114a9eebb0f1af369e25739f4ee042bb7b083c70098d1eb404681ed2b02ba70
AUX ganeti-kvm-poweroff.confd 186 RMD160 87242c3c785e012b2ec7534836dabd8017a25893 SHA1 955bdc02481591c06d8e00f1b6e04c55830e1150 SHA256 d811f1825351b03653aed4b6827b2b0c9dd1dc3340c980862c0758b3bf5ad21e
AUX ganeti-kvm-poweroff.initd 1621 RMD160 2d8d59ac9bf25ff6efa74a3277f4d295c05d4282 SHA1 7e3cbfb9f6ed988393522af6569a96c66cb4feb0 SHA256 bb7b6ab5ac2899969bab52d9c5e1c5d9fd9629d247563ff74e8b9f64a4478e28
AUX ganeti.confd 248 RMD160 18662964365f102e77f593429bb0772d94c65267 SHA1 337999b3fbeb64518f3d39c41634e3f414aedb25 SHA256 7efc3a5052ad5c2085605a8c0bf9e9bb9cf20c0623263b7abcd0b7a0cb9a895b
-EBUILD ganeti-9999.ebuild 3392 RMD160 bd89104274850e39dba772031ba6d6347af6d656 SHA1 2508565bf8cfb57ba08719837f80155218dad419 SHA256 043a83a39c744d5c8566cfe738c191d45255a53d062e611d167f85415a489fc8
+EBUILD ganeti-9999.ebuild 3419 RMD160 1f4e6480fb314c444781c71e2bb76a43f3b4cf87 SHA1 490b3e4f775c1b54a7898dd5ee625e02ffe56c37 SHA256 b38a172d71af012462ba1016a5f8eeab05a7fe4999fface4ca8144d0662aff96
MISC metadata.xml 1417 RMD160 901905a7bd7b2bcbecdecf2380565e714ba6b8e4 SHA1 186ebe41b1124eb972c7412f9a7470422c6a281c SHA256 4c9d7eac035b80579071e8d3d283df32f011729e8058345b7d3c497671d59bf4
@@ -1,45 +1,28 @@
#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/files/ganeti-2.1.initd,v 1.3 2010/03/07 20:56:02 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/files/ganeti-2.1.initd,v 1.4 2011/08/09 06:57:04 ramereth Exp $
depend() {
need localmount
after bootmisc
}
-NODED="ganeti-noded"
-MASTERD="ganeti-masterd"
-CONFD="ganeti-confd"
-RAPI="ganeti-rapi"
DAEMON_UTIL="/usr/lib/ganeti/daemon-util"
check_config() {
- 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
+ if ! $DAEMON_UTIL check-config ; then
+ eend 0 "Incomplete configuration, will not run."
+ fi
}
check_exitcode() {
RC=${1}
- case ${RC} in
- 0)
- eend 0
- ;;
- 11)
- eend 0 "not master"
- ;;
- *)
- eend 1 "exit code $RC"
- ;;
- esac
+ if errmsg=$(${DAEMON_UTIL} check-exitcode ${RC}) ; then
+ eend 0 "${errmsg}"
+ else
+ eend 1 "${errmsg}"
+ fi
}
start_action() {
@@ -69,7 +52,7 @@ maybe_do() {
start_all() {
check_config
- for i in ${NODED} ${MASTERD} ${CONFD} ${RAPI}; do \
+ for i in $($DAEMON_UTIL list-start-daemons); do \
case "${i}" in
ganeti-masterd)
GANETI_OPTS="${GANETI_OPTS} ${GANETI_MASTERD_OPTS}"
@@ -83,7 +66,7 @@ start_all() {
}
stop_all() {
- for i in ${RAPI} ${CONFD} ${MASTERD} ${NODED}; do \
+ for i in $($DAEMON_UTIL list-stop-daemons) ; do \
maybe_do "${1}" stop_action ${i}
done
}
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.4.1.ebuild,v 1.1 2011/03/09 18:20:00 ramereth Exp $
-EAPI="3"
+EAPI="4"
inherit eutils confutils bash-completion
@@ -63,6 +63,7 @@ DEPEND="xen? ( >=app-emulation/xen-3.0 )
net-misc/socat
sys-apps/iproute2
sys-fs/lvm2
+ >=sys-apps/baselayout-2.0
${GIT_DEPEND}"
RDEPEND="${DEPEND}
!app-emulation/ganeti-htools"

0 comments on commit b0622a9

Please sign in to comment.