cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject [4/4] git commit: updated refs/heads/master to 6829399
Date Thu, 23 Apr 2015 12:28:23 GMT
CLOUDSTACK-7493: ignore errors on removal of iptables chains that don't exist

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit f26ae6eb39fbc3d8e86aca492447fac5360ed130)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/68293996
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/68293996
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/68293996

Branch: refs/heads/master
Commit: 6829399647214076060b73d7096bc8ce597d15be
Parents: f55658d
Author: Rohit Yadav <rohit.yadav@shapeblue.com>
Authored: Thu Apr 23 14:00:05 2015 +0200
Committer: Rohit Yadav <rohit.yadav@shapeblue.com>
Committed: Thu Apr 23 14:19:46 2015 +0200

----------------------------------------------------------------------
 .../patches/debian/config/opt/cloud/bin/firewall_egress.sh    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/68293996/systemvm/patches/debian/config/opt/cloud/bin/firewall_egress.sh
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/firewall_egress.sh b/systemvm/patches/debian/config/opt/cloud/bin/firewall_egress.sh
index 767f17e..6eb0531 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/firewall_egress.sh
+++ b/systemvm/patches/debian/config/opt/cloud/bin/firewall_egress.sh
@@ -34,9 +34,10 @@ usage() {
 }
 
 fw_egress_remove_backup() {
-  sudo iptables -D FW_OUTBOUND -j _FW_EGRESS_RULES 
-  sudo iptables -F _FW_EGRESS_RULES 
-  sudo iptables -X _FW_EGRESS_RULES 
+  # remove backup rules, ignore errors as they could not be present
+  sudo iptables -D FW_OUTBOUND -j _FW_EGRESS_RULES >/dev/null 2>&1
+  sudo iptables -F _FW_EGRESS_RULES >/dev/null 2>&1
+  sudo iptables -X _FW_EGRESS_RULES >/dev/null 2>&1
 }
 
 fw_egress_save() {


Mime
View raw message