d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Start ppp before natd, not afterwards.

Browse Source 
Submitted by: Josef L. Karthauser <joe@uk.FreeBSD.org>
This commit is contained in:
Brian Somers 1999-07-26 15:17:23 +00:00
parent d13d34c3c5
commit 73fac075b2
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=49122
7 changed files with 126 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
etc/network.subr
View File

@ -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

36
etc/rc.d/netoptions
View File

@ -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

36
etc/rc.d/network1
View File

@ -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

36
etc/rc.d/network2
View File

@ -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

36
etc/rc.d/network3
View File

@ -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

36
etc/rc.d/routing
View File

@ -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

36
etc/rc.network
View File

@ -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