From nobody Tue Nov 19 00:07:53 2024 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 4XslF60tnvz5dkqB; Tue, 19 Nov 2024 00:07:54 +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 4XslF60N4mz4bbq; Tue, 19 Nov 2024 00:07:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731974874; 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=jszs66A7F8GBzYVpHNN7sHOMO9WA3N3jHOPae23cprs=; b=k5SXdoMk7Hqx9gRJ1+hsiUUEP07Q7PIUuuVoMS8/BgmuQAH8pJ/aTV4WQCEsc1Fv+pZkle buTuSjvGEb8IUZMOvNLZM11uTeYPsHzCG78NQFmmz7iQqR91z9kaASejtpZuusp/W8FtJ1 6YG6kenV58Q4Jpej64nfYREdNpd6HumBjbSXfuLqtZMAB4yeQ9+wLvkPf7xO3HkU2atFo3 gZT+B3Juk25FAfi52PeQ39GbQQu6dW8IY4UizJq5G/huK96bapGhztZu0O9VNg7m2Sc23d tH4vI8GBamJmLYvcRBkXpBTyaAIWoEmgTagAAJ6BhRNmTLVXvVdS95zFka0qQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731974874; 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=jszs66A7F8GBzYVpHNN7sHOMO9WA3N3jHOPae23cprs=; b=PVJ7KKiUHRl/KFnzZb/v6euxIvsOvNdFjr0ikU85at+Y8NitbC5xd6uqgqnutSDKPujWjS SzklUScRAYU5fcFGLQGJU5jxuk2JkXoO3O+1hjdNsXpZud6hDN5oiR1pkIs1sIWbDAtCxt qDzC9KNfDUrvpka7XF+ZEopumEY77R0rSgvhA8bKWrkjiTFLIMkFXCJH8o+ddhic/7ogbM C0Q2+c806Q/Vr7K+HvDbLOsi3RhczkY2auoKpb1W+gEEr8+7MfNWa9VYUc7Xi0npnuoK8k +qDcqFId585kvI9YJjiVxibFSJuE8UrEMBGM6E2dKV42gerb3Yrb8bGl6VEYig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731974874; a=rsa-sha256; cv=none; b=bI/ua83dV50HZ0rkbLIGyc707q63aKE5P48M4BY83GwkFjGb4gMVdQJcjogfIDC0Zwc5MO iLB3spCK4T29DNtOU0nTmgZUXo4WWuKI4Z7w3UJysdqIOkRjHNAoy114UnN2pBXp+fWOxq W9dUSsz6jP/8ZCPOO7ptl+iV4dynBpQN61LKven33VNNTyRFQZwCQ81923z9A6a8Kcke+k nJYUcWU50YUtsaSg1qyQJt4mKFqbTBfQ3hgOjF4g62w22kVkbIoJQ1sGSYKRL3Lae+kDSz RJK1nAdHGFp6UfKU8ELYKdpylke0l4d4E5Iy3EBMUkuexGurmXrH8VuJBxkUiA== 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 4XslF575HTz11kH; Tue, 19 Nov 2024 00:07:53 +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 4AJ07rZQ027467; Tue, 19 Nov 2024 00:07:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AJ07rDD027464; Tue, 19 Nov 2024 00:07:53 GMT (envelope-from git) Date: Tue, 19 Nov 2024 00:07:53 GMT Message-Id: <202411190007.4AJ07rDD027464@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: 5399052c63a7 - main - bsdinstall: wlanconfig: fix interface UP on (re-)starting wpa_supplicant 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 5399052c63a7a3d2f54615d31bfd092ab887a600 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=5399052c63a7a3d2f54615d31bfd092ab887a600 commit 5399052c63a7a3d2f54615d31bfd092ab887a600 Author: Bjoern A. Zeeb AuthorDate: 2024-11-09 01:10:33 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-11-19 00:06:16 +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) MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D47491 --- 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 f044bc1cba98..8ac64858eaba 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