From: millert <millert@openbsd.org>
Date: Tue, 4 Apr 2000 13:58:28 +0000 (+0000)
Subject: Make sure /etc/netstart references /etc/mail/sendmail.cf, not
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=f3e5344b99b582b8fd5654d074a9c31ae78b6478;p=openbsd

Make sure /etc/netstart references /etc/mail/sendmail.cf, not
/etc/sendmail.cf or on reboot sendmail will not be started.
---

diff --git a/gnu/usr.sbin/sendmail/sendmail/Makefile b/gnu/usr.sbin/sendmail/sendmail/Makefile
index 1994c8d7b03..7740db50317 100644
--- a/gnu/usr.sbin/sendmail/sendmail/Makefile
+++ b/gnu/usr.sbin/sendmail/sendmail/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.3 2000/04/04 04:50:14 millert Exp $
+#	$OpenBSD: Makefile,v 1.4 2000/04/04 13:58:28 millert Exp $
 
 PROG=	sendmail
 
@@ -28,6 +28,10 @@ beforeinstall:
 			echo "Warning: both /etc/mail/sendmail.cf and /etc/sendmail.cf exist.  Sendmail will use /etc/mail/sendmail.cf."; \
 		fi ; \
 	fi
+	@if test -f /etc/netstart && grep -q /etc/sendmail.cf /etc/netstart; \
+	    then echo "Error: /etc/netstart must check for /etc/mail/sendmail.cf, not /etc/sendmail.cf"; \
+	    false; \
+	fi
 	${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
 	    ${.CURDIR}/helpfile ${DESTDIR}/etc/mail/helpfile
 	${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 644 \