diff --git a/Shorewall/manpages/shorewall.conf.xml b/Shorewall/manpages/shorewall.conf.xml index 992ecd1db..4c73b4846 100644 --- a/Shorewall/manpages/shorewall.conf.xml +++ b/Shorewall/manpages/shorewall.conf.xml @@ -1146,25 +1146,6 @@ net all DROP infothen the chain name is 'net-all' - - LEGACY_RESTART={Yes|No} - - - Added in Shorewall 5.0.0. In that release, the reload command was redefined to do what - restart had done in earlier - releases and restart became a true - restart (equivalent to stop - followed by start). When - LEGACY_FASTSTART=Yes, the restart - command performs the same operation as the reload command making it compatible with - earlier releases. If not specified, LAGACY_RESTART=No is - assumed. - - - LOAD_HELPERS_ONLY={Yes|No} @@ -2169,6 +2150,27 @@ INLINE - - - ; -j REJECT + + RESTART=[restart|reload] + + + Added in Shorewall 5.0.1 to replace LEGACY_RESTART which was + added in Shorewall 5.0.0. In that release, the reload command was redefined to do what + restart had done in earlier + releases and restart became a true + restart (equivalent to stop + followed by start). When + RESTART=reload, the restart command + performs the same operation as the reload command making it compatible with + earlier releases. If not specified, RESTART=reload is + assumed. + + + RESTORE_DEFAULT_ROUTE=[then the chain name is 'net-all' - - LEGACY_RESTART={Yes|No} - - - Added in Shorewall 5.0.0. In that release, the reload command was redefined to do what - restart had done in earlier - releases and restart became a true - restart (equivalent to stop - followed by start). When - LEGACY_FASTSTART=Yes, the restart - command performs the same operation as the reload command making it - compatible with earlier releases. If not specified, - LAGACY_RESTART=No is assumed. - - - LOAD_HELPERS_ONLY={Yes|No} @@ -1924,6 +1906,27 @@ INLINE - - - ; -j REJECT + + RESTART=[restart|reload] + + + Added in Shorewall 5.0.1 to replace LEGACY_RESTART which was + added in Shorewall 5.0.0. In that release, the reload command was redefined to do what + restart had done in earlier + releases and restart became a true + restart (equivalent to stop + followed by start). When + RESTART=reload, the restart command + performs the same operation as the reload command making it compatible with + earlier releases. If not specified, RESTART=reload is + assumed. + + + RESTORE_ROUTEMARKS=[Yes|No] diff --git a/docs/Shorewall-5.xml b/docs/Shorewall-5.xml index 88f9d03a8..2b50eeb3a 100644 --- a/docs/Shorewall-5.xml +++ b/docs/Shorewall-5.xml @@ -338,9 +338,18 @@ For those that can't get used to the idea of using reload in place of restart, a - LEGACY_RESTART option has been added to shorewall[6].conf. The option - defaults to No but if set to Yes, then the restart + RESTART option has been added to shorewall[6].conf. The option defaults + to 'restart' but if set to 'reload', then the restart command does what it did in earlier releases. + + + Beginning with Shorewall 5.0.1 and Shorewall 4.6.13.2, the + update command will set RESTART=reload to maintain compatibility with + earlier releases. Shorewall 5.0.0 created the setting + LEGACY_RESTART=No which was equivalent to RESTART=restart. Under + Shorewall 5.0.1 and later, update will convert LEGACY_RESTART to the + equivalent RESTART setting. +