[patch] /etc/init.d/ganeti patch removing duplicate code from /usr/lib/ganeti/daemon-util

init.d-ganeti.patch (text/plain), 1.11 KB, created by Zentoo on 2016-09-21 13:00:42 UTC

--- ganeti.orig	2016-09-21 14:39:04.187212153 +0200
+++ ganeti	2016-09-21 14:52:27.106047286 +0200
@@ -13,12 +13,6 @@
 
 DAEMON_UTIL="/usr/lib/ganeti/daemon-util"
 
-is_master() {
-	[ -z "${ganeti_master}" ] && ganeti_master="$(gnt-cluster getmaster)"
-	[ -z "${local_hostname}" ] && local_hostname="$(hostname -f)"
-	[ "${ganeti_master}" = "${local_hostname}" ]
-}
-
 # This exists specifically for restarting a 2-node cluster where quorum might
 # not be available.
 forcestart() {
@@ -43,13 +37,8 @@
 
 	for daemon in $(${DAEMON_UTIL} list-start-daemons); do
 		optsvar="$(printf "${daemon}_OPTS" | tr - _ | LC_ALL=C tr '[:lower:]' '[:upper:]')"
-
-		case "${daemon#ganeti-}" in
-			masterd|rapi|luxid) is_master || continue;;
-		esac
-
 		eval daemon_opts=\"\$\{${optsvar}\}\"
-
+		
 		ebegin "Starting ${daemon}"
 		eindent
 		veinfo ${DAEMON_UTIL} start ${daemon} ${GANETI_OPTS} ${daemon_opts}
@@ -87,9 +76,6 @@
 	local daemon
 
 	for daemon in $(${DAEMON_UTIL} list-stop-daemons) ; do \
-		case "${daemon#ganeti-}" in
-			masterd|rapi|luxid) is_master || continue;;
-		esac
 		${DAEMON_UTIL} stop ${daemon} ${GANETI_OPTS}
 	done
 }