diff --git a/ipsec/iptables-setup.sh b/ipsec/iptables-setup.sh index 2b0fc29..0665878 100755 --- a/ipsec/iptables-setup.sh +++ b/ipsec/iptables-setup.sh @@ -74,20 +74,12 @@ iptables -A INPUT -p tcp --dport 1701 -j ACCEPT iptables-save | awk '($0 !~ /^-A/)||!($0 in a) {a[$0];print}' > $IPTABLES -IPTABLESRESTOR=$(which iptables-restore) RESTORPRESENTS=$(grep iptables-restore $RCLOCAL) if [ $? -ne 0 ]; then - if [[ ! -z $IPTABLESRESTOR ]]; then - sed -i -e "/exit 0/d" $RCLOCAL - echo "$IPTABLESRESTOR < $IPTABLES" >> $RCLOCAL - echo "exit 0" >> $RCLOCAL - else - echo "Cannot save iptables-restore from $IPTABLES to $RCLOCAL." - fi + sed -i -e "/exit 0/d" $RCLOCAL + echo "iptables-restore < $IPTABLES" >> $RCLOCAL + echo "exit 0" >> $RCLOCAL fi iptables -F - -if [[ ! -z $IPTABLERESTOR ]]; then - $IPTABLESRESTOR < $IPTABLES -fi +iptables-restore < $IPTABLES diff --git a/pptp/iptables-setup.sh b/pptp/iptables-setup.sh index 083e0b5..063bc06 100755 --- a/pptp/iptables-setup.sh +++ b/pptp/iptables-setup.sh @@ -88,20 +88,12 @@ if [ $? -ne 0 ]; then fi fi -IPTABLESRESTOR=$(which iptables-restore) RESTORPRESENTS=$(grep iptables-restore $RCLOCAL) if [ $? -ne 0 ]; then - if [[ ! -z $IPTABLESRESTOR ]]; then - sed -i -e "/exit 0/d" $RCLOCAL - echo "$IPTABLESRESTOR < $IPTABLES" >> $RCLOCAL - echo "exit 0" >> $RCLOCAL - else - echo "Cannot save iptables-restore from $IPTABLES to $RCLOCAL." - fi + sed -i -e "/exit 0/d" $RCLOCAL + echo "iptables-restore < $IPTABLES" >> $RCLOCAL + echo "exit 0" >> $RCLOCAL fi iptables -F - -if [[ ! -z $IPTABLERESTOR ]]; then - $IPTABLESRESTOR < $IPTABLES -fi +iptables-restore < $IPTABLES