The branch main has been updated by bz:
URL:
https://cgit.FreeBSD.org/src/commit/?id=5a1e2927d63ed6394b767088eb2d66676f275467
commit 5a1e2927d63ed6394b767088eb2d66676f275467
Author: Bjoern A. Zeeb <b...@freebsd.org>
AuthorDate: 2025-07-14 18:32:53 +0000
Commit: Bjoern A. Zeeb <b...@freebsd.org>
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 '
