mirror of
https://gitlab.com/shorewall/code.git
synced 2025-06-18 15:46:55 +02:00
Remove some incompatibilities
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@2822 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
parent
ebd5d3f856
commit
b403a8c200
@ -4132,12 +4132,7 @@ refresh_tc() {
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -n "$TC_ENABLED" ]; then
|
if [ -n "$TC_ENABLED" ]; then
|
||||||
f=$(find_file tcstart)
|
run_user_exit tcstart
|
||||||
|
|
||||||
if [ -x $f ]; then
|
|
||||||
export CONFIG_PATH SHOREWALL_DIR
|
|
||||||
eval $f
|
|
||||||
fi
|
|
||||||
else
|
else
|
||||||
setup_traffic_shaping
|
setup_traffic_shaping
|
||||||
fi
|
fi
|
||||||
|
@ -197,13 +197,7 @@ Migration Considerations:
|
|||||||
ACCEPT them. See http://www.shorewall.net/VPNBasics.html for
|
ACCEPT them. See http://www.shorewall.net/VPNBasics.html for
|
||||||
information on the rules generated by entries in the tunnels file.
|
information on the rules generated by entries in the tunnels file.
|
||||||
|
|
||||||
10) In previous releases, the "refresh" command could source your tcstart
|
10) The NEWNOTSYN and LOGNEWNOTSYN options in shorewall.conf have been
|
||||||
script. Beginning with this release, "refresh" will run that script
|
|
||||||
if it is executable but will not source it. Users of third-party TC
|
|
||||||
scripts like WonderShaper should see no change provided that
|
|
||||||
execute permission is placed on /etc/shorewall/tcstart.
|
|
||||||
|
|
||||||
11) The NEWNOTSYN and LOGNEWNOTSYN options in shorewall.conf have been
|
|
||||||
removed as have the 'newnotsyn' options in /etc/shorewall/interfaces
|
removed as have the 'newnotsyn' options in /etc/shorewall/interfaces
|
||||||
and /etc/shorewall/hosts.
|
and /etc/shorewall/hosts.
|
||||||
|
|
||||||
@ -220,13 +214,10 @@ Migration Considerations:
|
|||||||
Note that the rule is added at the front of the NEW section of the
|
Note that the rule is added at the front of the NEW section of the
|
||||||
rules file.
|
rules file.
|
||||||
|
|
||||||
12) Beginning with this release, if you have entries in the
|
11) The meaning of TC_ENABLED has been changed to coincide with the
|
||||||
/etc/shorewall/providers then you must set MARK_IN_FORWARD_CHAIN=Yes in
|
|
||||||
shorewall.conf.
|
|
||||||
|
|
||||||
13) The meaning of TC_ENABLED has been changed to coincide with the
|
|
||||||
integration of tc4shorewall. Beginning with this release,
|
integration of tc4shorewall. Beginning with this release,
|
||||||
the /etc/shorewall/tcrules file will be processed unconditionally.
|
the /etc/shorewall/tcrules file will be processed unconditionally
|
||||||
|
(assuming that your kernel and iptables have Packet Mangling support).
|
||||||
TC_ENABLED=Yes will cause Shorewall to look for an external tcstart
|
TC_ENABLED=Yes will cause Shorewall to look for an external tcstart
|
||||||
script as it does today. TC_ENABLED=No will cause Shorewall to use
|
script as it does today. TC_ENABLED=No will cause Shorewall to use
|
||||||
its internal traffic shaper (tc4shorewall).
|
its internal traffic shaper (tc4shorewall).
|
||||||
|
Loading…
x
Reference in New Issue
Block a user