git: 9f5c4fbf6ca2 - stable/14 - release: stop disabling sendmail
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 14 Jan 2026 12:34:08 UTC
The branch stable/14 has been updated by bapt:
URL: https://cgit.FreeBSD.org/src/commit/?id=9f5c4fbf6ca2c8343ab10bb0178ebe3cf76076cd
commit 9f5c4fbf6ca2c8343ab10bb0178ebe3cf76076cd
Author: Baptiste Daroussin <bapt@FreeBSD.org>
AuthorDate: 2026-01-07 13:55:54 +0000
Commit: Baptiste Daroussin <bapt@FreeBSD.org>
CommitDate: 2026-01-14 12:33:40 +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
(cherry picked from commit d07198ff72aeddc5a884cfb81b22c22f2abf88f6)
---
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 6be1d689000b..d52171f955b2 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -203,7 +203,6 @@ disc1: packagesystem
.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 vfs.mountroot.timeout=\"10\" >> ${.TARGET}/boot/loader.conf
echo kernels_autodetect=\"NO\" >> ${.TARGET}/boot/loader.conf
@@ -243,7 +242,6 @@ bootonly: packagesystem
.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 vfs.mountroot.timeout=\"10\" >> ${.TARGET}/boot/loader.conf
echo kernels_autodetect=\"NO\" >> ${.TARGET}/boot/loader.conf
@@ -281,7 +279,6 @@ dvd: packagesystem
.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 vfs.mountroot.timeout=\"10\" >> ${.TARGET}/boot/loader.conf
echo kernels_autodetect=\"NO\" >> ${.TARGET}/boot/loader.conf
diff --git a/release/tools/arm.subr b/release/tools/arm.subr
index 6c53724ed52f..9adbe01700a9 100644
--- a/release/tools/arm.subr
+++ b/release/tools/arm.subr
@@ -211,10 +211,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 05d2d13bbb39..eed0bf62da3a 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 72c8dd9ded78..a68b36cb112e 100644
--- a/release/tools/oracle.conf
+++ b/release/tools/oracle.conf
@@ -42,7 +42,6 @@ export VM_RC_LIST="
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 2fc21911ce17..b57c7e0e0f9f 100644
--- a/release/tools/vagrant.conf
+++ b/release/tools/vagrant.conf
@@ -31,12 +31,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