PERFORCE change 85198 for review
soc-andrew
soc-andrew at FreeBSD.org
Wed Oct 12 21:37:34 PDT 2005
http://perforce.freebsd.org/chv.cgi?CH=85198
Change 85198 by soc-andrew at soc-andrew_serv on 2005/10/13 04:36:44
Update to a newer snapshot of the BSD Installer
Affected files ...
.. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/conf/BSDInstaller.lua#2 edit
.. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/install/220_format_disk.lua#2 edit
.. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/install/250_partition_disk.lua#3 edit
.. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/lib/storage.lua#3 edit
Differences ...
==== //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/conf/BSDInstaller.lua#2 (text+ko) ====
@@ -1,6 +1,6 @@
--
-- conf/BSDInstaller.lua
--- $Id: BSDInstaller.lua,v 1.12 2005/09/12 23:38:35 cpressey Exp $
+-- $Id: BSDInstaller.lua,v 1.13 2005/10/05 21:29:03 cpressey Exp $
--
-- The monolithic default configuration file for the BSD Installer.
--
@@ -381,12 +381,12 @@
--
ui_nav_control = {
- ["*/install/format_disk"] = "ignore", -- do not do the "Format
- -- Disk" step on install
["*/install/select_packages"] = "ignore", -- do not do the "Select
-- Packages" step on install
-- -- examples follow:
+-- ["*/install/format_disk"] = "ignore", -- do not do the "Format
+-- -- Disk" step on install
-- ["*/welcome"] = "ignore", -- no "welcome" items at all
-- ["*/install/partition_disk"] = "ignore", -- Don't show the Partition
==== //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/install/220_format_disk.lua#2 (text+ko) ====
@@ -1,13 +1,7 @@
--- $Id: 220_format_disk.lua,v 1.12 2005/08/26 04:25:24 cpressey Exp $
+-- $Id: 220_format_disk.lua,v 1.13 2005/10/05 21:29:03 cpressey Exp $
--
--- Format the selected disk.
---
--- This step is, by default, ignored (see conf/uinavctl.lua.)
--- However, it can be configured to be used for embedded and other
--- installs where the operating system is intended to "take over"
--- an entire disk anyway, and there is no point letting the user
--- partition or select a partition on a disk.
+-- Allow the user to format the selected disk, if they so desire.
--
local format_disk = function(step, dd)
@@ -18,7 +12,7 @@
local confirm = function()
local response = App.ui:present{
id = "confirm_alter_disk",
- name = _("Format this Disk?"),
+ name = _("ABOUT TO FORMAT! Proceed?"),
short_desc = _(
"WARNING! ALL data in ALL partitions " ..
"on the disk\n\n" ..
@@ -32,7 +26,7 @@
actions = {
{
id = "ok",
- name = _("Format this Disk")
+ name = _("Format %s", dd:get_name())
},
{
id = "cancel",
@@ -94,14 +88,49 @@
name = _("Format Disk"),
req_state = { "storage", "sel_disk" },
effect = function(step)
- if format_disk(step, App.state.sel_disk) then
- --
- -- Success. Select the (only!) partition on the disk.
- --
- App.state.sel_part = App.state.sel_disk:get_part_by_number(1)
+ local response = App.ui:present{
+ id = "format_disk",
+ name = _("Format this Disk?"),
+ short_desc = _(
+ "Would you like to format this disk?\n\n" ..
+ "You should format the disk if it is new, " ..
+ "or if you wish to start from a clean " ..
+ "slate. You should NOT format the disk " ..
+ "if it contains information that you " ..
+ "want to keep."
+ ),
+
+ actions = {
+ {
+ id = "ok",
+ name = _("Format this Disk")
+ },
+ {
+ id = "skip",
+ name = _("Skip this step")
+ },
+ {
+ id = "cancel",
+ accelerator = "ESC",
+ name = _("Return to %s", step:get_prev_name())
+ }
+ }
+ }
+ if response.action_id == "cancel" then
+ return step:prev()
+ elseif response.action_id == "skip" then
return step:next()
- else
- return step:prev()
+ elseif response.action_id == "ok" then
+ if format_disk(step, App.state.sel_disk) then
+ --
+ -- Success. Select the (only!) partition on the disk.
+ --
+ App.state.sel_part =
+ App.state.sel_disk:get_part_by_number(1)
+ return step:next()
+ else
+ return step:prev()
+ end
end
end
}
==== //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/install/250_partition_disk.lua#3 (text+ko) ====
@@ -1,4 +1,4 @@
--- $Id: 250_partition_disk.lua,v 1.78 2005/08/26 04:25:24 cpressey Exp $
+-- $Id: 250_partition_disk.lua,v 1.79 2005/10/05 21:29:03 cpressey Exp $
--
-- Partition editor.
@@ -697,7 +697,8 @@
short_desc = _(
"No changes appear to have been made to the " ..
"partition table layout.\n\n" ..
- "Do you want to partition the disk anyway?"
+ "Do you want to execute the commands to " ..
+ "partition the disk anyway?"
),
actions = {
@@ -707,6 +708,10 @@
App.state.sel_disk:get_name())
},
{
+ id = "skip",
+ name = _("No, Skip to Next Step")
+ },
+ {
id = "cancel",
accelerator = "ESC",
name = _("No, Return to Edit Partitions")
@@ -715,6 +720,8 @@
}
if response.action_id == "cancel" then
return step
+ elseif response.action_id == "skip" then
+ return step:next()
end
end
@@ -737,9 +744,11 @@
name = _("Partition Disk"),
req_state = { "storage", "sel_disk" },
effect = function(step)
+ --[[--
if App.state.sel_disk:has_been_touched() then
return let_user_edit_partitions(step, populate_from_disk)
end
+ --]]--
if App.state.sel_disk:is_mounted() then
local response = App.ui:present{
@@ -806,14 +815,14 @@
short_desc = _(
"You may now partition this disk if you desire." ..
"\n\n" ..
- "If this is a brand new disk, you should do this. If you " ..
- "would like to place multiple operating systems on this disk, " ..
- "you should create multiple partitions, one for each operating "..
- "system." ..
+ "If you formatted this disk, and would now like to install " ..
+ "multiple operating systems on it, you can reserve a part " ..
+ "of the disk for each of them here. Create multiple " ..
+ "partitions, one for each operating system." ..
"\n\n" ..
"If this disk already has operating systems on it that you " ..
"wish to keep, you should be careful not to change the " ..
- "partitions that they are on, when doing this." ..
+ "partitions that they are on, if you choose to partition." ..
"\n\n" ..
"Partition this disk?"
),
==== //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/lib/storage.lua#3 (text+ko) ====
@@ -1,4 +1,4 @@
--- $Id: storage.lua,v 1.176 2005/09/02 03:01:15 cpressey Exp $
+-- $Id: storage.lua,v 1.177 2005/10/05 20:27:40 cpressey Exp $
-- Storage Descriptors (a la libinstaller) in Lua.
--
@@ -345,7 +345,7 @@
if not disk then
table.insert(ret, false)
else
- part = disk:find_part_by_number(obj[2])
+ part = disk:get_part_by_number(obj[2])
table.insert(ret, part or false)
end
end
More information about the p4-projects
mailing list