PERFORCE change 92561 for review
soc-andrew
soc-andrew at FreeBSD.org
Tue Feb 28 21:51:30 PST 2006
http://perforce.freebsd.org/chv.cgi?CH=92561
Change 92561 by soc-andrew at 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(),
More information about the p4-projects
mailing list