From nobody Thu Nov 21 23:26:26 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 4XvZ9t4LmXz5dkjB; Thu, 21 Nov 2024 23:26:26 +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 4XvZ9t3TLRz4RFh; Thu, 21 Nov 2024 23:26:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732231586; 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=vFxnqI/gBe3J7kbFlSn7fQrn6HxNwJYIBlCOROToqC4=; b=XPXOLE0U+uZ3yciQjieWe69UInPcztChN8uLsu0GqiyLrCRbjNShqr+JOfNSPcZXm09Pw3 hVFOKlTPIWZyALFfFAC2Jf1dDqeMcGdWSqOlWFmOBRTT91I0rNAQLOUxU1Uuls+LRV1yn7 VlhNADqqD/oTF1FJUFqoZcjeR9MesHLP+uIvVMPFS82QKMKPKmmK1sYBAAms7xMik2fdUv 4E8dR6Hakq3vkYPMwcka4Aizowh403J3j2UD1NEplTd0GWcZYMTZco+UO4QDNM7X1jX/BL LrPsf6GXv3nulb0oX4N/KcFNe9S7AfKvL64UP2g2gP+YBj7rzVhaXeVXNLodlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732231586; 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=vFxnqI/gBe3J7kbFlSn7fQrn6HxNwJYIBlCOROToqC4=; b=v70CmOsEsSdK966pbvXmjkg7J5FK9BSmqi9ZUvn8jwzwZ37AtCu9o8HklCfouCpjiE8BIO U5ShriNBDzA05cbpWCggsRCQpXk55ESGUwLyKd5P8dlcghjnso9gB88VLNi7fFsLJjdQU4 lXLLTQw9KkNJacGPK1hpSCEtCfuonW/Ay4n0qDVd0gdKcI/UlN4jkx0rheo5IDhGuQXvB5 VPIPNMY9C69/wUBh5cgg1DYSKyLadXLSPRB/Vy5ghDXl/2YdRbqvFWome+f7gQoJdH7LPN fjdCqADH4KekJV74fx7VyPK/P7FbSzRVH86JPBUkU707zJwqzlwROaAPOd7LbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732231586; a=rsa-sha256; cv=none; b=YWclNh7Bg+1zx4NNv2KvRyldtLLDDlvBFSWpEyakZWl+3W6PiFoxzXGF2gbNZMQOnUE0ik M709jTrIS9zTfYLDtu0rHBMjPNdNiy3I3LID3nEr7x17TyH132RUzKErOtzAAz9rNiMwHu /W3vMktELBHSjSegOmUjmDoRezEI4HkoP4DoTwrf6sxr7C67biEvYSeAgXmddMGMZ+6W8l u94ZbfD9UcK7tHUukinbtMtxGAx5HacifTYzPzj0sOX7Fa+Di1oMX/mD3cJAYONlTDOvq6 PWDwMv6Mkl3j5Est1CiR+U+M7/2tTAg9RcfqMW2Foo10GsvYMkU0KgGKlE5eAQ== 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 4XvZ9t34Vyz10ls; Thu, 21 Nov 2024 23:26:26 +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 4ALNQQki021357; Thu, 21 Nov 2024 23:26:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4ALNQQMb021354; Thu, 21 Nov 2024 23:26:26 GMT (envelope-from git) Date: Thu, 21 Nov 2024 23:26:26 GMT Message-Id: <202411212326.4ALNQQMb021354@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: cce4df8b3cbc - releng/14.2 - 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/releng/14.2 X-Git-Reftype: branch X-Git-Commit: cce4df8b3cbcf4f58890048e608399471fc214f7 Auto-Submitted: auto-generated The branch releng/14.2 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=cce4df8b3cbcf4f58890048e608399471fc214f7 commit cce4df8b3cbcf4f58890048e608399471fc214f7 Author: Bjoern A. Zeeb AuthorDate: 2024-11-09 01:10:33 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-11-21 23:24:47 +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) Approved by: re (cperciva) Differential Revision: https://reviews.freebsd.org/D47491 (cherry picked from commit 5399052c63a7a3d2f54615d31bfd092ab887a600) (cherry picked from commit 7d0c12e1f907ddf9be6668449a966703c0f781d1) --- 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