diff --git a/Shorewall-lite/changelog.txt b/Shorewall-lite/changelog.txt index d8e2c8e3e..4d46d262c 100644 --- a/Shorewall-lite/changelog.txt +++ b/Shorewall-lite/changelog.txt @@ -6,6 +6,8 @@ Changes in 3.2.0 RC 2 3) Change 'shorewall version' to include 'Lite' +4) Allow Shorewall/Shorewall-lite coexistence + Changes in 3.2.0 RC 1 1) First Release. diff --git a/Shorewall-lite/releasenotes.txt b/Shorewall-lite/releasenotes.txt index 9e2dad827..ae3a8ddf1 100644 --- a/Shorewall-lite/releasenotes.txt +++ b/Shorewall-lite/releasenotes.txt @@ -30,6 +30,33 @@ Other changes in 3.2.0 RC 2 3.2.0-RC1 Lite wireless:~ # +3) It is now possible to have both shorewall and Shorewall Lite + installed on the same system if you use RPM. Regardless of whether + you use RPM or the installer, Shorewall Lite directory names have + been change from 'shorewall' to 'shorewall-lite': + + /etc/shorewall -> /etc/shorewall-lite + /usr/share/shorewall -> /usr/share/shorewall-lite + /var/lib/shorewall -> /var/lib/shorewall-lite + + If you use the RPMs, whichever package is installed first will + determine which package /sbin/shorewall invokes. /sbin/shorewall is + now a symbolic link created by 'rpm': + + Shorewall: /sbin/shorewall points to /usr/share/shorewall/shorewall + Shorewall Lite: + /sbin/shorewall points to /usr/share/shorewall/shorewall-lite + + You may use the 'ln -sf' command to change from one to the other: + + To use 'Shorewall' rather than 'Shorewall Lite' + + ln -sf /usr/share/shorewall/shorewall /sbin/shorewall + + To use 'Shorewall Lite' rather than 'Shorewall' + + ln -sf /usr/share/shorewall-lite/shorewall /sbin/shorewall + New Features: Shorewall Lite is a companion product to Shorewall and is designed to diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt index 02dedc189..cac5b1c05 100644 --- a/Shorewall/changelog.txt +++ b/Shorewall/changelog.txt @@ -4,6 +4,8 @@ Changes in 3.2.0 RC 2 2) Rationalize the use of IPTABLES and LOGFORMAT. +3) Allow Shorewall/Shorewall-lite coexistance under RPM + ------------------------------------------------------------------------------- Changes in 3.2.0 RC 1 diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt index 0e97181d7..8e484b6d7 100644 --- a/Shorewall/releasenotes.txt +++ b/Shorewall/releasenotes.txt @@ -51,6 +51,33 @@ Other changes in 3.2.0 RC 2 1) The sample configurations have been updated for version 3.2. +2) It is now possible to have both shorewall and Shorewall Lite + installed on the same system if you use RPM. Regardless of whether + you use RPM or the installer, Shorewall Lite directory names have + been change from 'shorewall' to 'shorewall-lite': + + /etc/shorewall -> /etc/shorewall-lite + /usr/share/shorewall -> /usr/share/shorewall-lite + /var/lib/shorewall -> /var/lib/shorewall-lite + + If you use the RPMs, whichever package is installed first will + determine which package /sbin/shorewall invokes. /sbin/shorewall is + now a symbolic link created by 'rpm': + + Shorewall: /sbin/shorewall points to /usr/share/shorewall/shorewall + Shorewall Lite: + /sbin/shorewall points to /usr/share/shorewall/shorewall-lite + + You may use the 'ln -sf' command to change from one to the other: + + To use 'Shorewall' rather than 'Shorewall Lite' + + ln -sf /usr/share/shorewall/shorewall /sbin/shorewall + + To use 'Shorewall Lite' rather than 'Shorewall' + + ln -sf /usr/share/shorewall-lite/shorewall /sbin/shorewall + Migration Considerations: 1) If you are upgrading from Shorewall 2.x, it is essential that you read