From nobody Sat Apr 30 15:35:32 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 65544199D94A; Sat, 30 Apr 2022 15:35:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KrD2X25S4z4XCH; Sat, 30 Apr 2022 15:35:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651332932; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2sol9daYhj2o2xCsRtIFfx+bGe7MtOEIIvLMEsunsN8=; b=Te7uRe/isFZtvXVjbl/MUcxvDO2IvKv3ltxvn1VjN0RDu6Q5BVkuGWEgOk9vd1JH+pp5f2 aNQLxds4QZ16y+gM6qw3/iMPoRyYnPbTfbFuipQ+A13IFW+b70hXs+984iNsLB9USTEOHM QZLGBOJEYPTCyGjYmpNm08ftSs2PBywbAGXgZVNSAVDDA6V+j+iBO5l2h1UE4NvYdZ19pp Tlb/t0x+t6atPyv0Av4sEin9N0KeJ15iD/nTZHRtBRtO2X9oHqAN7Rhe+DnVFCPYUkzjRe 5dcMoC/D/R7a4i+aX9aP87nzYvuxaNqZWPyrAnHt49tV4vqMjo0e3Ph1Dqyjuw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 269E323D42; Sat, 30 Apr 2022 15:35:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23UFZWQr066678; Sat, 30 Apr 2022 15:35:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23UFZWI8066677; Sat, 30 Apr 2022 15:35:32 GMT (envelope-from git) Date: Sat, 30 Apr 2022 15:35:32 GMT Message-Id: <202204301535.23UFZWI8066677@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alfonso S. Siciliano" Subject: git: 1ad9134e1112 - main - bsdinstall netconfig_ipv4: Fix resolv.conf rebuild List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asiciliano X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1ad9134e1112cec3bc29c9ae36b5e02526edb388 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651332932; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2sol9daYhj2o2xCsRtIFfx+bGe7MtOEIIvLMEsunsN8=; b=QOCPzcJZLu+hMKD4EvBv7aeI64MhfnIsOwWcK9dn/uPvy2OYtFmjWN9rPVoT0NtYmjWxEZ 7FieXKMXVjlB0RtWl5QVWYxXhb+ixjLrINniGrdZ8KpACqPW4sLmf1wWZqpML9koJ3rrQ7 oP9whT+CpzR/rg+bi7BSjFBkcrnsM3J/HJxhdrpt91XFB/9DOXw/hqjrfIJF1XjhZGA0/M qcTE6xJ53veGGGoZasf1V3Tsm8dbn2cI8MDk2slpRVZl6CC1hy89VjX+hcIT85mT4p0oO9 wWZsMl7icmKdJNVDetbgCr/r1iy61MFEUVXacccnklGn+h7wQzyBKL/KlG+qyQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651332932; a=rsa-sha256; cv=none; b=Kf0+14R63Dg6euuj/iZflqZyduKdGJSkLZN1AOdKhhxG/WaJ4b4OKRho4aa8+pFjWjHm7G Si8tnLh6OQKYF6/tJX5ukqxwj/ikSjl148dlOS0yowy4oUZ8W2Lcpv0Fcv6BRR8Bx01fGH xThZY2nMksHWCV1d5LUA29W9Nzrb/Rjt7NZY1jm52TQFSKJn+MziHUXuFifA/RQtRX20L6 gziHm8gHi4poMwEkivyiMtBjKr9LRYVLhYpoJdTuzZSQbpUgPMBwJ3LiUG2wjHE8iQoxeW YITtKXdsvmQBtx7ehoBtkvy9ZujfGnamIbu7ODMKIY78SHyizCc6B0WYvz7jFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by asiciliano: URL: https://cgit.FreeBSD.org/src/commit/?id=1ad9134e1112cec3bc29c9ae36b5e02526edb388 commit 1ad9134e1112cec3bc29c9ae36b5e02526edb388 Author: Alfonso S. Siciliano AuthorDate: 2022-04-30 15:25:57 +0000 Commit: Alfonso S. Siciliano CommitDate: 2022-04-30 15:34:53 +0000 bsdinstall netconfig_ipv4: Fix resolv.conf rebuild After an installation restart (for error or choice) dhclient does not rebuild resolv.conf so `dialog --mixedform' of "Resolver Configuration" in bsdinstall/scripts/netconfig draws empty forms. It causes a bad UX, to see PR262262. Fixed resetting the interface before to run dhclient. PR: 262262 Reviewed by: bapt Differential Revision: https://reviews.freebsd.org/D35094 --- usr.sbin/bsdinstall/scripts/netconfig_ipv4 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/usr.sbin/bsdinstall/scripts/netconfig_ipv4 b/usr.sbin/bsdinstall/scripts/netconfig_ipv4 index 2acd9029d150..44dc8cf21f1d 100755 --- a/usr.sbin/bsdinstall/scripts/netconfig_ipv4 +++ b/usr.sbin/bsdinstall/scripts/netconfig_ipv4 @@ -49,6 +49,9 @@ esac dialog --backtitle 'FreeBSD Installer' --title 'Network Configuration' --yesno 'Would you like to use DHCP to configure this interface?' 0 0 if [ $? -eq $DIALOG_OK ]; then if [ ! -z $BSDINSTALL_CONFIGCURRENT ]; then + # XXX: get interface down otherwise after installation restart + # dhclient does not build a new resolv.conf (see PR262262). + ifconfig $INTERFACE down ifconfig $INTERFACE up dialog --backtitle 'FreeBSD Installer' --infobox "Acquiring DHCP lease..." 0 0 err=$( pkill -F /var/run/dhclient/dhclient.${INTERFACE}.pid; dhclient $INTERFACE 2>&1 )