diff options
| author |   Patrick McLean <chutzpah@gentoo.org> | 2014-07-02 23:57:33 +0000 |
|---|---|---|
| committer | Patrick McLean <chutzpah@gentoo.org> | 2014-07-02 23:57:33 +0000 |
| commit | e800527cb45b4c1b8a731c414dded4b16ef1c31f (patch) | |
| tree | 2965bf5478ec156dd970d5339c5ab624cccf0b6f /app-emulation/ganeti/files | |
| parent | Version bump (diff) | |
| download | historical-e800527cb45b4c1b8a731c414dded4b16ef1c31f.tar.gz historical-e800527cb45b4c1b8a731c414dded4b16ef1c31f.tar.bz2 historical-e800527cb45b4c1b8a731c414dded4b16ef1c31f.zip | |
Revision bump, make failure to start ganeti-kvmd not fatal since it fails if user shutdowns are disabled. Clean out older versions.
Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xE3F69979BB4B8928DA78E3D17CBF44EF
Diffstat (limited to 'app-emulation/ganeti/files')
| -rw-r--r-- | app-emulation/ganeti/files/ganeti.initd-r3 | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/app-emulation/ganeti/files/ganeti.initd-r3 b/app-emulation/ganeti/files/ganeti.initd-r3 index 81b0e4165a09..9e0fc170695f 100644 --- a/app-emulation/ganeti/files/ganeti.initd-r3 +++ b/app-emulation/ganeti/files/ganeti.initd-r3 @@ -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 @@ start() { ${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})" + 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} + 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}" |