From nobody Tue Mar 01 23:05:29 2022 X-Original-To: dev-commits-src-main@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 C51A219FC0E8; Tue, 1 Mar 2022 23:05:29 +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 4K7XsP5FSGz3qGR; Tue, 1 Mar 2022 23:05:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646175929; 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=yrspDDRHx1BHWu6ie65e+AyL6OYM6c2voKb5leWzrrI=; b=fpdiVykl5umABeH/yu7Q9Zi8XOW7ROOpik2qgJHT5Pgalq6KzrOtx/whBrH7mOmrnyY+eL YtJKjjzFNeim/sZPO/wFW+vb+BMH/xlkHLPYzDvuC/0bvYzz3KGObPKU8Qmj5vz5QcK6Bg 9B7iV69kj0HMX1SZrAKPhDSqSd+73o2SlgEHqXD1cm77avu8X01WoEEhgZdyu4xfticv2s NR5y3P/wspvL/j65atUupW3N4SgoznlagUFq5qdy/nGCXieMZq24ynaoCmBsO92676W3o8 aChfd/QwpgveaunhWqZ/+uWcKdUlvx/ISeCgE/DsPW+uGnd6DwSM3iD9rSnVPA== 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 938A417FDC; Tue, 1 Mar 2022 23:05:29 +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 221N5TkU025060; Tue, 1 Mar 2022 23:05:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 221N5T21025059; Tue, 1 Mar 2022 23:05:29 GMT (envelope-from git) Date: Tue, 1 Mar 2022 23:05:29 GMT Message-Id: <202203012305.221N5T21025059@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: 912df915c266 - main - wlanconfig: allow to enter WiFi details if no networks found List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 912df915c266cc19ba6a8465c7e9e35eba0e3d85 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646175929; 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=yrspDDRHx1BHWu6ie65e+AyL6OYM6c2voKb5leWzrrI=; b=Y73ekwNWnbWuV+2HkivsdtS9439XQAAVDrPTlhFD0btCehn33pZcJI21eSkCiOmgDtmyVu ZMFHZPG6GJDWOzK7dsFdoxRY1op0yT12zWx50gqOH+ddvcn5pcDR4wN00X71gjxYYL1evV Xu5+Ckuy36GegahLiy0mxX2OT4BtFXhyuFFBIZ6OOxVvEh6sAjcONtOYNxpjMHuqwBCyb+ kB677raCSnjiVb/wFg0XohonDJCuzGvEz4MHErpuYyngtrFm8YfgcxdVWtMCmGMMctj924 5xAnzbKs4GjwZea9jIA+GIaZCWtkU46+i6x2tIv3xJ1s1jqzTxYwLiFQ/60uag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646175929; a=rsa-sha256; cv=none; b=Aa+xsQdnYcF3K3prCE3CRQY9ciNePjFIMmlOPGTWBEvzNacBso3NyCcii6dDaXBNrx4SWc B2w2QcoOHTQ7BVUPNCeVnyKdYGCVlWBZ7CDl++PGi8q/zII/CCO7uRLDrgZ3Y7K6pmIV1Y MacYSsq7TUOFyX+kMmDDviEahevKARaS2ZFTAkG2tA+DI5LHG291cpsFfd7hq6YpHtyJlv j+nrr6EHFsYWihIFL816Ux/BKma+olEPHv+TLn2l3q0ZbyZOy+uSid8HW8HsuH9r7Fou/x X70d2Eca+7cmgCJS2WfvC3PVhaZnQbn4TU1cYEhGGd6o614wRg6QenhMA2wwKw== 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=912df915c266cc19ba6a8465c7e9e35eba0e3d85 commit 912df915c266cc19ba6a8465c7e9e35eba0e3d85 Author: Alfonso S. Siciliano AuthorDate: 2022-03-01 23:01:13 +0000 Commit: Alfonso S. Siciliano CommitDate: 2022-03-01 23:04:57 +0000 wlanconfig: allow to enter WiFi details if no networks found Improve the installer: wlanconfig allows user to enter WiFi details if no networks found, useful to connect to a hidden SSID. PR: 246192 Reported by: emaste Approved by: bapt (mentor) Differential Revision: https://reviews.freebsd.org/D34149 --- usr.sbin/bsdinstall/scripts/wlanconfig | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/usr.sbin/bsdinstall/scripts/wlanconfig b/usr.sbin/bsdinstall/scripts/wlanconfig index c2234831be9d..3de1a3420909 100755 --- a/usr.sbin/bsdinstall/scripts/wlanconfig +++ b/usr.sbin/bsdinstall/scripts/wlanconfig @@ -213,23 +213,22 @@ while :; do if [ ! "$NETWORKS" ]; then f_dialog_title "$msg_error" f_yesno "No wireless networks were found. Rescan?" && continue - exit 1 + else + f_dialog_title "Network Selection" + prompt="Select a wireless network to connect to." + f_dialog_menu_size height width rows "$DIALOG_TITLE" \ + "$DIALOG_BACKTITLE" "$prompt" "" $menu_list + NETWORK=$( eval $DIALOG \ + --title \"\$DIALOG_TITLE\" \ + --backtitle \"\$DIALOG_BACKTITLE\" \ + --extra-button \ + --extra-label \"Rescan\" \ + --menu \"\$prompt\" \ + $height $width $rows \ + $NETWORKS \ + 2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD + ) fi - - f_dialog_title "Network Selection" - prompt="Select a wireless network to connect to." - f_dialog_menu_size height width rows "$DIALOG_TITLE" \ - "$DIALOG_BACKTITLE" "$prompt" "" $menu_list - NETWORK=$( eval $DIALOG \ - --title \"\$DIALOG_TITLE\" \ - --backtitle \"\$DIALOG_BACKTITLE\" \ - --extra-button \ - --extra-label \"Rescan\" \ - --menu \"\$prompt\" \ - $height $width $rows \ - $NETWORKS \ - 2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD - ) retval=$? f_dialog_data_sanitize NETWORK case $retval in