Quoting Peter Wemm, "At great personal risk, touch the sendmail startup

again."

As an alternative to sendmail_enable=NONE, solve the boot time problem
for non-sendmail users completely by moving all of the sendmail startup
code from /etc/rc to /etc/rc.sendmail.  The source for that script will
be kept in src/etc/sendmail/rc.sendmail so make.conf's NO_SENDMAIL will
prevent it from being installed.  A new rc.conf variable,
mta_start_script specifies the script to run to start the user's
preferred MTA.  For backward compatibility, it will default to
/etc/rc.sendmail.  The specified script is called out of /etc/rc after
checking to make sure it exists.  A new rc.sendmail.8 man page has also
been added which now houses the sendmail_* variable descriptions
formerly in rc.conf.5.

Use /etc/rc.sendmail in /etc/mail/Makefile to reduce code duplication.

Reviewed by:	-current, -stable, obrien, peter, ru
MFC after:	1 week

1 files changed, 18 insertions, 9 deletions

diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf
index 32bf9b3..b25d6ac 100644
--- a/etc/defaults/rc.conf
+++ b/etc/defaults/rc.conf
@@ -324,17 +324,12 @@ allscreens_kbdflags=""	# Set this kbdcontrol mode for all virtual screens
 
 
 ##############################################################
-###  Miscellaneous administrative options  ###################
+###  Mail Transfer Agent (MTA) options  ######################
 ##############################################################
 
-cron_enable="YES"	# Run the periodic job daemon.
-cron_program="/usr/sbin/cron"	# Which cron executable to run (if enabled).
-cron_flags=""		# Which options to pass to the cron daemon.
-lpd_enable="NO"		# Run the line printer daemon.
-lpd_program="/usr/sbin/lpd"	# path to lpd, if you want a different one.
-lpd_flags=""		# Flags to lpd (if enabled).
-usbd_enable="NO"	# Run the usbd daemon.
-usbd_flags=""		# Flags to usbd (if enabled).
+mta_start_script="/etc/rc.sendmail"
+			# Script to start your chosen MTA, called by /etc/rc.
+# Settings for /etc/rc.sendmail:
 sendmail_enable="NO"	# Run the sendmail inbound daemon (YES/NO/NONE).
 			# If NONE, don't start any sendmail processes.
 sendmail_flags="-L sm-mta -bd -q30m" # Flags to sendmail (as a server)
@@ -346,6 +341,20 @@ sendmail_outbound_flags="-L sm-queue -q30m" # Flags to sendmail (outbound only)
 sendmail_msp_queue_enable="YES"	# Dequeue stuck clientmqueue mail (YES/NO).
 sendmail_msp_queue_flags="-L sm-msp-queue -Ac -q30m"
 				# Flags for sendmail_msp_queue daemon.
+
+
+##############################################################
+###  Miscellaneous administrative options  ###################
+##############################################################
+
+cron_enable="YES"	# Run the periodic job daemon.
+cron_program="/usr/sbin/cron"	# Which cron executable to run (if enabled).
+cron_flags=""		# Which options to pass to the cron daemon.
+lpd_enable="NO"		# Run the line printer daemon.
+lpd_program="/usr/sbin/lpd"	# path to lpd, if you want a different one.
+lpd_flags=""		# Flags to lpd (if enabled).
+usbd_enable="NO"	# Run the usbd daemon.
+usbd_flags=""		# Flags to usbd (if enabled).
 dumpdev="NO"		# Device name to crashdump to (or NO).
 dumpdir="/var/crash"	# Directory where crash dumps are to be stored
 savecore_flags=""	# Used if dumpdev is enabled above, and present.