From owner-p4-projects@FreeBSD.ORG  Sun Jul 10 22:52:13 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 91C6716A420; Sun, 10 Jul 2005 22:52:12 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 656A116A41F
	for <perforce@freebsd.org>; Sun, 10 Jul 2005 22:52:12 +0000 (GMT)
	(envelope-from soc-andrew@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2E1AB43D48
	for <perforce@freebsd.org>; Sun, 10 Jul 2005 22:52:12 +0000 (GMT)
	(envelope-from soc-andrew@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6AMqCYV039670
	for <perforce@freebsd.org>; Sun, 10 Jul 2005 22:52:12 GMT
	(envelope-from soc-andrew@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6AMqCL8039667
	for perforce@freebsd.org; Sun, 10 Jul 2005 22:52:12 GMT
	(envelope-from soc-andrew@freebsd.org)
Date: Sun, 10 Jul 2005 22:52:12 GMT
Message-Id: <200507102252.j6AMqCL8039667@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	soc-andrew@freebsd.org using -f
From: soc-andrew <soc-andrew@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 79941 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 10 Jul 2005 22:52:13 -0000

http://perforce.freebsd.org/chv.cgi?CH=79941

Change 79941 by soc-andrew@soc-andrew_serv on 2005/07/10 22:51:30

	Add lines to rc.conf to stop unneeded thingd from being run and remove an i386ism

Affected files ...

.. //depot/projects/soc2005/bsdinstaller/src/release/Makefile#6 edit

Differences ...

==== //depot/projects/soc2005/bsdinstaller/src/release/Makefile#6 (text+ko) ====

@@ -773,8 +773,15 @@
 		mkdir ${RD}/bsdinstaller/root/$$dir; \
 	done )
 	@echo "/dev/acd0 /usr cd9660 ro 0 0" > ${RD}/bsdinstaller/root/etc/fstab
+	@echo "sendmail_enable=\"NONE\"" > ${RD}/bsdinstaller/root/etc/rc.conf
+	@echo "cron_enable=\"NO\"" >> ${RD}/bsdinstaller/root/etc/rc.conf
+	@echo "devd_enable=\"NO\"" >> ${RD}/bsdinstaller/root/etc/rc.conf
+	@echo "syslogd_enable=\"NO\"" >> ${RD}/bsdinstaller/root/etc/rc.conf
 	@cat ${.CURDIR}/bsdinstaller/gettytab >> ${RD}/bsdinstaller/root/etc/gettytab
-	cp ${.CURDIR}/bsdinstaller/ttys.i386 ${RD}/bsdinstaller/root/etc/ttys
+	( if [ -f ${.CURDIR}/bsdinstaller/ttys.${TARGET_ARCH} ]; then \
+	    cp ${.CURDIR}/bsdinstaller/ttys.${TARGET_ARCH} \
+	        ${RD}/bsdinstaller/root/etc/ttys; \
+	fi )
 	cp ${.CURDIR}/bsdinstaller/bsdinstaller_shell.sh ${RD}/bsdinstaller/root/
 	chmod u+x ${RD}/bsdinstaller/root/bsdinstaller_shell.sh
 	cp ${RD}/bsdinstaller/root/etc/master.passwd ${RD}/bsdinstaller/master.passwd