From nobody Mon Apr 25 13:51:20 2022 X-Original-To: dev-commits-src-branches@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 BDA061A9F883; Mon, 25 Apr 2022 13:51:20 +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 4Kn5yc50PJz4tBd; Mon, 25 Apr 2022 13:51:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650894680; 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=TqjUe7BUhVRmmxulCAoctiwpOc23WDhsfvzgE5/Vrjg=; b=c13KEgOj3yiM8NBXo5tYisB1+MgxKEqoft2972Hocc84525jEgmGYNSwIJ5wgh1QoBitPT nIxPq3sicNYdNNmRZRfKcD9sUIWVH/ulGguCbm7c0oXRXD+sK9gTV0RMzUdrUiBgNCuI/A 90uUmppVRD+MtCw5wDqV7fzQr7ZTpB78cd/vnIQmplDuMM05n7Kz5EOpm0Vb5DWi7oQvKL 1DtkIUL6KkwuvLsAi5HXHJgYe+kgG1GC+7VhrZxgzQ9AWhxDQpaZEg+oPbb28YVurRAeQ1 DNjItvaL1LuxbYYmPljVVBe4E0oeHgCl6OjoAEhoqQFTGd0EbCzQtbgwx4jbQg== 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 8A87F1BCF0; Mon, 25 Apr 2022 13:51:20 +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 23PDpKjJ088231; Mon, 25 Apr 2022 13:51:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23PDpKev088230; Mon, 25 Apr 2022 13:51:20 GMT (envelope-from git) Date: Mon, 25 Apr 2022 13:51:20 GMT Message-Id: <202204251351.23PDpKev088230@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: d818ef7df733 - stable/12 - libexec/rc.d/hostapd: Down/up interface when interface is specified List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: d818ef7df7330e8b3aac43f5160e102d6a702862 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650894680; 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=TqjUe7BUhVRmmxulCAoctiwpOc23WDhsfvzgE5/Vrjg=; b=I8AF3L1JJ/EWaAAjBRGgXwvk1ZuSu+aYhkNef9l/lYuE0f+YkS0mSy6+5niWB15xMT2Lds mGJUeCwilPeU4o2tuK4TzHsYxFJmTv4L5TGZk023Jh2t8BXcBmEqJj1JHd/nFQjhGukhMD fFpaaewCle13oVBF82AQdo7VihowChrMognJa9WwS3wZpVZyILnrbuXwmnjh+Z8QzWBFSO rz9N+vMRW8RFb0hkpNXQpZHvdz69UGxnI8+FeTP56EqFEkR9NyvB3gzcbIkuggiEvkmGe+ 1vN7PGD6aFSL4b257Jwv9WP7rnd1YWkiA8jX5Cu79khSyWfCox8knxNMRMBgDg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650894680; a=rsa-sha256; cv=none; b=FdXzAfx4fbx6TXPQMBqw2Mp6OuXqvWMJmPH7H6E+kwDptamOtjVJi1J8+uJx8/EKkoEjUX SaSGXdo1ylnoaKfpTOYyjzdlhwTZvev4ILJ3yyYz1EvjgyEPZZVolejszeQCj5BlnrJnRa BtCMBupbM6eDnDxbbIHkVcPFYehuCQhkVzeuYEO3Qe4knjI88bKTPKnz6qGGJK0jWZ1NlZ 8i7ZQHQPoi8ib9KnGbLrfYuRGbQWyyG44DLXr6EuIY9TgShg3pRg5BpxLkvu7Jpp25B583 tcGJs2n1AxzPr16zk23hGPzqrtrKYvQH8VjzHyZhgHVmHJNE9QN7yFtatBw2dQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=d818ef7df7330e8b3aac43f5160e102d6a702862 commit d818ef7df7330e8b3aac43f5160e102d6a702862 Author: Cy Schubert AuthorDate: 2022-04-22 16:03:08 +0000 Commit: Cy Schubert CommitDate: 2022-04-25 13:51:12 +0000 libexec/rc.d/hostapd: Down/up interface when interface is specified When no interface is specified results in a syntax error in the rc script. Only execute poststart when an interface has been specified. PR: 263358 Submitted by: markj Reported by: Joshua Kinard Fixes: 0da2c91e64528d896f69d36670e25b4b4a140579 (cherry picked from commit 1452bfcd9bbcb2f5bbb89fa38d01ce51dd9b6d44) --- libexec/rc/rc.d/hostapd | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libexec/rc/rc.d/hostapd b/libexec/rc/rc.d/hostapd index 7e1611350438..d2d8dd253efa 100755 --- a/libexec/rc/rc.d/hostapd +++ b/libexec/rc/rc.d/hostapd @@ -15,9 +15,11 @@ command=${hostapd_program} start_postcmd="hostapd_poststart" hostapd_poststart() { - ifconfig ${ifn} down - sleep 2 - ifconfig ${ifn} up + if [ -n "$ifn" ]; then + ifconfig ${ifn} down + sleep 2 + ifconfig ${ifn} up + fi } ifn="$2"