From owner-p4-projects@FreeBSD.ORG  Tue Dec 13 20:50:04 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 4580916A422; Tue, 13 Dec 2005 20:50:04 +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 1BC5516A41F
	for <perforce@freebsd.org>; Tue, 13 Dec 2005 20:50:04 +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 565EF43D5F
	for <perforce@freebsd.org>; Tue, 13 Dec 2005 20:50:03 +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 jBDKo3Si086057
	for <perforce@freebsd.org>; Tue, 13 Dec 2005 20:50:03 GMT
	(envelope-from soc-andrew@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jBDKo3Lu086050
	for perforce@freebsd.org; Tue, 13 Dec 2005 20:50:03 GMT
	(envelope-from soc-andrew@freebsd.org)
Date: Tue, 13 Dec 2005 20:50:03 GMT
Message-Id: <200512132050.jBDKo3Lu086050@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 88142 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: Tue, 13 Dec 2005 20:50:05 -0000

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

Change 88142 by soc-andrew@soc-andrew_serv on 2005/12/13 20:49:03

	Allow boot1 to be used rather than boot0

Affected files ...

.. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/install/270_install_bootblocks.lua#2 edit
.. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/lib/storage.lua#5 edit

Differences ...

==== //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/install/270_install_bootblocks.lua#2 (text+ko) ====

@@ -21,6 +21,7 @@
 		local dataset = {
 			disk = raw_name,
 			boot0cfg = "Y",
+			boot0 = "Y",
 			packet = "N"
 		}
 
@@ -72,6 +73,12 @@
 		    control = "checkbox"
 		},
 		{
+		    id = "boot0",
+		    name = _("Use boot menu?"),
+		    short_desc = _("Install the boot0 menu bootblock"),
+		    control = "checkbox"
+		},
+		{
 		    id = "packet",
 		    name = _("Packet mode?"),
 		    short_desc = _("Select this to use 'packet mode' to boot the disk"),
@@ -109,6 +116,7 @@
 			if dataset.boot0cfg == "Y" then
 				dd = disk_ref[dataset.disk]
 				dd:cmds_install_bootblock(cmds,
+				    (dataset.boot0 == "Y"),
 				    (dataset.packet == "Y"))
 			end
 		end

==== //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/lib/storage.lua#5 (text+ko) ====

@@ -1111,7 +1111,18 @@
 	--
 	-- Create commands to install a bootblock on this disk.
 	--
-	method.cmds_install_bootblock = function(self, cmds, packet_mode)
+	method.cmds_install_bootblock = function(self, cmds, use_boot0, packet_mode)
+		if not use_boot0 then
+			cmds:add(
+			    {
+				cmdline = "${root}${YES} | ${root}${FDISK} -B " ..
+				self:get_raw_device_name(),
+				failure = CmdChain.FAILURE_WARN,
+				tag = self
+			    })
+			return
+		end
+
 		local o = " "
 		local s = " "