From nobody Sun Mar 23 15:35:11 2025 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 4ZLKxr0HW4z5rS1x; Sun, 23 Mar 2025 15:35:12 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZLKxq6ZVfz3r6p; Sun, 23 Mar 2025 15:35:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742744111; 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=HVIFfaqMJHFKaJGl02iI+WVdeUpe5FzJAMBgbERM4Aw=; b=XfVqnx/ccZ1qRPOZVoSeOioEPv7D1F2TlC8TZn1WN6No4RLS437mkfDxMC/vlF/Hts+vwa T8ats6txIFO65en1FKFPH+YlRz3x3gVE30nqbn+WLAX7U3z+DdgWv2i06qYZJntj6jOWPl fTelc0fGMjyZOK2zVwdn3RMAGo8IsNiO2AuVstm40bAq/R4H/gem8OPPZ0qrvtS7KDjrZo xiWhWjVi9sToRUkofafGMIq+zgOTAQ7AxrO1MkqAMztr3HCJKZbHp5PH1QT9E2VcX71TrC o7B+cUc1yG7KKs9USSz/NDRDj88+aPeQ/hwXrY8SV4jV2Ch+cvUN1nB1y+n3QQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742744111; a=rsa-sha256; cv=none; b=W70S3BYfp1swiJt1f24cNDupqcH1rHhGt2vTXcl0GuakYuXRNHdEIsVbMxADo4vaKL59md U/hr7hOPNNWcnFRxat3B++l9vKT/OIUTf0+ReRfCI6QuNscX63bU0FKW8nO9M9TdxKyW4w gh7RR1KCrpTkOHAdfvRxTTrCk4/7H720MxA4+9bg29gkZ/UFtS2orfxqjwR6nuxZoX+Ahq gIp9RsLO32HAT6sf+CZkvzxSSfhcHIZ4X1ayBMPn6neqY3IYLu+qXEACImDt0MXz1vtMSL ENNGlqLR1P3Wb2q4d4oSr25GkByQvomM7oHus1SXNB8WxnJquxzo/rRE6WnIvQ== 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=1742744111; 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=HVIFfaqMJHFKaJGl02iI+WVdeUpe5FzJAMBgbERM4Aw=; b=i3RuoKD11kWZbQJr53NnLJIryi8i2aoueShhTMteZZIsM6/aI3k3TIv5OrdW3X+WD0oX63 Syynn3NvMdGcCEqmIek1l3ikVFyimF9ezqXlDyzCOBfktLZ8zwtyJhL4lyPYVR09Mmxsih /LVy7ypj0MCPNPVbPuye28WHhwLdeL8Yo3jMogxzgwZRTMRd+BafuDW4efGjFfMPM3Mn7C ZlvdIaymePAO0kdYrp71vDcEDjoJIeEPHYLUI+0aBcAhzY+Tkkv7hcz+4q9xZhj4m41AYi BOakXX+01xYRavNf280mNp6ppKRWM5b5+VGIiV5rQbZ2ZPqPZ24s04N0ZP6+2A== 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 4ZLKxq66QVz1C57; Sun, 23 Mar 2025 15:35:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52NFZBpa054936; Sun, 23 Mar 2025 15:35:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52NFZBH1054933; Sun, 23 Mar 2025 15:35:11 GMT (envelope-from git) Date: Sun, 23 Mar 2025 15:35:11 GMT Message-Id: <202503231535.52NFZBH1054933@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Tijl Coosemans Subject: git: 487d79d44f8a - stable/14 - devd: Don't install autofs.conf with WITHOUT_AUTOFS 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: tijl X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 487d79d44f8a7a31edeaabf43b96e5f1af028f17 Auto-Submitted: auto-generated The branch stable/14 has been updated by tijl: URL: https://cgit.FreeBSD.org/src/commit/?id=487d79d44f8a7a31edeaabf43b96e5f1af028f17 commit 487d79d44f8a7a31edeaabf43b96e5f1af028f17 Author: Tijl Coosemans AuthorDate: 2023-12-22 14:14:55 +0000 Commit: Tijl Coosemans 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