From nobody Tue Jul 15 18:05:27 2025 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 4bhRtb2y1lz62fwt; Tue, 15 Jul 2025 18:05:27 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bhRtb2NLtz3p9L; Tue, 15 Jul 2025 18:05:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752602727; 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=/ZOl6cLFNd/1QdYu+uvoLZx0dCFoubk0cCMObU34JGc=; b=daET6qHuvfIWzgET5tuKFNIwKgCRQZPgbhnO8SZcdTHe7ZhVQyTyjQEqWuEOFh38/lbhIQ /zSreEwOI2yKd4L6G4AxMdSVMTAAuOk4nEK+34xo/0UGLJpjS6gdGI87pQjSUqes4E69z2 CNaMQIR51YbsdtXajQuNcueqsRyxYj9CeyCjsfDKB17EuItd6VnVKEg8J+LoaWcx+BQZrS 6LSyZxPlVs+CwUoRq+t6rqqzeBTQRqfZEa6LJ8gA5yBAbPTMBZ6Ne0vjyf/eY27g+KpSI4 XT7qtq8CqMihElhjKg/oVeeyEnp2i8lzbrWsshjeFUgnz2BuDJdAIsAoGhpfeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752602727; 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=/ZOl6cLFNd/1QdYu+uvoLZx0dCFoubk0cCMObU34JGc=; b=u4ZhkjZxxivi/xw6I/KYYW27mwBkwUlq8adWH9UjsWU0S5tNrgvln+BTUnnSbNo86mdAaS 7pQcvLnZrqIQV56rsNVN1dZErRBxycSwcN8VhS4FghjtFCQOw0vorA67NrvJfNjBjmhhO5 PTx+lXwPGThQXS8RxfxJxEfb/mawSpQB34Xx5lWZ6mPTVsX3Y4kfsVE/P9euWNGG8YDXW0 eLxjTzuRM6u/i7NjJPK5MuUi/c80KEVcfCRhBHZHMVXoKF3FP8g8P3klYA5BDT+Mbg4Xya zqvgaYnZdmzfjIPM6hljGITOeGbb4oa0ARaJk3G/ts4pDLAxXaookhXt9g5wNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752602727; a=rsa-sha256; cv=none; b=En0MV43l2N97D8SbCdCAtLvr34LcQofhJelzbTndAeGAUwgg1IZCDEqt91nGcYhArnW4x4 rC3m43LJL09mLO3iUh9D3+OCW9wiTBsilWcbIqqqceDOcn0m1ulWp6GtH4DlPnrFvViU4y EeofCbK2j4SQccJVFSzX7bNgy+3npR4VIykyb7Vnx86JnJCqlQFRXe8MgVF5260oZ4qPw+ gvnBNLeKF1kxMX5LRlUzRfSe2EHelp+vNmVALGRdcI0rFvET+cfE2SSC7/Hnjy66wnwkNI xzEAlV3tG0T5q4o65zQwGQAV1BvrzQjXcYMYrXSoyIk5TosWOMCwAUqX73XpEQ== 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 4bhRtb1VG3zrFV; Tue, 15 Jul 2025 18:05:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56FI5RSk032138; Tue, 15 Jul 2025 18:05:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56FI5RbN032135; Tue, 15 Jul 2025 18:05:27 GMT (envelope-from git) Date: Tue, 15 Jul 2025 18:05:27 GMT Message-Id: <202507151805.56FI5RbN032135@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 5a1e2927d63e - main - bsdinstall: wlanconfig: properly format regdomain dialog input 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5a1e2927d63ed6394b767088eb2d66676f275467 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=5a1e2927d63ed6394b767088eb2d66676f275467 commit 5a1e2927d63ed6394b767088eb2d66676f275467 Author: Bjoern A. Zeeb AuthorDate: 2025-07-14 18:32:53 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-07-15 17:53:21 +0000 bsdinstall: wlanconfig: properly format regdomain dialog input Without the extra '\n' the dual-column ('REGD' '') are not properly separated for dialog which leads to an [misleading] error hidden on the command line: Error: --menu bad arguments items number. [Writing this I wonder why the dual-column input is needed]. It is still unclear as to where the error message quoted in PR287538 suddenly came from for 14.3-RELEASE given the code was broken since 2016 (or noone ever noticed or reported). Looking at manual ifconfig output: ifconfig wlan0 country GB regdomain Expected -> ifconfig: unknown regdomain Expected and "ifconfig: " gets stripped by the script, which means the regdomain variable would have to be set to "Expected" or more likely to "Expected eval: Use: not found" which looks like a concatination of errors. Sponsored by: The FreeBSD Foundation MFC after: 3 days Fixes: 95ee591e83a91 PR: 287538 Reviewed by: emaste, thj Differential Revision: https://reviews.freebsd.org/D51313 --- usr.sbin/bsdinstall/scripts/wlanconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bsdinstall/scripts/wlanconfig b/usr.sbin/bsdinstall/scripts/wlanconfig index 8ac64858eaba..99550ce3938d 100755 --- a/usr.sbin/bsdinstall/scripts/wlanconfig +++ b/usr.sbin/bsdinstall/scripts/wlanconfig @@ -92,7 +92,7 @@ dialog_country_select() sub(/.*domains:/, ""), /[^[:alnum:][[:space:]]/ { n = split($0, domains) for (i = 1; i <= n; i++) - printf "'\''%s'\'' '\'\''", domains[i] + printf "'\''%s'\'' '\'\''\n", domains[i] } ' | sort ) countries=$( echo "$input" | awk '