From nobody Wed Feb 8 07:54:24 2023 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 4PBXMN4BVxz3ksSG; Wed, 8 Feb 2023 07:54:24 +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 4PBXMN2T3pz3jq8; Wed, 8 Feb 2023 07:54:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675842864; 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=vuo3P+3ImNE+Q8iKIs7+DQV+qkfF0avdz70kSZNAlpw=; b=qKKU/4pfpJD/+75bvjXe8GpYff1XFIsZMb3QmmRilyobOmv5Wkft/y+wKKxxvYiGfDAH0b 9pLlGOJD6YTBgNgaOBRuROU0WhwQC7JD8FMCK3cr1VRmNJDFjHs85x1lRnMrIJERgCsRKF /otWQ0nYwNwJG62vc7M818T+9ktZ3kcCfK6fCYueaueNt3K30FUdnQxR3qObr4xbn+gC5v Pl8+gyI906TO3CDEZNbYrwaN4ohILGXM5snDTJJ1q1VFMNK0uQqKmH9ZBUBE0txd/PJswR oasatwX/N5ZVElknKN6goX0iQmaX10daW5s2b/8mhp8k/nCSETh+Habv3w5tSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675842864; 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=vuo3P+3ImNE+Q8iKIs7+DQV+qkfF0avdz70kSZNAlpw=; b=CUJDagokTwZIDQWqkyNpJt2OEnTQqRrQoahd4G9LaEYeqNpfTmyA2YX/BuHSDnxMlOEynn 8luG8FYIn1yn1Df/TVQgufe6Tv7P3Z2wrnUve3xWQ2uncmRYzDP9EMYNOQ9iaIOxC705ea aq2/B7pHN//VlN1h0+5FRDnGTtSlp0bUNLRivMYObMzF4lAuoDbAkE+0cTZJ019RhdUfw/ 2q/0BWlGMcYoFknks+Vv9BDM790CrhNE+qiFI5GZ+uq/c+5ArkmtYfUjSeo7XwCd+2fuui pfY1ns40gmfh2c5kXFdVWx16YphvUSUDBerwg1UfilKf3crizLuS3UXGTuHpBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675842864; a=rsa-sha256; cv=none; b=YDPLfnThsRidkmabAbjdJ7yK3JNXB8sBWr3y66BTKjRy1l6H2DVrxFMbgmxbFBKr/FOg8n bAFMlKd9Fa1W1Vf0ClFgeP8vwCCN7RXAacd0f0q+6sOYlqUd+HWRp3aVtlCjVLqN9L06dq rft2iSSA3GeiqikHxTCvICCew3yo8pxR9jEnQ5c9A3rBzHRL31Q2sWUUKdNBNevOkx3Dfn 1H3fvYgySIppiU6UWF4u5fZJ9MHypGoAK2w5gI+3NyyXFu6U9iP/Y0/7yo1noh2DcR4N2E C1zYAig+/gVDYv9ZrFjHLAmy7iyqbgy+/DWj3mSThJGYdsmA0Rc4x1cBRQ6h9g== 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 4PBXMN1RxCzq72; Wed, 8 Feb 2023 07:54:24 +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 3187sOka038247; Wed, 8 Feb 2023 07:54:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3187sOvl038246; Wed, 8 Feb 2023 07:54:24 GMT (envelope-from git) Date: Wed, 8 Feb 2023 07:54:24 GMT Message-Id: <202302080754.3187sOvl038246@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 9150a0455e43 - main - devd: Move bluetooth part in devd/bluetooth.conf 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: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9150a0455e435e11d27b9b3f89a30cb2f04fe59e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=9150a0455e435e11d27b9b3f89a30cb2f04fe59e commit 9150a0455e435e11d27b9b3f89a30cb2f04fe59e Author: Emmanuel Vadot AuthorDate: 2023-02-01 07:44:46 +0000 Commit: Emmanuel Vadot CommitDate: 2023-02-08 07:51:34 +0000 devd: Move bluetooth part in devd/bluetooth.conf And make it part of the FreeBSD-bluetooth package. This avoid calling service bluetooth on an installation without it installed. Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D38323 --- sbin/devd/Makefile | 7 +++++++ sbin/devd/bluetooth.conf | 9 +++++++++ sbin/devd/devd.conf | 10 ---------- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/sbin/devd/Makefile b/sbin/devd/Makefile index c9d2470f30b5..5b2feb6c2bdb 100644 --- a/sbin/devd/Makefile +++ b/sbin/devd/Makefile @@ -17,6 +17,13 @@ DHCLIENTDIR= ${DEVDDIR} DHCLIENT+= dhclient.conf DHCLIENTPACKAGE= dhclient +.if ${MK_BLUETOOTH} != "no" +CONFGROUPS+= BLUETOOTH +BLUETOOTHDIR= ${DEVDDIR} +BLUETOOTH+= bluetooth.conf +BLUETOOTHPACKAGE= bluetooth +.endif + .if ${MK_HYPERV} != "no" CONFGROUPS+= HYPERV HYPERVDIR=${DEVDDIR} diff --git a/sbin/devd/bluetooth.conf b/sbin/devd/bluetooth.conf new file mode 100644 index 000000000000..29bd51e36fca --- /dev/null +++ b/sbin/devd/bluetooth.conf @@ -0,0 +1,9 @@ +# When a USB Bluetooth dongle appears, activate it +attach 100 { + device-name "ubt[0-9]+"; + action "service bluetooth quietstart $device-name"; +}; +detach 100 { + device-name "ubt[0-9]+"; + action "service bluetooth quietstop $device-name"; +}; diff --git a/sbin/devd/devd.conf b/sbin/devd/devd.conf index f7a8ea7ac8aa..43596fb9a9d5 100644 --- a/sbin/devd/devd.conf +++ b/sbin/devd/devd.conf @@ -69,16 +69,6 @@ detach 100 { device-name "ed50"; }; -# When a USB Bluetooth dongle appears, activate it -attach 100 { - device-name "ubt[0-9]+"; - action "service bluetooth quietstart $device-name"; -}; -detach 100 { - device-name "ubt[0-9]+"; - action "service bluetooth quietstop $device-name"; -}; - # Firmware downloader for Atheros AR3011 based USB Bluetooth devices #attach 100 { # match "vendor" "0x0cf3";