diff --git a/Shorewall2/changelog.txt b/Shorewall2/changelog.txt index 0071d0f1a..165ab7bf2 100644 --- a/Shorewall2/changelog.txt +++ b/Shorewall2/changelog.txt @@ -17,3 +17,5 @@ Changes since 2.0.2 7) Correct reporting of installation directory in install.sh. 8) Added the 'rejectNonSyn' standard built-in action. + +9) Merged Tuomo Soini's patch to the install script. diff --git a/Shorewall2/install.sh b/Shorewall2/install.sh index 6e882dbeb..26202e4d0 100755 --- a/Shorewall2/install.sh +++ b/Shorewall2/install.sh @@ -87,11 +87,20 @@ install_file_with_backup() # $1 = source $2 = target $3 = mode # RUNLEVELS is the chkconfig parmeters for firewall # ARGS is "yes" if we've already parsed an argument # -DEST="/etc/init.d" -INIT="shorewall" -RUNLEVELS="" ARGS="" +if [ -z "$DEST" ] ; then + DEST="/etc/init.d" +fi + +if [ -z "$INIT" ] ; then + INIT="shorewall" +fi + +if [ -z "$RUNLEVELS" ] ; then + RUNLEVELS="" +fi + if [ -z "$OWNER" ] ; then OWNER=root fi diff --git a/Shorewall2/releasenotes.txt b/Shorewall2/releasenotes.txt index d57422947..8cb1f6be4 100755 --- a/Shorewall2/releasenotes.txt +++ b/Shorewall2/releasenotes.txt @@ -84,3 +84,12 @@ New Features: dropNotSyn net all tcp +4) Slackware users no longer have to modify the install.sh script + before installation. Tuomo Soini has provided a change that allows + the INIT and FIREWALL variables to be specified outside the script + as in: + + DEST=/etc/rc.d INIT=rc.firewall ./install.sh + + +