diff options
| author | mtm <mtm@FreeBSD.org> | 2009-02-17 11:55:50 +0000 |
|---|---|---|
| committer | mtm <mtm@FreeBSD.org> | 2009-02-17 11:55:50 +0000 |
| commit | 11a3f6d70678aa71a8de150e7782914dbc0fe6ce (patch) | |
| tree | f28241a7ad2612000934fe88403932fc53e59348 /etc | |
| parent | 68cf7202850943043001446b3f26039ba3325a3d (diff) | |
| download | FreeBSD-src-11a3f6d70678aa71a8de150e7782914dbc0fe6ce.zip FreeBSD-src-11a3f6d70678aa71a8de150e7782914dbc0fe6ce.tar.gz | |
Rename the rc.conf(5) knob if_up_delay to defaultroute_delay to better
reflect its purpose.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/defaults/rc.conf | 2 | ||||
| -rwxr-xr-x | etc/rc.d/defaultroute | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf index 47f1f52..17c9f37 100644 --- a/etc/defaults/rc.conf +++ b/etc/defaults/rc.conf @@ -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. diff --git a/etc/rc.d/defaultroute b/etc/rc.d/defaultroute index 3481fa9..35b1c88 100755 --- a/etc/rc.d/defaultroute +++ b/etc/rc.d/defaultroute @@ -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 . |
