PERFORCE change 106949 for review
soc-andrew
soc-andrew at FreeBSD.org
Sat Sep 30 01:13:43 PDT 2006
http://perforce.freebsd.org/chv.cgi?CH=106949
Change 106949 by soc-andrew at soc-andrew_serv on 2006/09/30 08:12:59
Update the customised parts of the BSDInstaller to work with the new snapshot
Affected files ...
.. //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/conf/FreeBSD.lua#7 edit
.. //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/inst/430_select_dists.lua#4 edit
.. //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/inst/432_kernel.lua#2 edit
.. //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/inst/435_ports.lua#3 edit
Differences ...
==== //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/conf/FreeBSD.lua#7 (text+ko) ====
@@ -1,13 +1,13 @@
--
-- conf/FreeBSD.lua
--- $Id: FreeBSD.lua,v 1.8 2006/05/16 01:59:54 sullrich Exp $
+-- $Id: FreeBSD.lua,v 1.11 2006/09/04 18:01:33 cpressey Exp $
--
-- This file contains FreeBSD-specific overrides to BSDInstaller.lua.
--
os = {
name = "FreeBSD",
- version = "6.0"
+ version = "7.0"
}
install_items = {}
@@ -74,5 +74,7 @@
disklabel_on_disk = false
has_softupdates = true
window_subpartitions = { "c" }
+needs_makedev = false
+disklabel_offset = 16
use_cpdup = false
use_tar = true
==== //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/inst/430_select_dists.lua#4 (text+ko) ====
@@ -2,11 +2,11 @@
--
-- Allows the user to select what dists they want to install on their machine
-return {
- id = "select_dists",
- name = _("Select Distribution"),
- req_state = { "source", "sel_pkgs" },
- effect = function(step)
+id = "select_dists"
+name = _("Select Distribution")
+req_state = { "source", "sel_pkgs" }
+
+effect = function(step)
local datasets = {}
for item in App.conf.install_items_orig do
table.insert(datasets, {
@@ -99,5 +99,4 @@
else
return step:prev()
end
- end
-}
+end
==== //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/inst/432_kernel.lua#2 (text+ko) ====
@@ -1,14 +1,11 @@
-- $FreeBSD$
-local Pty = require("pty")
-local POSIX = require("posix")
-
--
-- Allows the user to select what kernels they want to install on their machine
-return {
- id = "select_kernels",
- name = _("Select Kernel"),
- effect = function(step)
+id = "select_kernels"
+name = _("Select Kernel")
+
+effect = function(step)
local datasets = {}
local output
@@ -82,4 +79,3 @@
return step:prev()
end
end
-}
==== //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/inst/435_ports.lua#3 (text+ko) ====
@@ -31,11 +31,11 @@
-- $FreeBSD$
-return {
- id = "ports",
- name = _("Install the Ports collection?"),
- req_state = { "source", "sel_pkgs" },
- effect = function(step)
+id = "ports"
+name = _("Install the Ports collection?")
+req_state = { "source", "sel_pkgs" }
+
+effect = function(step)
local response = App.ui:present({
id = "install_ports",
name = _("Install Ports collection"),
@@ -65,5 +65,4 @@
else
return step:prev()
end
- end
-}
+end
More information about the p4-projects
mailing list