From nobody Wed Mar 27 20:20:37 2024 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 4V4dMn2nqDz5BRCx; Wed, 27 Mar 2024 20:20:37 +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 4V4dMn22bBz4kNK; Wed, 27 Mar 2024 20:20:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711570837; 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=WptNiFmLIV57m+U2rFhpdLQzvKOz3JpseuUHFyH/iCM=; b=ni+cxS/LXqEHZ27K7tdUCjDi/xKZQnJ9TWjDCKRcPPiNdzdLI7kyblUCFED/jif/NtVdUn +SULRJ36qdTymRlEsuoX8XXyAS4byutOgNWrQtcGQ6HnaCc/8zGcxIw3SKFt4whPxl1+mO PEPRV97BhNZNAJ2dl6ZXuiYZ/5g1mhQVCJPV7jM4fhvDzlrKVwZKwv99cL6uMLZnxl4SQL BI8rpUTVPooJUCo3SVJq5ft39UfUbXms6JtC5A0K5U6vmr7PsgCG/AJD8U6pyf6zp89UeH Xhx6xqr17l/ph3oAMY2gE7ym59/Kpzoap3GmpApJr/5JeksrtseHegE867D+6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711570837; a=rsa-sha256; cv=none; b=VL2kcsyUIl56S8CAh2PGoVOsyyW9JFKnAa0L3OzZRNNGejyVZvLpIg8bwnxC95lpWG7uGj A9F7N7SDXWX1JJnEG3U5f/tovzOwNPdHG7MsFMv3H9JDAAo9LjO4FZwKaoesLKJNB3DfAa 6ilrAnnioPx8E47yrC8nSpjzYvzjOMW81L3aWv/DTfEy64QlRfg/F8f+XZHyYtqxx/S5S3 xvpuQ5nWRsyYlHhAFh31DlWT6lZlGFmHRfQ8wiRz+dI4tRNrnMM5p1EX8SU/wy9XeG3ggb BxOKOR/MCakxRBb4JhprFUuftOX7bOaNEdpWhR1VxkhCO7lKezKZ5wNpx5qggw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711570837; 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=WptNiFmLIV57m+U2rFhpdLQzvKOz3JpseuUHFyH/iCM=; b=C4zmGO55zsYmaKAxFD0pEBOgHGYCb7IYt72Chagqeeb2BH02tU0KF5rNSiSHy+d5AV0HSn jIb4+EzXNfh6Bo7rKtQF27OIGRpAMouQwXxxwjdBDUbSQtcl8+Wec8WSfEGgnRUpdTfUUT gPkv9A0m9vfm2TDMyH22yHZWOZCABEwTIeLOewulGBYXpnAXK4iXotRc3Q1og/aaWQvquR htjpMWYu/Knpt1i5sQ9dfJ4gQZjLUSPPEaCXW03l/emEI1bHMtQ2vy93LyI1HNBsDLG2rb zo8JzEzgfVMnTpF1VnI50hb9sBvYho1YUFR01xLAzRfMWYcwKEDxHO8wcYPZUg== 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 4V4dMn1fbbzxwy; Wed, 27 Mar 2024 20:20:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42RKKb6s012033; Wed, 27 Mar 2024 20:20:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42RKKb6i012019; Wed, 27 Mar 2024 20:20:37 GMT (envelope-from git) Date: Wed, 27 Mar 2024 20:20:37 GMT Message-Id: <202403272020.42RKKb6i012019@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mike Karels Subject: git: 970ea0b2cb69 - main - bsdinstall: draw attention to new network config options 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: karels X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 970ea0b2cb6942b4fba088031e3b1968e056d6c9 Auto-Submitted: auto-generated The branch main has been updated by karels: URL: https://cgit.FreeBSD.org/src/commit/?id=970ea0b2cb6942b4fba088031e3b1968e056d6c9 commit 970ea0b2cb6942b4fba088031e3b1968e056d6c9 Author: Mike Karels AuthorDate: 2024-03-27 20:10:43 +0000 Commit: Mike Karels CommitDate: 2024-03-27 20:20:26 +0000 bsdinstall: draw attention to new network config options The network configuration options have changed in bsdinstall, with an Auto option to proceed directly to DHCP and IPv6 autoconfig (which is the default) as well as Manual (the old mode). For users like me that were used to hitting return automatically to select an interface, but want manual configuration, attempt to call out the difference: Change the menu caption to say "Please select a network interface and configuration mode:" and not just an interface. Reviewed by: jrtc27 --- usr.sbin/bsdinstall/scripts/netconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bsdinstall/scripts/netconfig b/usr.sbin/bsdinstall/scripts/netconfig index 130db2937234..0f23ae134cb6 100755 --- a/usr.sbin/bsdinstall/scripts/netconfig +++ b/usr.sbin/bsdinstall/scripts/netconfig @@ -76,7 +76,7 @@ exec 5>&1 INTERFACE=$(echo $BSDDIALOG_ITEMS | xargs -o bsddialog \ --backtitle "$OSNAME Installer" --title 'Network Configuration' \ --ok-label 'Auto' --extra-button --extra-label 'Manual' \ - --menu 'Please select a network interface to configure:' 0 0 0 2>&1 1>&5) + --menu 'Please select a network interface and configuration mode:' 0 0 0 2>&1 1>&5) # xargs collapses exit codes to 0/1 (ignoring signals and 255), so exploit # bsddialog output being empty when cancelling to distinguish Manual (Extra) # from Cancel.