From 20fbb4b12ae7d2285382cec2741cdd642a2d0180 Mon Sep 17 00:00:00 2001 From: teastep Date: Fri, 26 Mar 2004 21:05:42 +0000 Subject: [PATCH] Make start with with 'ash' again git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@1232 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb --- Shorewall2/changelog.txt | 2 ++ Shorewall2/functions | 4 ++-- Shorewall2/releasenotes.txt | 8 +++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Shorewall2/changelog.txt b/Shorewall2/changelog.txt index bac12070d..4abf1bfbe 100644 --- a/Shorewall2/changelog.txt +++ b/Shorewall2/changelog.txt @@ -23,3 +23,5 @@ Changes since 2.0.0 11) Replace 'subnet' with 'network' in the code 12) Fix item 10 above :-( + +13) Replace good code with crap to satisfy 'ash'. diff --git a/Shorewall2/functions b/Shorewall2/functions index bb41d01e2..b8c6a3af4 100755 --- a/Shorewall2/functions +++ b/Shorewall2/functions @@ -534,8 +534,8 @@ if_match() # $1 = Name in interfaces file - may end in "+" local pattern=${1%+} local interface=${2%+} - test "x${interface:0:${#pattern}}" = "x${pattern}" - +# test "x${interface:0:${#pattern}}" = "x${pattern}" + test "x$(echo ${interface} | cut -b -${#pattern} )" = "x${pattern}" } # diff --git a/Shorewall2/releasenotes.txt b/Shorewall2/releasenotes.txt index d936d9bd5..d428c06d0 100755 --- a/Shorewall2/releasenotes.txt +++ b/Shorewall2/releasenotes.txt @@ -13,12 +13,10 @@ Problems Corrected since 2.0.0 3) Thanks to Sean Mathews, a long-standing problem with Proxy ARP and IPSEC has been corrected. Thanks Sean!!! -Problems Corrected since 2.0.1 RC1 +Problems Corrected since 2.0.1 RC2 -1) Although the release notes listed a set of new options available in - the /etc/shorewall/hosts file, those options were not accepted. - -2) The 'nobogons' interface option didn't work. +1) A problem which caused "shorewall start" to fail when using a + light-weight shell such as 'ash' has been corrected. ----------------------------------------------------------------------- Issues when migrating from Shorewall 2.0.0 to Shorewall 2.0.1: