git: d07198ff72ae - main - release: stop disabling sendmail

The branch main has been updated by bapt:

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

commit d07198ff72aeddc5a884cfb81b22c22f2abf88f6
Author:     Baptiste Daroussin <bapt@FreeBSD.org>
AuthorDate: 2026-01-07 13:55:54 +0000
Commit:     Baptiste Daroussin <bapt@FreeBSD.org>
CommitDate: 2026-01-07 14:19:43 +0000

    release: stop disabling sendmail
    
    sendmail is already disabled by default everywhere since 14.0
    
    MFC After:      1 week
    Approved by:    emaste (re)
    Reviewed by:    emaste (re)
    Differential Revision:  https://reviews.freebsd.org/D54575
---
 release/Makefile             | 3 ---
 release/tools/arm.subr       | 4 ----
 release/tools/openstack.conf | 6 ------
 release/tools/oracle.conf    | 1 -
 release/tools/vagrant.conf   | 6 ------
 5 files changed, 20 deletions(-)

diff --git a/release/Makefile b/release/Makefile
index 230eb66fc077..bcc640075bf0 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -278,7 +278,6 @@ disc1:
 .endif
 # Set up installation environment
 	ln -fs /tmp/bsdinstall_etc/resolv.conf ${.TARGET}/etc/resolv.conf
-	echo sendmail_enable=\"NONE\" > ${.TARGET}/etc/rc.conf
 	echo hostid_enable=\"NO\" >> ${.TARGET}/etc/rc.conf
 	echo debug.witness.trace=0 >> ${.TARGET}/etc/sysctl.conf
 	echo vfs.mountroot.timeout=\"10\" >> ${.TARGET}/boot/loader.conf
@@ -323,7 +322,6 @@ bootonly:
 .endif
 # Set up installation environment
 	ln -fs /tmp/bsdinstall_etc/resolv.conf ${.TARGET}/etc/resolv.conf
-	echo sendmail_enable=\"NONE\" > ${.TARGET}/etc/rc.conf
 	echo hostid_enable=\"NO\" >> ${.TARGET}/etc/rc.conf
 	echo debug.witness.trace=0 >> ${.TARGET}/etc/sysctl.conf
 	echo vfs.mountroot.timeout=\"10\" >> ${.TARGET}/boot/loader.conf
@@ -382,7 +380,6 @@ dvd:
 .endif
 # Set up installation environment
 	ln -fs /tmp/bsdinstall_etc/resolv.conf ${.TARGET}/etc/resolv.conf
-	echo sendmail_enable=\"NONE\" > ${.TARGET}/etc/rc.conf
 	echo hostid_enable=\"NO\" >> ${.TARGET}/etc/rc.conf
 	echo debug.witness.trace=0 >> ${.TARGET}/etc/sysctl.conf
 	echo vfs.mountroot.timeout=\"10\" >> ${.TARGET}/boot/loader.conf
diff --git a/release/tools/arm.subr b/release/tools/arm.subr
index 5c5ebd29681d..55e918e36d97 100644
--- a/release/tools/arm.subr
+++ b/release/tools/arm.subr
@@ -209,10 +209,6 @@ arm_install_base() {
 	echo "hostname=\"${hostname}\"" > ${CHROOTDIR}/${DESTDIR}/etc/rc.conf
 	echo 'ifconfig_DEFAULT="DHCP inet6 accept_rtadv"' >> ${CHROOTDIR}/${DESTDIR}/etc/rc.conf
 	echo 'sshd_enable="YES"' >> ${CHROOTDIR}/${DESTDIR}/etc/rc.conf
-	echo 'sendmail_enable="NONE"' >> ${CHROOTDIR}/${DESTDIR}/etc/rc.conf
-	echo 'sendmail_submit_enable="NO"' >> ${CHROOTDIR}/${DESTDIR}/etc/rc.conf
-	echo 'sendmail_outbound_enable="NO"' >> ${CHROOTDIR}/${DESTDIR}/etc/rc.conf
-	echo 'sendmail_msp_queue_enable="NO"' >> ${CHROOTDIR}/${DESTDIR}/etc/rc.conf
 	echo 'growfs_enable="YES"' >> ${CHROOTDIR}/${DESTDIR}/etc/rc.conf
 	if [ -n "${CONFIG_POWERD_ENABLE}" ]; then
 		echo 'powerd_enable="YES"' >> ${CHROOTDIR}/${DESTDIR}/etc/rc.conf
diff --git a/release/tools/openstack.conf b/release/tools/openstack.conf
index b73734a4fd04..9ce65a75c3c5 100644
--- a/release/tools/openstack.conf
+++ b/release/tools/openstack.conf
@@ -22,12 +22,6 @@ vm_extra_pre_umount() {
 	# Allow root to ssh using keys
 	echo 'PermitRootLogin without-password' >> ${DESTDIR}/etc/ssh/sshd_config
 
-	# Disable sendmail
-	echo 'sendmail_enable="NO"' >> ${DESTDIR}/etc/rc.conf
-	echo 'sendmail_submit_enable="NO"' >> ${DESTDIR}/etc/rc.conf
-	echo 'sendmail_outbound_enable="NO"' >> ${DESTDIR}/etc/rc.conf
-	echo 'sendmail_msp_queue_enable="NO"' >> ${DESTDIR}/etc/rc.conf
-
 	# Enable DHCP for the OpenStack instance
 	echo 'ifconfig_DEFAULT="SYNCDHCP"' >> ${DESTDIR}/etc/rc.conf
 
diff --git a/release/tools/oracle.conf b/release/tools/oracle.conf
index 152c48af1829..b289f4e4e7e7 100644
--- a/release/tools/oracle.conf
+++ b/release/tools/oracle.conf
@@ -55,7 +55,6 @@ MISSING_METALOGS="
 vm_extra_pre_umount() {
 	cat <<-'EOF' >> ${DESTDIR}/etc/rc.conf
 		dumpdev=AUTO
-		sendmail_enable=NONE
 EOF
 
 	cat <<-'EOF' >> ${DESTDIR}/boot/loader.conf
diff --git a/release/tools/vagrant.conf b/release/tools/vagrant.conf
index 5b0f38b740a6..6f4420bf26cc 100644
--- a/release/tools/vagrant.conf
+++ b/release/tools/vagrant.conf
@@ -33,12 +33,6 @@ vagrant_common () {
 	# Disable DNS lookups by default to make SSH connect quickly
 	echo 'UseDNS no' >> ${DESTDIR}/etc/ssh/sshd_config
 
-	# Disable sendmail
-	echo 'sendmail_enable="NO"' >> ${DESTDIR}/etc/rc.conf
-	echo 'sendmail_submit_enable="NO"' >> ${DESTDIR}/etc/rc.conf
-	echo 'sendmail_outbound_enable="NO"' >> ${DESTDIR}/etc/rc.conf
-	echo 'sendmail_msp_queue_enable="NO"' >> ${DESTDIR}/etc/rc.conf
-
 	# Create the vagrant user with a password of vagrant
 	/usr/sbin/pw -R ${DESTDIR} \
 		groupadd vagrant -g 1001