make both check lines consistent No need to make a variable, use it on one place and hardcode it on another.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8fb67702 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8fb67702 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8fb67702 Branch: refs/heads/master Commit: 8fb677027dc48d034fa9440b125c6bae084266d4 Parents: 525949e Author: Remi Bergsma <[email protected]> Authored: Wed Dec 16 14:45:57 2015 +0100 Committer: Remi Bergsma <[email protected]> Committed: Mon Dec 28 17:06:58 2015 +0100 ---------------------------------------------------------------------- systemvm/patches/debian/config/opt/cloud/bin/checkrouter.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8fb67702/systemvm/patches/debian/config/opt/cloud/bin/checkrouter.sh ---------------------------------------------------------------------- diff --git a/systemvm/patches/debian/config/opt/cloud/bin/checkrouter.sh b/systemvm/patches/debian/config/opt/cloud/bin/checkrouter.sh index f867a48..0a9041b 100755 --- a/systemvm/patches/debian/config/opt/cloud/bin/checkrouter.sh +++ b/systemvm/patches/debian/config/opt/cloud/bin/checkrouter.sh @@ -17,14 +17,13 @@ # under the License. STATUS=UNKNOWN -INTERFACE=eth1 ROUTER_TYPE=$(cat /etc/cloudstack/cmdline.json | grep type | awk '{print $2;}' | sed -e 's/[,\"]//g') if [ "$ROUTER_TYPE" = "router" ] then ROUTER_STATE=$(ip addr | grep eth0 | grep inet | wc -l | xargs bash -c 'if [ $0 == 2 ]; then echo "MASTER"; else echo "BACKUP"; fi') STATUS=$ROUTER_STATE else - ROUTER_STATE=$(ip addr | grep $INTERFACE | grep state | awk '{print $9;}') + ROUTER_STATE=$(ip addr | grep eth1 | grep state | awk '{print $9;}') if [ "$ROUTER_STATE" = "UP" ] then STATUS=MASTER
