Page MenuHomeFreeBSD
Files F141918641

D54575.diff
No OneTemporary
Actions

D54575.diff
View Options

diff --git a/release/Makefile b/release/Makefile
--- a/release/Makefile
+++ b/release/Makefile
@@ -278,7 +278,6 @@
.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 @@
.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 @@
.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
--- a/release/tools/arm.subr
+++ b/release/tools/arm.subr
@@ -209,10 +209,6 @@
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
--- a/release/tools/openstack.conf
+++ b/release/tools/openstack.conf
@@ -22,12 +22,6 @@
# 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
--- a/release/tools/oracle.conf
+++ b/release/tools/oracle.conf
@@ -55,7 +55,6 @@
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
--- a/release/tools/vagrant.conf
+++ b/release/tools/vagrant.conf
@@ -33,12 +33,6 @@
# 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

File Metadata

Mime Type
text/plain
Expires
Tue, Jan 13, 12:35 PM (4 h, 38 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27623325
Default Alt Text
D54575.diff (3 KB)

Event Timeline