From nobody Fri Nov 24 09:45:45 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 4Sc98T3qDVz520h5; Fri, 24 Nov 2023 09:45:45 +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 4Sc98T1qkJz4DMF; Fri, 24 Nov 2023 09:45:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700819145; 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=Qsv20WIi/a48/HaqTM1AOzZfaaZxu4KAPWnR2h/0jhk=; b=M5WMEEWoQtGiubau5Whm4Q/DDhBTUfuN6VlWXTTIf74tUyNoVIRVoT+qtqTn5YTq4630+S I+7YsGMB4tKEAPYuhr7LUpLs8mrFe1PhVyxPAHz75yC4L7GN9UOTzSNlHOIgb+CKMrjSl9 MUoDexD/ylMSUqn93ezD5gXlDCJHRLBw42DG1JmoXRz9ksZ+ILaoh40KQXDtvBxRQnemwF +RAufXZqWRR8Inns6rrGZpmOruz9e1YOQ422VM/EYcRMYzRfBu4pVLHvGwnaatL1K7LuDb XLHDuq4KhhUXcWfjEr0k7s+pAkEgIX92d6TahUBofr533zmb8iR6G51mX8z6pw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700819145; 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=Qsv20WIi/a48/HaqTM1AOzZfaaZxu4KAPWnR2h/0jhk=; b=MA0AIaxN1VrMbCLw1QsnExIEbfQPOd+lw49aHgVSg9Y+WV99pltU0FcpahykGYGTng8Cyk SYXB/2nocPvmpHZ/Sb9BvTh6bFkNErdjl1tJIpu4zu9vmSXd4WGNCocNpeOvpyqhb+bCAg FGvnl04RNqnLS3L9WCAaAcu81OWRFGw0dMNTW1bSgGejEvk8c9Kmf7lLxgt/K2V4Y/4fYg r0q6iVHp5gzG46JkLbNlVCXTt/qUnYsWkopyzl5QAOCz6Zm3ql1zav0tDxZBkYiv3+mXi7 6/ibgAt54ef5nAcRoyaVwRZVzzg9dOc8CMCI0uXptk3/KKzb2VT2//6dCnJAqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700819145; a=rsa-sha256; cv=none; b=se4IVA2jKB9hvI3ujATeKE6iBZSXyqae+BfrZpiVlMA5GkXeIVOYTxCJICGn0qb/wEnA2t l6EeFVlwRIMnGJTHKwDyM8jvnTuypsCCv/+B3wXV/9v4M7rZyUDzWTgyyzDHVYvCDHmK5g SOAkIFTDIiTIDys/h6NZ2EIC5gkiaWCZC31RS4KlkKMYDR72wTF48w43ej/JvzK8bwwR8W zU5IHqPQi8voQWZ7OZR+Z2vKvVurEPIzhvxZL4ysJPpxxESUZL6G0OIgkA/bd7u7sYNdvd H/0Uhc1AjXm5TvvlGLQiNIBF5pxYGP3ASvUU78uoKMTASnXk7v5+99Pzfjc58A== 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 4Sc98T0vkNzgR4; Fri, 24 Nov 2023 09:45:45 +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 3AO9jjWd079898; Fri, 24 Nov 2023 09:45:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AO9jj8d079895; Fri, 24 Nov 2023 09:45:45 GMT (envelope-from git) Date: Fri, 24 Nov 2023 09:45:45 GMT Message-Id: <202311240945.3AO9jj8d079895@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: b3c116d50eca - main - devd: autofs: Move autofs related events to a separate file 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: b3c116d50ecacaab5236e0488cb74c1bcf614ae7 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=b3c116d50ecacaab5236e0488cb74c1bcf614ae7 commit b3c116d50ecacaab5236e0488cb74c1bcf614ae7 Author: Emmanuel Vadot AuthorDate: 2023-11-07 10:06:15 +0000 Commit: Emmanuel Vadot CommitDate: 2023-11-24 09:45:03 +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 --- 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 7f334ad6b409..68ff477f09c9 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 d793dd296437..08cbeb840b2f 100644 --- a/sbin/devd/devd.conf +++ b/sbin/devd/devd.conf @@ -136,13 +136,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.