From 159316ca10eea9080d50c2243652f1d4a8bc8a08 Mon Sep 17 00:00:00 2001 From: teastep Date: Sat, 25 Dec 2004 23:19:43 +0000 Subject: [PATCH] Eliminate shell error during stop/clear git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@1858 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb --- Shorewall2/changelog.txt | 2 ++ Shorewall2/firewall | 2 +- Shorewall2/releasenotes.txt | 9 ++++++++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Shorewall2/changelog.txt b/Shorewall2/changelog.txt index b815d5ab8..23705a01d 100644 --- a/Shorewall2/changelog.txt +++ b/Shorewall2/changelog.txt @@ -190,3 +190,5 @@ Changes since 2.0.3 92) Add OPENVPNPORT option. 93) Remove OPENVPNPORT option and change default port to 1194. + +94) Avoid shell error during "shorewall stop/clear" diff --git a/Shorewall2/firewall b/Shorewall2/firewall index 16c556b4f..caf7bf10a 100755 --- a/Shorewall2/firewall +++ b/Shorewall2/firewall @@ -1364,7 +1364,7 @@ disable_ipv6() { } disable_ipv6_1() { - local foo=$(ip -f inet6 addr ls 2> /dev/null) + local foo="$(ip -f inet6 addr ls 2> /dev/null)" if [ -n "$foo" ]; then if qt which ip6tables; then diff --git a/Shorewall2/releasenotes.txt b/Shorewall2/releasenotes.txt index cdbfb1769..bc641c15e 100755 --- a/Shorewall2/releasenotes.txt +++ b/Shorewall2/releasenotes.txt @@ -1,4 +1,4 @@ -Shorewall 2.2.0-RC2 +Shorewall 2.2.0-RC3 ---------------------------------------------------------------------- Problems Corrected since 2.0.3 @@ -192,6 +192,13 @@ Problems corrected since 2.2.0 Beta 8: 1) The syntax of the add and delete command has been clarified in the help summary produced by /sbin/shorewall. +Problems corrected since 2.2.0 RC2 + +1) The following error message could appear during "shorewall stop" or + "shorewall clear": + + local: lo:: bad variable name + ----------------------------------------------------------------------- Issues when migrating from Shorewall 2.0 to Shorewall 2.2: