git: 487d79d44f8a - stable/14 - devd: Don't install autofs.conf with WITHOUT_AUTOFS

From: Tijl Coosemans <tijl_at_FreeBSD.org>
Date: Sun, 23 Mar 2025 15:35:11 UTC 
The branch stable/14 has been updated by tijl:

URL: https://cgit.FreeBSD.org/src/commit/?id=487d79d44f8a7a31edeaabf43b96e5f1af028f17

commit 487d79d44f8a7a31edeaabf43b96e5f1af028f17
Author:     Tijl Coosemans <tijl@FreeBSD.org>
AuthorDate: 2023-12-22 14:14:55 +0000
Commit:     Tijl Coosemans <tijl@FreeBSD.org>
CommitDate: 2025-03-23 15:32:33 +0000

    devd: Don't install autofs.conf with WITHOUT_AUTOFS
    
    (cherry picked from commit 272b4b764bdfb563f655da37ef9ec8c01c77f386)
---
 sbin/devd/Makefile                       | 2 ++
 tools/build/mk/OptionalObsoleteFiles.inc | 1 +
 2 files changed, 3 insertions(+)

diff --git a/sbin/devd/Makefile b/sbin/devd/Makefile
index 20490c954031..1d9023e9c5bc 100644
--- a/sbin/devd/Makefile
+++ b/sbin/devd/Makefile
@@ -11,10 +11,12 @@ DEVDDIR=	/etc/devd
 DEVD+=	asus.conf
 .endif
 
+.if ${MK_AUTOFS} != "no"
 CONFGROUPS+=		AUTOFS
 AUTOFSDIR=		${DEVDDIR}
 AUTOFS+=		autofs.conf
 AUTOFSPACKAGE=		autofs
+.endif
 
 CONFGROUPS+=		DHCLIENT
 DHCLIENTDIR=		${DEVDDIR}
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 6af2a2e33eb0..b985adbd1e0b 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -127,6 +127,7 @@ OLD_FILES+=etc/autofs/special_media
 OLD_FILES+=etc/autofs/special_noauto
 OLD_FILES+=etc/autofs/special_null
 OLD_FILES+=etc/auto_master
+OLD_FILES+=etc/devd/autofs.conf
 OLD_FILES+=etc/rc.d/automount
 OLD_FILES+=etc/rc.d/automountd
 OLD_FILES+=etc/rc.d/autounmountd