From 6bb8dab1d84aed308177bfc4ddc490d2e244be67 Mon Sep 17 00:00:00 2001 From: teastep Date: Tue, 4 May 2004 18:39:21 +0000 Subject: [PATCH] Apply Alex Wilms's patch for install.sh git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@1307 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb --- Shorewall2/changelog.txt | 3 +++ Shorewall2/install.sh | 2 +- Shorewall2/releasenotes.txt | 12 ++++++++---- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/Shorewall2/changelog.txt b/Shorewall2/changelog.txt index 3ea5ea687..8e88110b0 100644 --- a/Shorewall2/changelog.txt +++ b/Shorewall2/changelog.txt @@ -45,3 +45,6 @@ Changes since 2.0.1 21) Fix ALL INTERFACES column parsing. 22) Correct "shorewall delete" processing. + +23) Apply Alex Wilms's patch for install.sh + diff --git a/Shorewall2/install.sh b/Shorewall2/install.sh index 963d884f7..42ab2ed39 100755 --- a/Shorewall2/install.sh +++ b/Shorewall2/install.sh @@ -531,7 +531,7 @@ if [ -z "$PREFIX" -a -n "$first_install" ]; then echo "Set startup=1 in /etc/default/shorewall to enable" else if [ -x /sbin/insserv -o -x /usr/sbin/insserv ]; then - if insserv /etc/init.d/shorewalls ; then + if insserv /etc/init.d/shorewall ; then echo echo "shorewall will start automatically at boot" echo "Remove /etc/shorewall/startup_disabled in /etc/default/shorewall to enable" diff --git a/Shorewall2/releasenotes.txt b/Shorewall2/releasenotes.txt index bc541510c..cea4190bb 100755 --- a/Shorewall2/releasenotes.txt +++ b/Shorewall2/releasenotes.txt @@ -13,7 +13,11 @@ Problems Corrected since 2.0.1 has been eliminated. 3) The "shorewall delete" command now correctly removes all dynamic - rules pertaining to the host(s) being deleted. + rules pertaining to the host(s) being deleted. Thanks to Stefan + Engel for this correction. + +4) The install.sh script now works correctly on SuSE. Thanks to Alex + Wilms for this correction. Problems Corrected since 2.0.2 Beta 1 @@ -40,9 +44,9 @@ Issues when migrating from Shorewall 2.0.0 to Shorewall 2.0.1: Example: - save_command echo Operation Complete + save_command echo Operation Complete - That command would simple write "echo Operation Complete" to the + That command would simply write "echo Operation Complete" to the restore file. B. run_and_save_command() -- saves the passed command to the restore @@ -51,7 +55,7 @@ Issues when migrating from Shorewall 2.0.0 to Shorewall 2.0.1: Example: - run_and_save "echo 1 > /proc/sys/net/ipv4/icmp_echo_ignore_all" + run_and_save_command "echo 1 > /proc/sys/net/ipv4/icmp_echo_ignore_all" Note that as in this example, when the command involves file redirection then the entire command must be enclosed in quotes. This