From nobody Wed Feb 8 07:54:25 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 4PBXMP4GrLz3ksKf; Wed, 8 Feb 2023 07:54:25 +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 4PBXMP3G8mz3jn7; Wed, 8 Feb 2023 07:54:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675842865; 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=lAUIU1X788mplp7EkCeExn7naOGkvFPvsoNJOzLiIjs=; b=Gzihg/RpVi2Wp6aMzy2ROyD07C0ERMjXhL49baMjbhdmmPGhUsGuJcrZ75LueCiuHwugdS 9jSF5lXYISNojbKp38Eoij0R+xseZ6TWd65aMC6jh4zk7hXtASh+Zs92TUQM1U3rQEWS/R TPre57d3PGenmVNS/ausrh7LK39aKYXiZVdKx6jFHuzrxaUhv/bs1n5xpma1Nk4GCwPsEA Ri5ShXkGjGH8LbkmMaAg/io9BeFT6KvMXvbOeYfpDCjQP6S/bb5gxYEM1P0DBU5zqNidha rbY6/J1yaMnAM0EB7g7mmsCxUWsSSjdHH6vTx/zu/tD0zz7J/dnA4bOufMFhVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675842865; 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=lAUIU1X788mplp7EkCeExn7naOGkvFPvsoNJOzLiIjs=; b=ZR7+G0hQjVl15A/hD3NCGBbbduleUiTovlTlLLfGdcvzvGqoPq2YZ/J7FJLwfxmGstND6K 7sTrrA9VP4FOZtvg6J5YLmu/3BhE/X4bQuBZBtQfoEvU7PjxWZsyjj2WnU8jMo14jEpAne 8bq86bnKWgHlQgZ3poEPXGr4Wjm+aK3kdn4HZSHboo+CF6xUEmAaoHdVsbhc1ukjJvNnL5 QIGce723jo9d/uOT0+Qixay0tydCQJogUtBibhxug4Zm9V7XUJ4NW93Di5XKjB0v4/FQ90 6uBOxAqh/wKZFJtPOVoDm/r5nh8DCvY9blQrDTDa+YEP3uwNF2QDOtbryoVIRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675842865; a=rsa-sha256; cv=none; b=TlYLf2rrDxAl85cnJBYwElB8YPXSVEubybOx2t34FO84OjLHQGBBGiVa9Thx/fOLnkMrtZ OWpDMy069BTvCCuWrB2skCHxyd/cFm2PJTppw7hTy3piLQqpNsPQ9WBG1/rBsWQ5pSnAiy BJ9BBdO31sS1TGvfBs7hWryrT0UTXLBP4h+t4/4hVInqZWmbFnYqQkcxAkRZcxCZzYgzHa XTEGvSl+3etcraLyipW6+8iusXxoicIYmJIeJiCBEQTQ61rqLOIMURin2scT0UZ/7KTpvu wJBxwc44CN9dxvysw4Abo4uzW6G7/lby4+0p54eghYh2Hlz8UpZ4NQOnX/Fysw== 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 4PBXMP2J2xzpXc; Wed, 8 Feb 2023 07:54:25 +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 3187sPJd038271; Wed, 8 Feb 2023 07:54:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3187sPQq038270; Wed, 8 Feb 2023 07:54:25 GMT (envelope-from git) Date: Wed, 8 Feb 2023 07:54:25 GMT Message-Id: <202302080754.3187sPQq038270@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: 2878e21ff11b - main - devd: Move power_profile part in devd/power_profile.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: 2878e21ff11b373d39fa98a77f215c61027337ee Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=2878e21ff11b373d39fa98a77f215c61027337ee commit 2878e21ff11b373d39fa98a77f215c61027337ee Author: Emmanuel Vadot AuthorDate: 2023-02-01 07:49:18 +0000 Commit: Emmanuel Vadot CommitDate: 2023-02-08 07:52:17 +0000 devd: Move power_profile part in devd/power_profile.conf And make it part of the FreeBSD-acpi package. This avoid calling service power_profile on an installation without it installed. Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D38324 --- sbin/devd/Makefile | 5 +++++ sbin/devd/devd.conf | 7 ------- sbin/devd/power_profile.conf | 6 ++++++ 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/sbin/devd/Makefile b/sbin/devd/Makefile index 5b2feb6c2bdb..72c65caa3317 100644 --- a/sbin/devd/Makefile +++ b/sbin/devd/Makefile @@ -17,6 +17,11 @@ DHCLIENTDIR= ${DEVDDIR} DHCLIENT+= dhclient.conf DHCLIENTPACKAGE= dhclient +CONFGROUPS+= POWERPROFILE +POWERPROFILEDIR= ${DEVDDIR} +POWERPROFILE+= power_profile.conf +POWERPROFILEPACKAGE= acpi + .if ${MK_BLUETOOTH} != "no" CONFGROUPS+= BLUETOOTH BLUETOOTHDIR= ${DEVDDIR} diff --git a/sbin/devd/devd.conf b/sbin/devd/devd.conf index 43596fb9a9d5..d30f97c7abb0 100644 --- a/sbin/devd/devd.conf +++ b/sbin/devd/devd.conf @@ -145,13 +145,6 @@ nomatch 10 { vendor $vendor bus $bus"; }; -# Switch power profiles when the AC line state changes. -notify 10 { - match "system" "ACPI"; - match "subsystem" "ACAD"; - action "service power_profile $notify"; -}; - # Notify all users before beginning emergency shutdown when we get # a _CRT or _HOT thermal event and we're going to power down the system # very soon. diff --git a/sbin/devd/power_profile.conf b/sbin/devd/power_profile.conf new file mode 100644 index 000000000000..294856071f00 --- /dev/null +++ b/sbin/devd/power_profile.conf @@ -0,0 +1,6 @@ +# Switch power profiles when the AC line state changes. +notify 10 { + match "system" "ACPI"; + match "subsystem" "ACAD"; + action "service power_profile $notify"; +};