From owner-cvs-all Tue Sep 4 22:11: 4 2001 Delivered-To: cvs-all@freebsd.org Received: from mao.stokely.org (mao.stokely.org [65.84.64.228]) by hub.freebsd.org (Postfix) with ESMTP id 531EA37B406; Tue, 4 Sep 2001 22:10:59 -0700 (PDT) Received: by mao.stokely.org (Postfix, from userid 2074) id 6EFF64B65E; Tue, 4 Sep 2001 22:16:35 -0700 (PDT) Date: Tue, 4 Sep 2001 22:16:35 -0700 From: Murray Stokely To: Robert Watson Cc: Murray Stokely , cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/usr.sbin/sysinstall install.c Message-ID: <20010904221635.D8581@windriver.com> References: <200109042356.f84NuUk82830@freefall.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: ; from rwatson@FreeBSD.org on Tue, Sep 04, 2001 at 11:21:54PM -0400 X-GPG-Key-ID: 1024D/0E451F7D X-GPG-Key-Fingerprint: E2CA 411D DD44 53FD BB4B 3CB5 B4D7 10A2 0E45 1F7D Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Tue, Sep 04, 2001 at 11:21:54PM -0400, Robert Watson wrote: > Hmm. I think I just ran into that this morning -- installed a 5.0-CURRENT > snapshot on a machine at work, and it never prompted me to use DHCP. > However, I'm sure I've successfully installed that way since 1999, so > maybe there's something else going on here? The logic was reversed in tcpip.c until 2 days ago. In this case two bugs canceled each other out. fcvs diff -r 1.116 -r 1.118 tcpip.c /* First try a DHCP scan if such behavior is desired */ if (!variable_cmp(VAR_TRY_DHCP, "YES") || - ((!variable_cmp(VAR_TRY_DHCP, "NO")) && (!msgNoYes("Do you want to try DHCP configuration of the interface?")))) { + ((variable_cmp(VAR_TRY_DHCP, "NO")) && (!msgNoYes("Do you want to try DHCP configuration of the interface?")))) { --- Old behavior : If VAR_TRY_DHCP == "YES", then try DHCP unconditionally. If VAR_TRY_DHCP == "NO", then ask the user if they want DHCP. VAR_TRY_DHCP was set to "NO" explicitly in install.c Behavior as of yesterday : If VAR_TRY_DHCP == "YES", then try DHCP unconditionally. If VAR_TRY_DHCP == "NO", then don't ask user if they want DHCP, just go straight to complete TCP/IP setup screen. VAR_TRY_DHCP still set to "NO" explicitly in install.c (This change was based on PRs, since people wanted the ability to explicitly tell sysinstall not to use DHCP in scripts. If you just look at tcpip.c then this makes perfect sense) Behavior as of today : Same as above except VAR_TRY_DHCP now undefined initially, so users get the old behavior (prompt user if they would like to use DHCP or not, with the "YES" box pre-selected), and the new functionality (users doing un-attended installs can script this correctly). - Murray To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message