From owner-p4-projects@FreeBSD.ORG Wed Mar 1 05:51:29 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 145D616A425; Wed, 1 Mar 2006 05:51:29 +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 E2E6316A420 for ; Wed, 1 Mar 2006 05:51:28 +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 610A543D53 for ; Wed, 1 Mar 2006 05:51:28 +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 k215pSYk002412 for ; Wed, 1 Mar 2006 05:51:28 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k215pS4t002409 for perforce@freebsd.org; Wed, 1 Mar 2006 05:51:28 GMT (envelope-from soc-andrew@freebsd.org) Date: Wed, 1 Mar 2006 05:51:28 GMT Message-Id: <200603010551.k215pS4t002409@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 92561 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2006 05:51:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=92561 Change 92561 by soc-andrew@soc-andrew_serv on 2006/03/01 05:51:27 Catchup to the BSD Installer cvs HEAD Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/conf/DragonFly.lua#2 edit .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/install/220_format_disk.lua#4 edit Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/conf/DragonFly.lua#2 (text+ko) ==== @@ -1,13 +1,42 @@ -- -- conf/DragonFly.lua --- $Id: DragonFly.lua,v 1.7 2005/08/31 17:12:08 cpressey Exp $ +-- $Id: DragonFly.lua,v 1.8 2005/12/21 22:49:26 cpressey Exp $ -- -- This file contains DragonFly-specific overrides to BSDInstaller.lua. -- os = { name = "DragonFly BSD", - version = "1.3.5-DEVELOPMENT" + version = "2.0-RELEASE" +} + +install_items = { + "COPYRIGHT", + "bin", + "boot", + "dev", + { src = "etc.hdd", dest = "etc" }, -- install media config differs + "lib", + "libexec", + "kernel", + "modules", + "root", + "sbin", + "sys", -- XXX What's the deal with this anyway? + "usr/bin", + "usr/freebsd_pkg", + "usr/pkg", + "usr/games", + "usr/include", + "usr/lib", +-- "usr/local", -- No need to copy these two, since we use mtree to +-- "usr/X11R6", -- make them and pkg_add to populate them with files. + "usr/libdata", + "usr/libexec", + "usr/sbin", + "usr/share", + "usr/src", + "var" } default_packages = default_packages + { ==== //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/install/220_format_disk.lua#4 (text+ko) ==== @@ -1,4 +1,4 @@ --- $Id: 220_format_disk.lua,v 1.14 2005/10/12 00:50:12 cpressey Exp $ +-- $Id: 220_format_disk.lua,v 1.15 2006/02/03 22:54:13 sullrich Exp $ -- -- Allow the user to format the selected disk, if they so desire. @@ -10,7 +10,7 @@ local select_geometry = function(step, dd) local c_cyl, c_head, c_sec = dd:get_geometry() local geom_msg = _( - "The system is reports that the geometry of %s is\n\n" .. + "The system reports that the geometry of %s is\n\n" .. "%d cylinders, %d heads, %d sectors\n\n", dd:get_name(), dd:get_geometry_cyl(),