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

Rename the rc.conf(5) knob if_up_delay to defaultroute_delay to better

Browse Source 
reflect its purpose.
This commit is contained in:
Mike Makonnen 2009-02-17 11:55:50 +00:00
parent 199cc11263
commit 553bf6a453
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=188710
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
UPDATING
View File

@ -22,6 +22,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8.x IS SLOW:
to maximize performance. (To disable malloc debugging, run
ln -s aj /etc/malloc.conf.)
20090217:
The rc.conf(5) option if_up_delay has been renamed to
defaultroute_delay to better reflect its purpose. If you have
customized this setting in /etc/rc.conf you need to update it to
use the new name.
20090216:
xorg 7.4 wants to configure its input devices via hald which does not
yet work with USB2. If the keyboard/mouse does not work in xorg then

2
etc/defaults/rc.conf
View File

@ -105,6 +105,7 @@ background_dhclient="YES" # Start dhcp client in the background.
#background_dhclient_fxp0="YES" # Start dhcp client on fxp0 in the background.
synchronous_dhclient="NO" # Start dhclient directly on configured
# interfaces during startup.
defaultroute_delay="30" # Time to wait for a default route on a DHCP interface.
wpa_supplicant_program="/usr/sbin/wpa_supplicant"
wpa_supplicant_flags="-s" # Extra flags to pass to wpa_supplicant
wpa_supplicant_conf_file="/etc/wpa_supplicant.conf"
@ -189,7 +190,6 @@ tcp_drop_synfin="NO" # Set to YES to drop TCP packets with SYN+FIN
icmp_drop_redirect="NO" # Set to YES to ignore ICMP REDIRECT packets
icmp_log_redirect="NO" # Set to YES to log ICMP REDIRECT packets
network_interfaces="auto" # List of network interfaces (or "auto").
if_up_delay="30" # Time to wait for interfaces to come up.
cloned_interfaces="" # List of cloned network interfaces to create.
#cloned_interfaces="gif0 gif1 gif2 gif3" # Pre-cloning GENERIC config.
ifconfig_lo0="inet 127.0.0.1" # default loopback device configuration.

6
etc/rc.d/defaultroute
View File

@ -35,16 +35,16 @@ defaultroute_start()
fi
# Wait for a default route
delay=${if_up_delay}
delay=${defaultroute_delay}
while [ ${delay} -gt 0 ]; do
defif=`get_default_if -inet`
if [ -n "${defif}" ]; then
if [ ${delay} -ne ${if_up_delay} ]; then
if [ ${delay} -ne ${defaultroute_delay} ]; then
echo -n "($defif)"
fi
break
fi
if [ ${delay} -eq ${if_up_delay} ]; then
if [ ${delay} -eq ${defaultroute_delay} ]; then
echo -n "Waiting ${delay}s for the default route interface: "
else
echo -n .

2
share/man/man5/rc.conf.5
View File

@ -406,7 +406,7 @@ variable with
.Dq Li SYNCDHCP
or
.Dq Li NOSYNCDHCP .
.It Va if_up_delay
.It Va defaultroute_delay
.Pq Vt int
When set to a positive value, wait up to this long after configuring
DHCP interfaces at startup to give the interfaces time to receive a lease.