diff options
| author | brian <brian@FreeBSD.org> | 1999-07-26 15:17:23 +0000 |
|---|---|---|
| committer | brian <brian@FreeBSD.org> | 1999-07-26 15:17:23 +0000 |
| commit | 6eff605357b85284d28c7d3510e9d7370e3196a8 (patch) | |
| tree | 9b6d7c2444ab909e4e9fa1f0aaf4ac2e44536f28 /etc/network.subr | |
| parent | c4e04ec167150dc46628ff6362a5f3c0cbee4daa (diff) | |
| download | FreeBSD-src-6eff605357b85284d28c7d3510e9d7370e3196a8.zip FreeBSD-src-6eff605357b85284d28c7d3510e9d7370e3196a8.tar.gz | |
Start ppp before natd, not afterwards.
Submitted by: Josef L. Karthauser <joe@uk.FreeBSD.org>
Diffstat (limited to 'etc/network.subr')
| -rw-r--r-- | etc/network.subr | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/etc/network.subr b/etc/network.subr index 007d0f9..946e66c 100644 --- a/etc/network.subr +++ b/etc/network.subr @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.network,v 1.50 1999/07/16 09:26:52 jkh Exp $ +# $Id: rc.network,v 1.51 1999/07/26 10:49:31 brian Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # Note that almost all the user-configurable behavior is no longer in @@ -96,6 +96,23 @@ network_pass1() { fi done + # Warm up user ppp if required, must happen before natd. + if [ "X$ppp_enable" = X"YES" ]; then + # Establish ppp mode. + if [ "X$ppp_mode" != X"ddial" -a "X$ppp_mode" != X"direct" \ + -a "X$ppp_mode" != X"dedicated" ]; then \ + ppp_mode="auto"; + fi + ppp_command="-${ppp_mode} "; + + # Switch on alias mode? + if [ "X$ppp_alias" = X"YES" ]; then + ppp_command="${ppp_command} -alias"; + fi + + echo -n 'Starting ppp: '; ppp ${ppp_command} ${ppp_profile} + fi + # Initialize IP filtering using ipfw echo "" /sbin/ipfw -q flush > /dev/null 2>&1 @@ -144,23 +161,6 @@ network_pass1() { fi fi - # Warm up user ppp if required. - if [ "X$ppp_enable" = X"YES" ]; then - # Establish ppp mode. - if [ "X$ppp_mode" != X"ddial" -a "X$ppp_mode" != X"direct" \ - -a "X$ppp_mode" != X"dedicated" ]; then \ - ppp_mode="auto"; - fi - ppp_command="-${ppp_mode} "; - - # Switch on alias mode? - if [ "X$ppp_alias" = X"YES" ]; then - ppp_command="${ppp_command} -alias"; - fi - - echo -n 'Starting ppp: '; ppp ${ppp_command} ${ppp_profile} - fi - # Additional ATM interface configuration if [ -n "${atm_pass1_done}" ]; then atm_pass2 |
