cosmetic: more consistency - then on same line as if

This commit is contained in:
Matthias Radestock committed 2015-05-27 14:14:51 +01:00
1 parent f281eeb02a
commit 84874b9676
1 file changed
+4 -8
+4 -8
View File
@@ -194,8 +194,7 @@ run_iptables() {
add_iptables_rule() {
IPTABLES_TABLE="$1"
shift 1
if ! run_iptables -t $IPTABLES_TABLE -C "$@" >/dev/null 2>&1
then
if ! run_iptables -t $IPTABLES_TABLE -C "$@" >/dev/null 2>&1 ; then
run_iptables -t $IPTABLES_TABLE -A "$@" >/dev/null
fi
}
@@ -204,8 +203,7 @@ add_iptables_rule() {
delete_iptables_rule() {
IPTABLES_TABLE="$1"
shift 1
if run_iptables -t $IPTABLES_TABLE -C "$@" >/dev/null 2>&1
then
if run_iptables -t $IPTABLES_TABLE -C "$@" >/dev/null 2>&1 ; then
run_iptables -t $IPTABLES_TABLE -D "$@" >/dev/null
fi
}
@@ -1005,8 +1003,7 @@ case "$COMMAND" in
fi
create_bridge --without-ethtool
for CIDR in $CIDR_ARGS ; do
if ! ip addr show dev $BRIDGE | grep -qF $CIDR
then
if ! ip addr show dev $BRIDGE | grep -qF $CIDR ; then
ip addr add dev $BRIDGE $CIDR
arp_update $BRIDGE $CIDR
add_iptables_rule nat WEAVE -d $CIDR ! -s $CIDR -j MASQUERADE
@@ -1023,8 +1020,7 @@ case "$COMMAND" in
get_ipam_cidr $CONTAINER_NAME weave:expose
create_bridge --without-ethtool
for CIDR in $CIDR_ARGS ; do
if ip addr show dev $BRIDGE | grep -qF $CIDR
then
if ip addr show dev $BRIDGE | grep -qF $CIDR ; then
ip addr del dev $BRIDGE $CIDR
delete_iptables_rule nat WEAVE -d $CIDR ! -s $CIDR -j MASQUERADE
delete_iptables_rule nat WEAVE -s $CIDR ! -d $CIDR -j MASQUERADE