From nobody Tue Jun 04 11:37:30 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 4VtpVL4ZcXz5NJ3S; Tue, 04 Jun 2024 11:37:30 +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 4VtpVL2tVdz4QQy; Tue, 4 Jun 2024 11:37:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717501050; 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=kEytbRpf+g+1EUqCocAHEVFnd6FHXxgai+0aFsG2RVw=; b=e+GS40sXZyxMwrhbHY7neBBGP71FR0pH87zf3Hy+IVCEK0SAtY8kcYToE/rV8zfqK8elNQ SZz0uzGVd/m63Skr4EqbjXHjRihkonq6wvMBQ4iAKkyvOUBzTtgCzAJk/Dv2IKdyGEoUNX tLhg4qOBmlrSgJiYNwr3FjBp6Jdu/OYPhLzEnuH95mvPs+TX5eccIPynSEyaKpyApqxFeO 9V3BR2hLbV7tYQ4proPTvBx+14u+YD+9ayh26V6z5t0sSx+3TEu29zbj5DFP9Q/Ul74CRo kVM4NCa4Mue5ECl/YSA/impYYvaLymjg1dyZPP9HYNS0SwJzJZeuhQQ/vukqdg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717501050; a=rsa-sha256; cv=none; b=akd7EVsEzN2lF5LVjei4Hm07k3wAmV1jYochobJF7kINixLbqBFqVQqp+DCgVBVE+7Yw+B iwnxS3uKjdGgWULO3/GlGPUW9LpKDGTHfreJ9AMp282HY6HftGm2jj7N9ECZGfnKhISP15 mjJ4Q0g/bMOA00N976HwkyRG+VNMOZ0H5xeFx8leOjEazTM87Xi9iEEmi6x/9m64Ha3LIO hlK18i+3tgKkBOhpND/HE4lMgOJejB3eQjhiZVbwi6z0cEq3bFeCzwMIShxlhq4wHHBfLO Ya9cWQsI/SXl3f8guTLQf8A/IBndKc9fFDZ0oA9g7cDjk+/vMupSYPv41mS+NQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717501050; 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=kEytbRpf+g+1EUqCocAHEVFnd6FHXxgai+0aFsG2RVw=; b=ddL/DO5a8XT2ZuJ2QAK+fusdgKBVUDRHdLcfeomgCUzB8cTwOOBJGnM0WvNsTS6uv7DFPK CjAC4JWOIQ0YPDwmdlROC+3w7SESSW33bmUHvcUe7GGEWjoRpcgIhT+XkzRPoWsWGo9usH 4il8a3Srqu18ykmYatMfcPzf9hfARTVV6UlPUGEPPU8qo8nEkbb0HLldZNjZ8LZPmocc4N nN76OpTq5gNybHF2TphNC3yH74XAGPHHUZPgBDvZ7/HBFE+xNCj4gZZH0J5TxkfPV8IP+N kfhN7d+lBG3OXQGvN66/GdSv/G0KCOxXoCn6OhJuPkhsPoJBfYZcPItjxBarAw== 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 4VtpVL2T5pzH2N; Tue, 4 Jun 2024 11:37:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 454BbUlC012369; Tue, 4 Jun 2024 11:37:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 454BbUIc012366; Tue, 4 Jun 2024 11:37:30 GMT (envelope-from git) Date: Tue, 4 Jun 2024 11:37:30 GMT Message-Id: <202406041137.454BbUIc012366@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 32fdac77b3d7 - stable/14 - devd: autofs: Move autofs related events to a separate file 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: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 32fdac77b3d76be73ebc6985f2be437dca1828cb Auto-Submitted: auto-generated The branch stable/14 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=32fdac77b3d76be73ebc6985f2be437dca1828cb commit 32fdac77b3d76be73ebc6985f2be437dca1828cb Author: Emmanuel Vadot AuthorDate: 2023-11-07 10:06:15 +0000 Commit: Emmanuel Vadot CommitDate: 2024-06-04 11:37:07 +0000 devd: autofs: Move autofs related events to a separate file If a user don't have FreeBSD-autofs installed there is no need to try calling automount on every GEOM event. It's also easier to add/delete autofs related event in a separate file. Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D42495 Reviewed by: imp (cherry picked from commit b3c116d50ecacaab5236e0488cb74c1bcf614ae7) --- sbin/devd/Makefile | 5 +++++ sbin/devd/autofs.conf | 9 +++++++++ sbin/devd/devd.conf | 7 ------- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/sbin/devd/Makefile b/sbin/devd/Makefile index f1a5f12ac478..20490c954031 100644 --- a/sbin/devd/Makefile +++ b/sbin/devd/Makefile @@ -11,6 +11,11 @@ DEVDDIR= /etc/devd DEVD+= asus.conf .endif +CONFGROUPS+= AUTOFS +AUTOFSDIR= ${DEVDDIR} +AUTOFS+= autofs.conf +AUTOFSPACKAGE= autofs + CONFGROUPS+= DHCLIENT DHCLIENTDIR= ${DEVDDIR} DHCLIENT+= dhclient.conf diff --git a/sbin/devd/autofs.conf b/sbin/devd/autofs.conf new file mode 100644 index 000000000000..a06ca7295d38 --- /dev/null +++ b/sbin/devd/autofs.conf @@ -0,0 +1,9 @@ +# +# autofs(5) specific devd events + +# Discard autofs caches, useful for the -media special map. +notify 100 { + match "system" "GEOM"; + match "subsystem" "DEV"; + action "/usr/sbin/automount -c"; +}; diff --git a/sbin/devd/devd.conf b/sbin/devd/devd.conf index ea8421e76d61..50dbf19ffd4a 100644 --- a/sbin/devd/devd.conf +++ b/sbin/devd/devd.conf @@ -159,13 +159,6 @@ notify 0 { action "service postgresql restart"; }; -# Discard autofs caches, useful for the -media special map. -notify 100 { - match "system" "GEOM"; - match "subsystem" "DEV"; - action "/usr/sbin/automount -c"; -}; - # Handle userland coredumps. # This commented out handler makes it possible to run an # automated debugging session after the core dump is generated.