chutzpah 14/07/02 23:57:26 Modified: ganeti.initd-r3 Log: Revision bump, make failure to start ganeti-kvmd not fatal since it fails if user shutdowns are disabled. Clean out older versions. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0xE3F69979BB4B8928DA78E3D17CBF44EF)
Revision Changes Path 1.2 app-emulation/ganeti/files/ganeti.initd-r3 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/ganeti/files/ganeti.initd-r3?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/ganeti/files/ganeti.initd-r3?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/ganeti/files/ganeti.initd-r3?r1=1.1&r2=1.2 Index: ganeti.initd-r3 =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-emulation/ganeti/files/ganeti.initd-r3,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ganeti.initd-r3 5 Jun 2014 00:32:23 -0000 1.1 +++ ganeti.initd-r3 2 Jul 2014 23:57:25 -0000 1.2 @@ -1,7 +1,7 @@ #!/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-r3,v 1.1 2014/06/05 00:32:23 chutzpah Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/files/ganeti.initd-r3,v 1.2 2014/07/02 23:57:25 chutzpah Exp $ depend() { need localmount logger @@ -42,17 +42,22 @@ ${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} + case ${daemon} in + *-kvmd) retval=0; ewarn "Failed to start kvmd, continuing anyway";; + *) + 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} + ;; + esac fi eoutdent started_daemons="${started_daemons} ${daemon}"
