From nobody Fri Dec 22 14:28:43 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 4SxV633t1wz55HPY; Fri, 22 Dec 2023 14:28:43 +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 4SxV633Jr1z3HqH; Fri, 22 Dec 2023 14:28:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703255323; 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=g6YzTpk+lFcEikhO/QwCEQZ6naIIqpAToPqHXKAvNCg=; b=eFoDabXCttmufCXJUmKIvayp42cDGSmYKG6dUhnD7xo27zaU9isSo+Qm7/mJVu7fPTbAyB UnPQLVRZS92uFoK0L5tYBNgJGI5xVMHrgKeRh2YVPEs3fofsRB6ySlw1TeobmmrHwUcP3V KUmFQus4TRdfMokOHfFWZKWpB24U1PeBe2dIe1V1LYjg1zAs7DnGFruSROrg1InYQQGYIF 2JyT/LnwlY2bHNc8p//aw5jYiS+jYNNJ6v6p5qSpGY2gn7eM5JJ6HYWjdIgOlWFi1cBP5A pRi9uSxjfTO0UVSn1o6Oa9aDmkjN3MdzwnkZ92Dqi3SASagnQ/D8g54YD8jDiQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703255323; a=rsa-sha256; cv=none; b=txN5Pe8n5xhZoJ5K5jIobQ0t6/rWSoWmBg+cW3sl8Xd/BlblImn2AvvdsUkqyptY9R11xB rZQiWWShVr2OYHVc3BpKtCAfp8wDtpM0LVVBwqawxonQ+qr4QRJADcOaH9D6eoKfsrZ+Ip d/iErXOZFXUO8HgX4Pn6vqSVYQDzPJEaICBgPsR2Bgbm8rCZFGXfg3EZ50DePgfpivcqwS XzLUWt3JpS+5j1pkXAFP2tR36Tu9biqRUf99Zj3gA6b54P+iFPS0hKQ19Qk2tRbur7HPGE IwD14KQV3I86bQdAEA+gcUbOTNXT6Flbo3xcmcUH/VECwFGRGM3Chi9+GIDxdw== 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=1703255323; 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=g6YzTpk+lFcEikhO/QwCEQZ6naIIqpAToPqHXKAvNCg=; b=g7d4tHk2ZCCh5QI4DunRqpyXKV4ujg/DXLIvhm3dZPT5zffS4h/GEcsRlz2iAnu3YKsOXy dKuIjNczhZOYE6e1xejs87cotZfJt8Z3DqXUo/X8f15/2+G4cKuWo+P1GqnZKo9SXZzVpk 38AosI2CHdHq8AvqZ1WC/DB85B3/7P9lwqSfC3qqvOhzgkWSvjxoEqE8PI9HTZIjWDc5Jy BUJboKBh+u2kpYk+ZuOuIOWORKYRR1cufimV1ji8msfbPMI6qevvukqMw/YfJoz6fgg6Je T9VTi7N0jV1YsrbApT9QPCrjPRww7hEbMq6Ja5BPhhkRyZkGQCON2zxSH8PkfA== 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 4SxV632Lnjz4m1; Fri, 22 Dec 2023 14:28:43 +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 3BMESh28059925; Fri, 22 Dec 2023 14:28:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BMEShO7059922; Fri, 22 Dec 2023 14:28:43 GMT (envelope-from git) Date: Fri, 22 Dec 2023 14:28:43 GMT Message-Id: <202312221428.3BMEShO7059922@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Tijl Coosemans Subject: git: 272b4b764bdf - main - devd: Don't install autofs.conf with WITHOUT_AUTOFS 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: tijl X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 272b4b764bdfb563f655da37ef9ec8c01c77f386 Auto-Submitted: auto-generated The branch main has been updated by tijl: URL: https://cgit.FreeBSD.org/src/commit/?id=272b4b764bdfb563f655da37ef9ec8c01c77f386 commit 272b4b764bdfb563f655da37ef9ec8c01c77f386 Author: Tijl Coosemans AuthorDate: 2023-12-22 14:14:55 +0000 Commit: Tijl Coosemans CommitDate: 2023-12-22 14:27:50 +0000 devd: Don't install autofs.conf with WITHOUT_AUTOFS --- 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 68ff477f09c9..09a8ed5898e1 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 bc244d18ab39..f9850b7b2e22 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