From owner-p4-projects@FreeBSD.ORG  Mon Dec 12 07:03:28 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 B41A916A422; Mon, 12 Dec 2005 07:03:27 +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 87BF416A41F
	for <perforce@freebsd.org>; Mon, 12 Dec 2005 07:03:27 +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 2F7D243D5F
	for <perforce@freebsd.org>; Mon, 12 Dec 2005 07:03:27 +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 jBC73RY5002201
	for <perforce@freebsd.org>; Mon, 12 Dec 2005 07:03:27 GMT
	(envelope-from soc-andrew@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jBC73QTM002198
	for perforce@freebsd.org; Mon, 12 Dec 2005 07:03:26 GMT
	(envelope-from soc-andrew@freebsd.org)
Date: Mon, 12 Dec 2005 07:03:26 GMT
Message-Id: <200512120703.jBC73QTM002198@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 88060 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: Mon, 12 Dec 2005 07:03:29 -0000

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

Change 88060 by soc-andrew@soc-andrew_serv on 2005/12/12 07:03:01

	Fix the name of the Select Distributions menu [1]
	Add a note that the base distribution is required [1]
	Don't make the kern.geom.debugflags sysctl 16 as it is unneeded [1]
	Fix vi by creating /var/tmp
	
	[1] Noticed by: marius (dot) nuennerich (At) gmx (dot) net

Affected files ...

.. //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/inst/430_select_dists.lua#3 edit
.. //depot/projects/soc2005/bsdinstaller/src/release/Makefile#19 edit

Differences ...

==== //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/inst/430_select_dists.lua#3 (text+ko) ====

@@ -16,8 +16,9 @@
 	end
 	local response = App.ui:present({
 		id = "select_dists",
-		name = _("Select Packages"),
-		short_desc = _("Select the distributions you wish to install."),
+		name = _("Select Distributions"),
+		short_desc = _("Select the distributions you wish to " ..
+		    "install. The `base' distribution is required."),
 		multiple = "true",
 		actions = {
 			{

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

@@ -785,7 +785,6 @@
 	@echo "dumpdev=\"NO\"" >> ${RD}/bsdinstaller/root/etc/rc.conf
 	@echo "syslogd_enable=\"NO\"" >> ${RD}/bsdinstaller/root/etc/rc.conf
 	@echo "update_motd=\"NO\"" >> ${RD}/bsdinstaller/root/etc/rc.conf
-	@echo "kern.geom.debugflags=16" >> ${RD}/bsdinstaller/root/etc/sysctl.conf
 	@cat ${.CURDIR}/bsdinstaller/gettytab >> ${RD}/bsdinstaller/root/etc/gettytab
 	( if [ -f ${.CURDIR}/bsdinstaller/ttys.${TARGET_ARCH} ]; then \
 	    cp ${.CURDIR}/bsdinstaller/ttys.${TARGET_ARCH} \
@@ -794,6 +793,7 @@
 	@mkdir -p ${RD}/bsdinstaller/root/var/db
 	@mkdir -p ${RD}/bsdinstaller/root/var/empty
 	@mkdir -p ${RD}/bsdinstaller/root/var/run
+	@mkdir -p ${RD}/bsdinstaller/root/var/tmp
 	cp ${.CURDIR}/bsdinstaller/bsdinstaller_shell.sh ${RD}/bsdinstaller/root/
 	chmod u+x ${RD}/bsdinstaller/root/bsdinstaller_shell.sh
 	cp ${.CURDIR}/bsdinstaller/bsdinstaller ${RD}/bsdinstaller/root/etc/rc.d/