From 804db4d2145ef8cfb426846829e09b5000c34dea Mon Sep 17 00:00:00 2001
From: Sheng Yang <sheng.yang@citrix.com>
Date: Tue, 1 May 2012 15:36:35 -0700
Subject: [PATCH] Fix keepalived process not started issue

---
 .../config/opt/cloud/bin/patchsystemvm.sh       | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/patches/systemvm/debian/config/opt/cloud/bin/patchsystemvm.sh b/patches/systemvm/debian/config/opt/cloud/bin/patchsystemvm.sh
index 08a0b7a85b7..f25a3f38dcf 100755
--- a/patches/systemvm/debian/config/opt/cloud/bin/patchsystemvm.sh
+++ b/patches/systemvm/debian/config/opt/cloud/bin/patchsystemvm.sh
@@ -40,6 +40,8 @@ consoleproxy_svcs() {
    chkconfig apache2 off
    chkconfig nfs-common off
    chkconfig portmap off
+   chkconfig keepalived off
+   chkconfig conntrackd off
    echo "cloud postinit ssh" > /var/cache/cloud/enabled_svcs
    echo "cloud-passwd-srvr haproxy dnsmasq apache2 nfs-common portmap" > /var/cache/cloud/disabled_svcs
    mkdir -p /var/log/cloud
@@ -55,6 +57,8 @@ secstorage_svcs() {
    chkconfig nfs-common on
    chkconfig ssh on
    chkconfig apache2 off
+   chkconfig keepalived off
+   chkconfig conntrackd off
    echo "cloud postinit ssh nfs-common portmap" > /var/cache/cloud/enabled_svcs
    echo "cloud-passwd-srvr haproxy dnsmasq" > /var/cache/cloud/disabled_svcs
    mkdir -p /var/log/cloud
@@ -72,14 +76,19 @@ routing_svcs() {
    if [ $RROUTER -eq 0 ]
    then
        chkconfig dnsmasq off
+       chkconfig keepalived on
+       chkconfig conntrackd on
        chkconfig postinit on
-       echo "postinit" > /var/cache/cloud/enabled_svcs
+       echo "keepalived conntrackd postinit" > /var/cache/cloud/enabled_svcs
+       echo "dnsmasq " > /var/cache/cloud/disabled_svcs
    else
        chkconfig dnsmasq on
        chkconfig keepalived off
        chkconfig conntrackd off
+       echo "dnsmasq " > /var/cache/cloud/enabled_svcs
+       echo "keepalived conntrackd " > /var/cache/cloud/disabled_svcs
    fi
-   echo "cloud-passwd-srvr ssh dnsmasq haproxy apache2" >> /var/cache/cloud/enabled_svcs
+   echo "cloud-passwd-srvr ssh haproxy apache2" >> /var/cache/cloud/enabled_svcs
    echo "cloud nfs-common portmap" > /var/cache/cloud/disabled_svcs
 }
 
@@ -91,6 +100,8 @@ dhcpsrvr_svcs() {
    chkconfig ssh on
    chkconfig nfs-common off
    chkconfig portmap off
+   chkconfig keepalived off
+   chkconfig conntrackd off
    echo "cloud-passwd-srvr ssh dnsmasq apache2" > /var/cache/cloud/enabled_svcs
    echo "cloud nfs-common haproxy portmap" > /var/cache/cloud/disabled_svcs
 }
@@ -101,6 +112,8 @@ elbvm_svcs() {
    chkconfig ssh on
    chkconfig nfs-common off
    chkconfig portmap off
+   chkconfig keepalived off
+   chkconfig conntrackd off
    echo "ssh haproxy" > /var/cache/cloud/enabled_svcs
    echo "cloud cloud-passwd-srvr dnsmasq apache2 nfs-common portmap" > /var/cache/cloud/disabled_svcs
 }