From cd7393b94051f11e7ecfda263a475d2e7971c193 Mon Sep 17 00:00:00 2001 From: gshapiro Date: Fri, 5 Apr 2002 02:30:49 +0000 Subject: 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 --- etc/sendmail/Makefile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'etc/sendmail/Makefile') diff --git a/etc/sendmail/Makefile b/etc/sendmail/Makefile index dd87e16..3a39a1c 100644 --- a/etc/sendmail/Makefile +++ b/etc/sendmail/Makefile @@ -82,6 +82,8 @@ distribution: freebsd.cf freebsd.mc ${INSTALL_CF} @echo ">>> ERROR: Both SENDMAIL_CF and SENDMAIL_MC can not be set" @false .endif + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 ${.CURDIR}/rc.sendmail \ + ${DESTDIR}/etc ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 ${.CURDIR}/freebsd.mc \ ${DESTDIR}/etc/mail/freebsd.mc ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 freebsd.cf \ -- cgit v1.1