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

Suport multiple ``ifconfig_*?="DHCP"'' configurations.

Browse Source 
Currently we have a problem in that `dhclient' bails when configuring the
second interface as port 68 is already in use (by the `dhclient' started
for the first interface).

PR:		14810
Submitted by:	n_hibma
This commit is contained in:
David E. O'Brien 1999-12-12 01:58:30 +00:00
parent 378ece9d7b
commit 278bd49cc8
7 changed files with 133 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
etc/network.subr
View File

@ -77,11 +77,11 @@ network_pass1() {
;;
esac
dhcp_interfaces=""
for ifn in ${network_interfaces}; do
showstat=false
if [ -r /etc/start_if.${ifn} ]; then
. /etc/start_if.${ifn}
showstat=true
eval showstat_$ifn=1
fi
# Do the primary ifconfig if specified
@ -92,15 +92,22 @@ network_pass1() {
'')
;;
[Dd][Hh][Cc][Pp])
${dhcp_program:-/sbin/dhclient} ${dhcp_flags} ${ifn}
showstat=true
# DHCP inits are done all in one go below
dhcp_interfaces="$dhcp_interfaces $ifn"
eval showstat_$ifn=1
;;
*)
ifconfig ${ifn} ${ifconfig_args}
showstat=true
eval showstat_$ifn=1
;;
esac
done
if [ ! -z "${dhcp_interfaces}" ]; then
${dhcp_program:-/sbin/dhclient} ${dhcp_flags} ${dhcp_interfaces}
fi
for ifn in ${network_interfaces}; do
# Check to see if aliases need to be added
#
alias=0
@ -108,7 +115,7 @@ network_pass1() {
eval ifconfig_args=\$ifconfig_${ifn}_alias${alias}
if [ -n "${ifconfig_args}" ]; then
ifconfig ${ifn} ${ifconfig_args} alias
showstat=true
eval showstat_$ifn=1
alias=`expr ${alias} + 1`
else
break;
@ -120,14 +127,15 @@ network_pass1() {
eval ifconfig_args=\$ifconfig_${ifn}_ipx
if [ -n "${ifconfig_args}" ]; then
ifconfig ${ifn} ${ifconfig_args}
showstat=true
eval showstat_$ifn=1
fi
done
case ${showstat} in
true)
for ifn in ${network_interfaces}; do
eval showstat=\$showstat_${ifn}
if [ ! -z ${showstat} ]; then
ifconfig ${ifn}
;;
esac
fi
done
# Warm up user ppp if required, must happen before natd.

30
etc/rc.d/netoptions
View File

@ -77,11 +77,11 @@ network_pass1() {
;;
esac
dhcp_interfaces=""
for ifn in ${network_interfaces}; do
showstat=false
if [ -r /etc/start_if.${ifn} ]; then
. /etc/start_if.${ifn}
showstat=true
eval showstat_$ifn=1
fi
# Do the primary ifconfig if specified
@ -92,15 +92,22 @@ network_pass1() {
'')
;;
[Dd][Hh][Cc][Pp])
${dhcp_program:-/sbin/dhclient} ${dhcp_flags} ${ifn}
showstat=true
# DHCP inits are done all in one go below
dhcp_interfaces="$dhcp_interfaces $ifn"
eval showstat_$ifn=1
;;
*)
ifconfig ${ifn} ${ifconfig_args}
showstat=true
eval showstat_$ifn=1
;;
esac
done
if [ ! -z "${dhcp_interfaces}" ]; then
${dhcp_program:-/sbin/dhclient} ${dhcp_flags} ${dhcp_interfaces}
fi
for ifn in ${network_interfaces}; do
# Check to see if aliases need to be added
#
alias=0
@ -108,7 +115,7 @@ network_pass1() {
eval ifconfig_args=\$ifconfig_${ifn}_alias${alias}
if [ -n "${ifconfig_args}" ]; then
ifconfig ${ifn} ${ifconfig_args} alias
showstat=true
eval showstat_$ifn=1
alias=`expr ${alias} + 1`
else
break;
@ -120,14 +127,15 @@ network_pass1() {
eval ifconfig_args=\$ifconfig_${ifn}_ipx
if [ -n "${ifconfig_args}" ]; then
ifconfig ${ifn} ${ifconfig_args}
showstat=true
eval showstat_$ifn=1
fi
done
case ${showstat} in
true)
for ifn in ${network_interfaces}; do
eval showstat=\$showstat_${ifn}
if [ ! -z ${showstat} ]; then
ifconfig ${ifn}
;;
esac
fi
done
# Warm up user ppp if required, must happen before natd.

30
etc/rc.d/network1
View File

@ -77,11 +77,11 @@ network_pass1() {
;;
esac
dhcp_interfaces=""
for ifn in ${network_interfaces}; do
showstat=false
if [ -r /etc/start_if.${ifn} ]; then
. /etc/start_if.${ifn}
showstat=true
eval showstat_$ifn=1
fi
# Do the primary ifconfig if specified
@ -92,15 +92,22 @@ network_pass1() {
'')
;;
[Dd][Hh][Cc][Pp])
${dhcp_program:-/sbin/dhclient} ${dhcp_flags} ${ifn}
showstat=true
# DHCP inits are done all in one go below
dhcp_interfaces="$dhcp_interfaces $ifn"
eval showstat_$ifn=1
;;
*)
ifconfig ${ifn} ${ifconfig_args}
showstat=true
eval showstat_$ifn=1
;;
esac
done
if [ ! -z "${dhcp_interfaces}" ]; then
${dhcp_program:-/sbin/dhclient} ${dhcp_flags} ${dhcp_interfaces}
fi
for ifn in ${network_interfaces}; do
# Check to see if aliases need to be added
#
alias=0
@ -108,7 +115,7 @@ network_pass1() {
eval ifconfig_args=\$ifconfig_${ifn}_alias${alias}
if [ -n "${ifconfig_args}" ]; then
ifconfig ${ifn} ${ifconfig_args} alias
showstat=true
eval showstat_$ifn=1
alias=`expr ${alias} + 1`
else
break;
@ -120,14 +127,15 @@ network_pass1() {
eval ifconfig_args=\$ifconfig_${ifn}_ipx
if [ -n "${ifconfig_args}" ]; then
ifconfig ${ifn} ${ifconfig_args}
showstat=true
eval showstat_$ifn=1
fi
done
case ${showstat} in
true)
for ifn in ${network_interfaces}; do
eval showstat=\$showstat_${ifn}
if [ ! -z ${showstat} ]; then
ifconfig ${ifn}
;;
esac
fi
done
# Warm up user ppp if required, must happen before natd.

30
etc/rc.d/network2
View File

@ -77,11 +77,11 @@ network_pass1() {
;;
esac
dhcp_interfaces=""
for ifn in ${network_interfaces}; do
showstat=false
if [ -r /etc/start_if.${ifn} ]; then
. /etc/start_if.${ifn}
showstat=true
eval showstat_$ifn=1
fi
# Do the primary ifconfig if specified
@ -92,15 +92,22 @@ network_pass1() {
'')
;;
[Dd][Hh][Cc][Pp])
${dhcp_program:-/sbin/dhclient} ${dhcp_flags} ${ifn}
showstat=true
# DHCP inits are done all in one go below
dhcp_interfaces="$dhcp_interfaces $ifn"
eval showstat_$ifn=1
;;
*)
ifconfig ${ifn} ${ifconfig_args}
showstat=true
eval showstat_$ifn=1
;;
esac
done
if [ ! -z "${dhcp_interfaces}" ]; then
${dhcp_program:-/sbin/dhclient} ${dhcp_flags} ${dhcp_interfaces}
fi
for ifn in ${network_interfaces}; do
# Check to see if aliases need to be added
#
alias=0
@ -108,7 +115,7 @@ network_pass1() {
eval ifconfig_args=\$ifconfig_${ifn}_alias${alias}
if [ -n "${ifconfig_args}" ]; then
ifconfig ${ifn} ${ifconfig_args} alias
showstat=true
eval showstat_$ifn=1
alias=`expr ${alias} + 1`
else
break;
@ -120,14 +127,15 @@ network_pass1() {
eval ifconfig_args=\$ifconfig_${ifn}_ipx
if [ -n "${ifconfig_args}" ]; then
ifconfig ${ifn} ${ifconfig_args}
showstat=true
eval showstat_$ifn=1
fi
done
case ${showstat} in
true)
for ifn in ${network_interfaces}; do
eval showstat=\$showstat_${ifn}
if [ ! -z ${showstat} ]; then
ifconfig ${ifn}
;;
esac
fi
done
# Warm up user ppp if required, must happen before natd.

30
etc/rc.d/network3
View File

@ -77,11 +77,11 @@ network_pass1() {
;;
esac
dhcp_interfaces=""
for ifn in ${network_interfaces}; do
showstat=false
if [ -r /etc/start_if.${ifn} ]; then
. /etc/start_if.${ifn}
showstat=true
eval showstat_$ifn=1
fi
# Do the primary ifconfig if specified
@ -92,15 +92,22 @@ network_pass1() {
'')
;;
[Dd][Hh][Cc][Pp])
${dhcp_program:-/sbin/dhclient} ${dhcp_flags} ${ifn}
showstat=true
# DHCP inits are done all in one go below
dhcp_interfaces="$dhcp_interfaces $ifn"
eval showstat_$ifn=1
;;
*)
ifconfig ${ifn} ${ifconfig_args}
showstat=true
eval showstat_$ifn=1
;;
esac
done
if [ ! -z "${dhcp_interfaces}" ]; then
${dhcp_program:-/sbin/dhclient} ${dhcp_flags} ${dhcp_interfaces}
fi
for ifn in ${network_interfaces}; do
# Check to see if aliases need to be added
#
alias=0
@ -108,7 +115,7 @@ network_pass1() {
eval ifconfig_args=\$ifconfig_${ifn}_alias${alias}
if [ -n "${ifconfig_args}" ]; then
ifconfig ${ifn} ${ifconfig_args} alias
showstat=true
eval showstat_$ifn=1
alias=`expr ${alias} + 1`
else
break;
@ -120,14 +127,15 @@ network_pass1() {
eval ifconfig_args=\$ifconfig_${ifn}_ipx
if [ -n "${ifconfig_args}" ]; then
ifconfig ${ifn} ${ifconfig_args}
showstat=true
eval showstat_$ifn=1
fi
done
case ${showstat} in
true)
for ifn in ${network_interfaces}; do
eval showstat=\$showstat_${ifn}
if [ ! -z ${showstat} ]; then
ifconfig ${ifn}
;;
esac
fi
done
# Warm up user ppp if required, must happen before natd.

30
etc/rc.d/routing
View File

@ -77,11 +77,11 @@ network_pass1() {
;;
esac
dhcp_interfaces=""
for ifn in ${network_interfaces}; do
showstat=false
if [ -r /etc/start_if.${ifn} ]; then
. /etc/start_if.${ifn}
showstat=true
eval showstat_$ifn=1
fi
# Do the primary ifconfig if specified
@ -92,15 +92,22 @@ network_pass1() {
'')
;;
[Dd][Hh][Cc][Pp])
${dhcp_program:-/sbin/dhclient} ${dhcp_flags} ${ifn}
showstat=true
# DHCP inits are done all in one go below
dhcp_interfaces="$dhcp_interfaces $ifn"
eval showstat_$ifn=1
;;
*)
ifconfig ${ifn} ${ifconfig_args}
showstat=true
eval showstat_$ifn=1
;;
esac
done
if [ ! -z "${dhcp_interfaces}" ]; then
${dhcp_program:-/sbin/dhclient} ${dhcp_flags} ${dhcp_interfaces}
fi
for ifn in ${network_interfaces}; do
# Check to see if aliases need to be added
#
alias=0
@ -108,7 +115,7 @@ network_pass1() {
eval ifconfig_args=\$ifconfig_${ifn}_alias${alias}
if [ -n "${ifconfig_args}" ]; then
ifconfig ${ifn} ${ifconfig_args} alias
showstat=true
eval showstat_$ifn=1
alias=`expr ${alias} + 1`
else
break;
@ -120,14 +127,15 @@ network_pass1() {
eval ifconfig_args=\$ifconfig_${ifn}_ipx
if [ -n "${ifconfig_args}" ]; then
ifconfig ${ifn} ${ifconfig_args}
showstat=true
eval showstat_$ifn=1
fi
done
case ${showstat} in
true)
for ifn in ${network_interfaces}; do
eval showstat=\$showstat_${ifn}
if [ ! -z ${showstat} ]; then
ifconfig ${ifn}
;;
esac
fi
done
# Warm up user ppp if required, must happen before natd.

30
etc/rc.network
View File

@ -77,11 +77,11 @@ network_pass1() {
;;
esac
dhcp_interfaces=""
for ifn in ${network_interfaces}; do
showstat=false
if [ -r /etc/start_if.${ifn} ]; then
. /etc/start_if.${ifn}
showstat=true
eval showstat_$ifn=1
fi
# Do the primary ifconfig if specified
@ -92,15 +92,22 @@ network_pass1() {
'')
;;
[Dd][Hh][Cc][Pp])
${dhcp_program:-/sbin/dhclient} ${dhcp_flags} ${ifn}
showstat=true
# DHCP inits are done all in one go below
dhcp_interfaces="$dhcp_interfaces $ifn"
eval showstat_$ifn=1
;;
*)
ifconfig ${ifn} ${ifconfig_args}
showstat=true
eval showstat_$ifn=1
;;
esac
done
if [ ! -z "${dhcp_interfaces}" ]; then
${dhcp_program:-/sbin/dhclient} ${dhcp_flags} ${dhcp_interfaces}
fi
for ifn in ${network_interfaces}; do
# Check to see if aliases need to be added
#
alias=0
@ -108,7 +115,7 @@ network_pass1() {
eval ifconfig_args=\$ifconfig_${ifn}_alias${alias}
if [ -n "${ifconfig_args}" ]; then
ifconfig ${ifn} ${ifconfig_args} alias
showstat=true
eval showstat_$ifn=1
alias=`expr ${alias} + 1`
else
break;
@ -120,14 +127,15 @@ network_pass1() {
eval ifconfig_args=\$ifconfig_${ifn}_ipx
if [ -n "${ifconfig_args}" ]; then
ifconfig ${ifn} ${ifconfig_args}
showstat=true
eval showstat_$ifn=1
fi
done
case ${showstat} in
true)
for ifn in ${network_interfaces}; do
eval showstat=\$showstat_${ifn}
if [ ! -z ${showstat} ]; then
ifconfig ${ifn}
;;
esac
fi
done
# Warm up user ppp if required, must happen before natd.