From nobody Thu Nov 21 00:05:27 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 4Xtz5N2ltCz5dwSp; Thu, 21 Nov 2024 00:05:28 +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 4Xtz5N0n8Nz4Dkc; Thu, 21 Nov 2024 00:05:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732147528; 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=wzDZ5wsTivtafmLsM67gD6BDOUM0cjuONpOyyBwdFRI=; b=ErMpjylADYx8wHba+mI+f/wSAhraryAxvyXPm2PGNvyUssFNL2zYcZqrY3rj9mRl8F5AEl G+YU/uTwe/BVTGtht6329Y/oLv265g52c8a5bO74hkW6XJ8WmCcumPOdQ578bYCEOfUZZI qPtkXO9I2Vk/22aJnmfgmB17A6CEEedKKMnLuyc6/BUaskuzMEbcfZrCUjUWZJI3O9gmI9 oYlbJmO5qR85MMKsRjcERZScGsLmgEcVD5uNUJLRf9G4B0QxfyL81QFSqIeAQmMUpFVK9x tRTAjJiPlHrcVdQBphOkUBwls+EsjXL+EJM02vfcOZ55gUkf0n4vnkwf8gmv4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732147528; 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=wzDZ5wsTivtafmLsM67gD6BDOUM0cjuONpOyyBwdFRI=; b=qtDAm9MH+PWGzrFGAnXxON8wYVDFNX9mzIPOALaZ7yedtHFuDU8vb6FtINP+IyehDFP0Hb R0SyBEI5f38tvCN2HqOwxJAZ/wGkwxyshINuzdXX3gpokBrbU5DZGtd15lo4j2WJ4oTWho u5Pzc4rgthJ/yRyWYUgEEapqm6QPnBR5ytqgXndmuYX1kMTVt1XlAh6E/mTqKcz23Pr+jM 1BzPnOdX/9Z7Qi2LWnj6xTxbd2eieq0GaKQ1mqWFYXPvrBbdeIS1ET9tfsN9xjDqBq6DjC smVlXAYdWgaT8wWQnb/rWVB83O3BKjfCpnbKNPLthVkxgnnLV0X+ijtTPXyYMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732147528; a=rsa-sha256; cv=none; b=VYOxGjXc6pXCmdluaETKxsRs368hI3M6GfhqxH1bKdy82o4TUGPQNCcSiXBGHWwXcck+kZ Q7AoedgbkiavIOFZhXI5bwE96+64mP4B4ftSq2ZTr2Km6Q87A4lCYHIHTwyDpGmnxFh1HO 6mWfnFb0lwa3d/jfnjtk68wnWrNa3IVBQk6lEByUMmpKDbYtcx1DiFUdV/XVaSu57z1A+R q6FAdFEQMqCjKJXD05Nfjr0sJj+Wr/ZEGewFzFMLDX/sLMfVZvbCyxM89dYV/VEubjUNbd 8SC/QDAADpn0oykR5A6BOpTv9lN5jVlU/nxzPz18YRbp/WTeMQLZvtQoAhf9kA== 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 4Xtz5N0PjdzGYF; Thu, 21 Nov 2024 00:05:28 +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 4AL05RrL087652; Thu, 21 Nov 2024 00: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 4AL05RjE087649; Thu, 21 Nov 2024 00:05:27 GMT (envelope-from git) Date: Thu, 21 Nov 2024 00:05:27 GMT Message-Id: <202411210005.4AL05RjE087649@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 7d0c12e1f907 - stable/14 - bsdinstall: wlanconfig: fix interface UP on (re-)starting wpa_supplicant 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 7d0c12e1f907ddf9be6668449a966703c0f781d1 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=7d0c12e1f907ddf9be6668449a966703c0f781d1 commit 7d0c12e1f907ddf9be6668449a966703c0f781d1 Author: Bjoern A. Zeeb AuthorDate: 2024-11-09 01:10:33 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-11-21 00:04:57 +0000 bsdinstall: wlanconfig: fix interface UP on (re-)starting wpa_supplicant Make sure an interface is back up before (re-)starting wpa_supplicant in wlanconfig not relying on wpa to UP the interface (though we fixed that). Sponsored by: The FreeBSD Foundation Reviewed by: emaste (in D47491) Differential Revision: https://reviews.freebsd.org/D47491 (cherry picked from commit 5399052c63a7a3d2f54615d31bfd092ab887a600) --- usr.sbin/bsdinstall/scripts/wlanconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/usr.sbin/bsdinstall/scripts/wlanconfig b/usr.sbin/bsdinstall/scripts/wlanconfig index 338e4f0a4109..728833f8d4a0 100755 --- a/usr.sbin/bsdinstall/scripts/wlanconfig +++ b/usr.sbin/bsdinstall/scripts/wlanconfig @@ -55,7 +55,8 @@ country_set() "$WLAN_IFACE" "$ifconfig_args" error_str="${error_str#ifconfig: }" # Restart wpa_supplicant(8) (should not fail). - [ "$iface_up" ] && f_eval_catch -d wlanconfig wpa_supplicant \ + [ "$iface_up" ] && ifconfig "$WLAN_IFACE" up && \ + f_eval_catch -d wlanconfig wpa_supplicant \ 'wpa_supplicant -B -i "%s" -c "%s/wpa_supplicant.conf"' \ "$WLAN_IFACE" "$BSDINSTALL_TMPETC" if [ "$error_str" ]; then