From 1559d927a484d54e21f629b2db9ca4c5ae9e6132 Mon Sep 17 00:00:00 2001
From: Wenkai Yin <yinw@vmware.com>
Date: Fri, 25 Nov 2016 13:59:22 +0800
Subject: [PATCH] fix iptable modification conflict

---
 tools/ova/script/common.sh         | 2 +-
 tools/ova/script/firstboot.sh      | 2 +-
 tools/ova/script/subsequentboot.sh | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/ova/script/common.sh b/tools/ova/script/common.sh
index db57ce047..bf8fdf933 100755
--- a/tools/ova/script/common.sh
+++ b/tools/ova/script/common.sh
@@ -36,7 +36,7 @@ function gc {
 
 #Add rules to iptables
 function addIptableRules {
-	iptables -A INPUT -p tcp --dport 5480 -j ACCEPT
+	iptables -A INPUT -p tcp --dport 5480 -j ACCEPT -w || true
 	#iptables -A INPUT -p tcp --dport 5488 -j ACCEPT
 	#iptables -A INPUT -p tcp --dport 5489 -j ACCEPT
 }
diff --git a/tools/ova/script/firstboot.sh b/tools/ova/script/firstboot.sh
index be06563b6..b71eaa7fa 100755
--- a/tools/ova/script/firstboot.sh
+++ b/tools/ova/script/firstboot.sh
@@ -19,7 +19,7 @@ fi
 #configure SSH
 configSSH
 
-#echo "Adding rules to iptables..."
+echo "Adding rules to iptables..."
 addIptableRules
 
 echo "Installing docker compose..."
diff --git a/tools/ova/script/subsequentboot.sh b/tools/ova/script/subsequentboot.sh
index 25fd2b116..b6b1c356b 100755
--- a/tools/ova/script/subsequentboot.sh
+++ b/tools/ova/script/subsequentboot.sh
@@ -10,7 +10,7 @@ source $base_dir/common.sh
 #configure SSH
 configSSH
 
-#echo "Adding rules to iptables..."
+echo "Adding rules to iptables..."
 addIptableRules
 
 #Stop Harbor