Remove confusing default option.

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@7494 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
el_cubano 2007-10-21 20:50:28 +00:00
parent f2f0cab99b
commit 4fcfa80018
3 changed files with 13 additions and 15 deletions

View File

@ -16,11 +16,9 @@ startup=0
# wait_interface= # wait_interface=
# #
# Startup options -- if you specify '-f' then Shorewall will use the last saved # Startup options
# configuration if any; this is much faster than parsing the
# configuration files.
# #
OPTIONS="-f" OPTIONS=""
# EOF # EOF

View File

@ -14,11 +14,9 @@ startup=0
# wait_interface="ppp0 ppp1" # wait_interface="ppp0 ppp1"
# #
# Startup options -- if you specify '-f' then Shorewall will use the last saved # Startup options
# configuration if any; this is much faster than parsing the
# configuration files.
# #
OPTIONS="-f" OPTIONS=""
# EOF # EOF

View File

@ -17,9 +17,9 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License along
# along with this program; if not, write to the Free Software # with this program; if not, write to the Free Software Foundation, Inc.,
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# #
# If an error occurs while starting or restarting the firewall, the # If an error occurs while starting or restarting the firewall, the
# firewall is automatically stopped. # firewall is automatically stopped.
@ -53,9 +53,10 @@ fatal_error() # $* = Error Message
} }
# #
# We include this for compatibility with the 'firewall' script. That script distinguishes between # We include this for compatibility with the 'firewall' script. That script
# Fatal Errors (stop or restore required) and Startup Errors (errors detected before the firewall # distinguishes between Fatal Errors (stop or restore required) and Startup
# state has been changed. This allows us to use common parsing routines in both programs. # Errors (errors detected before the firewall state has been changed. This
# allows us to use common parsing routines in both programs.
# #
startup_error() startup_error()
{ {
@ -112,7 +113,8 @@ indent() {
} }
# #
# Echo the contents of the passed file indented by $INDENT while handling line continuation # Echo the contents of the passed file indented by $INDENT while handling line
# continuation
# #
indent1() { indent1() {
if [ -n "$INDENT" ]; then if [ -n "$INDENT" ]; then