| 1 |
chutzpah 14/07/02 23:57:26 |
| 2 |
|
| 3 |
Modified: ganeti.initd-r3 |
| 4 |
Log: |
| 5 |
Revision bump, make failure to start ganeti-kvmd not fatal since it fails if user shutdowns are disabled. Clean out older versions. |
| 6 |
|
| 7 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0xE3F69979BB4B8928DA78E3D17CBF44EF) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 app-emulation/ganeti/files/ganeti.initd-r3 |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/ganeti/files/ganeti.initd-r3?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/ganeti/files/ganeti.initd-r3?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/ganeti/files/ganeti.initd-r3?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: ganeti.initd-r3 |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/ganeti/files/ganeti.initd-r3,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- ganeti.initd-r3 5 Jun 2014 00:32:23 -0000 1.1 |
| 23 |
+++ ganeti.initd-r3 2 Jul 2014 23:57:25 -0000 1.2 |
| 24 |
@@ -1,7 +1,7 @@ |
| 25 |
#!/sbin/runscript |
| 26 |
# Copyright 1999-2014 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/files/ganeti.initd-r3,v 1.1 2014/06/05 00:32:23 chutzpah Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/files/ganeti.initd-r3,v 1.2 2014/07/02 23:57:25 chutzpah Exp $ |
| 30 |
|
| 31 |
depend() { |
| 32 |
need localmount logger |
| 33 |
@@ -42,17 +42,22 @@ |
| 34 |
${DAEMON_UTIL} start ${daemon} ${GANETI_OPTS} ${daemon_opts} || retval=${?} |
| 35 |
|
| 36 |
if [ ${retval} != 0 ] && [ -n "${started_daemons}" ]; then |
| 37 |
- eerror "Stopping already started daemons" |
| 38 |
- eindent |
| 39 |
- eend ${code} "$(${DAEMON_UTIL} check-exitcode ${code})" |
| 40 |
- |
| 41 |
- for daemon in ${started_daemons}; do |
| 42 |
- ebegin "Stopping ${daemon}" |
| 43 |
- ${DAEMON_UTIL} stop ${daemon} ${GANETI_OPTS} |
| 44 |
- eend ${?} |
| 45 |
- done |
| 46 |
- eoutdent; eoutdent |
| 47 |
- return ${retval} |
| 48 |
+ case ${daemon} in |
| 49 |
+ *-kvmd) retval=0; ewarn "Failed to start kvmd, continuing anyway";; |
| 50 |
+ *) |
| 51 |
+ eerror "Stopping already started daemons" |
| 52 |
+ eindent |
| 53 |
+ eend ${code} "$(${DAEMON_UTIL} check-exitcode ${code})" |
| 54 |
+ |
| 55 |
+ for daemon in ${started_daemons}; do |
| 56 |
+ ebegin "Stopping ${daemon}" |
| 57 |
+ ${DAEMON_UTIL} stop ${daemon} ${GANETI_OPTS} |
| 58 |
+ eend ${?} |
| 59 |
+ done |
| 60 |
+ eoutdent; eoutdent |
| 61 |
+ return ${retval} |
| 62 |
+ ;; |
| 63 |
+ esac |
| 64 |
fi |
| 65 |
eoutdent |
| 66 |
started_daemons="${started_daemons} ${daemon}" |
Archives