From owner-svn-src-head@FreeBSD.ORG Tue Feb 17 11:55:50 2009 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E7DCC1065672; Tue, 17 Feb 2009 11:55:50 +0000 (UTC) (envelope-from mtm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D570C8FC15; Tue, 17 Feb 2009 11:55:50 +0000 (UTC) (envelope-from mtm@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1HBto7H014269; Tue, 17 Feb 2009 11:55:50 GMT (envelope-from mtm@svn.freebsd.org) Received: (from mtm@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1HBto7E014265; Tue, 17 Feb 2009 11:55:50 GMT (envelope-from mtm@svn.freebsd.org) Message-Id: <200902171155.n1HBto7E014265@svn.freebsd.org> From: Mike Makonnen Date: Tue, 17 Feb 2009 11:55:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r188710 - in head: . etc/defaults etc/rc.d share/man/man5 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Feb 2009 11:55:51 -0000 Author: mtm Date: Tue Feb 17 11:55:50 2009 New Revision: 188710 URL: http://svn.freebsd.org/changeset/base/188710 Log: Rename the rc.conf(5) knob if_up_delay to defaultroute_delay to better reflect its purpose. Modified: head/UPDATING head/etc/defaults/rc.conf head/etc/rc.d/defaultroute head/share/man/man5/rc.conf.5 Modified: head/UPDATING ============================================================================== --- head/UPDATING Tue Feb 17 10:50:18 2009 (r188709) +++ head/UPDATING Tue Feb 17 11:55:50 2009 (r188710) @@ -22,6 +22,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8. 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 Modified: head/etc/defaults/rc.conf ============================================================================== --- head/etc/defaults/rc.conf Tue Feb 17 10:50:18 2009 (r188709) +++ head/etc/defaults/rc.conf Tue Feb 17 11:55:50 2009 (r188710) @@ -105,6 +105,7 @@ background_dhclient="YES" # Start dhcp c #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 dr 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. Modified: head/etc/rc.d/defaultroute ============================================================================== --- head/etc/rc.d/defaultroute Tue Feb 17 10:50:18 2009 (r188709) +++ head/etc/rc.d/defaultroute Tue Feb 17 11:55:50 2009 (r188710) @@ -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 . Modified: head/share/man/man5/rc.conf.5 ============================================================================== --- head/share/man/man5/rc.conf.5 Tue Feb 17 10:50:18 2009 (r188709) +++ head/share/man/man5/rc.conf.5 Tue Feb 17 11:55:50 2009 (r188710) @@ -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.