From 3aae9799672a26dacc068fa6332689310148fd43 Mon Sep 17 00:00:00 2001
From: anthony <anthony@cloud.com>
Date: Mon, 30 Jul 2012 12:06:19 -0700
Subject: [PATCH] CS-15708 : fix network cleanup

---
 patches/systemvm/debian/config/opt/cloud/bin/vpc_guestnw.sh | 2 +-
 patches/systemvm/debian/config/opt/cloud/bin/vpc_snat.sh    | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/patches/systemvm/debian/config/opt/cloud/bin/vpc_guestnw.sh b/patches/systemvm/debian/config/opt/cloud/bin/vpc_guestnw.sh
index 35394646854..c624c41e9f3 100755
--- a/patches/systemvm/debian/config/opt/cloud/bin/vpc_guestnw.sh
+++ b/patches/systemvm/debian/config/opt/cloud/bin/vpc_guestnw.sh
@@ -143,7 +143,7 @@ destroy_guest_network() {
   sudo iptables -D INPUT -i $dev -p udp -m udp --dport 53 -j ACCEPT
   sudo iptables -t mangle -D PREROUTING -i $dev -m state --state ESTABLISHED,RELATED -j CONNMARK --restore-mark
   sudo iptables -t nat -A POSTROUTING -s $subnet/$mask -o $dev -j SNAT --to-source $ip
-  destroy_acl_outbound_chain
+  destroy_acl_chain
   desetup_usage
   desetup_dnsmasq
   desetup_apache2
diff --git a/patches/systemvm/debian/config/opt/cloud/bin/vpc_snat.sh b/patches/systemvm/debian/config/opt/cloud/bin/vpc_snat.sh
index ff88354dc49..3db9a2d1713 100755
--- a/patches/systemvm/debian/config/opt/cloud/bin/vpc_snat.sh
+++ b/patches/systemvm/debian/config/opt/cloud/bin/vpc_snat.sh
@@ -33,8 +33,6 @@ usage() {
 add_snat() {
   logger -t cloud "$(basename $0):Added SourceNAT $pubIp on interface $ethDev"
   vpccidr=$(getVPCcidr)
-  sudo iptables -D FORWARD -s $vpccidr ! -d $vpccidr -j ACCEPT
-  sudo iptables -A FORWARD -s $vpccidr ! -d $vpccidr -j ACCEPT
   sudo iptables -t nat -D POSTROUTING   -j SNAT -o $ethDev --to-source $pubIp
   sudo iptables -t nat -A POSTROUTING   -j SNAT -o $ethDev --to-source $pubIp
   return $?