From dc46ffb0c77cd2b7324b107491fdfe9fb0eb9ad2 Mon Sep 17 00:00:00 2001 From: Sheng Yang Date: Wed, 22 Jun 2011 15:24:03 -0700 Subject: [PATCH] bug 9154: various fix for scripts --- .../systemvm/debian/config/root/redundant_router/backup.sh | 4 ++-- .../debian/config/root/redundant_router/disable_pubip.sh | 1 + patches/systemvm/debian/config/root/redundant_router/fault.sh | 4 ++-- .../systemvm/debian/config/root/redundant_router/master.sh | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/patches/systemvm/debian/config/root/redundant_router/backup.sh b/patches/systemvm/debian/config/root/redundant_router/backup.sh index 989c06907a5..78875e08a8b 100644 --- a/patches/systemvm/debian/config/root/redundant_router/backup.sh +++ b/patches/systemvm/debian/config/root/redundant_router/backup.sh @@ -23,9 +23,9 @@ then fi echo To backup called >> /root/keepalived.log -/root/redundant_router/disable_pubip.sh 2>1&>> /root/keepalived.log +/root/redundant_router/disable_pubip.sh >> /root/keepalived.log 2>&1 echo Disable public ip $? >> /root/keepalived.log -/root/redundant_router/primary-backup.sh backup 2>1&>> /root/keepalived.log +/root/redundant_router/primary-backup.sh backup >> /root/keepalived.log 2>&1 echo Switch conntrackd mode backup $? >> /root/keepalived.log echo Status: BACKUP >> /root/keepalived.log diff --git a/patches/systemvm/debian/config/root/redundant_router/disable_pubip.sh b/patches/systemvm/debian/config/root/redundant_router/disable_pubip.sh index 6f77902de4a..9a9a2c6f72f 100644 --- a/patches/systemvm/debian/config/root/redundant_router/disable_pubip.sh +++ b/patches/systemvm/debian/config/root/redundant_router/disable_pubip.sh @@ -1,3 +1,4 @@ #!/bin/bash ifconfig eth2 down +service dnsmasq stop diff --git a/patches/systemvm/debian/config/root/redundant_router/fault.sh b/patches/systemvm/debian/config/root/redundant_router/fault.sh index 3c4dccc01a8..7e09fd58543 100644 --- a/patches/systemvm/debian/config/root/redundant_router/fault.sh +++ b/patches/systemvm/debian/config/root/redundant_router/fault.sh @@ -1,6 +1,6 @@ #!/bin/bash echo To fault called >> /root/keepalived.log -/root/redundant_router/disable_pubip.sh 2>1&>> /root/keepalived.log && \ -/root/redundant_router/primary-backup.sh fault 2>1&>> /root/keepalived.log +/root/redundant_router/disable_pubip.sh >> /root/keepalived.log 2>&1 +/root/redundant_router/primary-backup.sh fault >> /root/keepalived.log 2>&1 echo Status: FAULT >> /root/keepalived.log diff --git a/patches/systemvm/debian/config/root/redundant_router/master.sh b/patches/systemvm/debian/config/root/redundant_router/master.sh index c4ab5b80b0a..d17abfa9199 100644 --- a/patches/systemvm/debian/config/root/redundant_router/master.sh +++ b/patches/systemvm/debian/config/root/redundant_router/master.sh @@ -23,9 +23,9 @@ then fi echo To master called >> /root/keepalived.log -/root/redundant_router/enable_pubip.sh 2>1&>> /root/keepalived.log +/root/redundant_router/enable_pubip.sh >> /root/keepalived.log 2>&1 echo Enable public ip $? >> /root/keepalived.log -/root/redundant_router/primary-backup.sh primary 2>1&>> /root/keepalived.log +/root/redundant_router/primary-backup.sh primary >> /root/keepalived.log 2>&1 echo Switch conntrackd mode primary $? >> /root/keepalived.log echo Status: MASTER >> /root/keepalived.log