From owner-p4-projects@FreeBSD.ORG  Thu May 11 12:00:40 2006
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 5D52F16A5B0; Thu, 11 May 2006 12:00:38 +0000 (UTC)
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 8AB8616A49C
	for <perforce@freebsd.org>; Thu, 11 May 2006 12:00:35 +0000 (UTC)
	(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 AC76943D6D
	for <perforce@freebsd.org>; Thu, 11 May 2006 12:00:29 +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 k4BC0T0S072137
	for <perforce@freebsd.org>; Thu, 11 May 2006 12:00:29 GMT
	(envelope-from soc-andrew@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k4BC0Tdn072134
	for perforce@freebsd.org; Thu, 11 May 2006 12:00:29 GMT
	(envelope-from soc-andrew@freebsd.org)
Date: Thu, 11 May 2006 12:00:29 GMT
Message-Id: <200605111200.k4BC0Tdn072134@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 96938 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: Thu, 11 May 2006 12:01:06 -0000

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

Change 96938 by soc-andrew@soc-andrew_serv on 2006/05/11 12:00:10

	Allow the selection of the kernels to install. This is generated from the kernel on the installation media.

Affected files ...

.. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/install/500_install_os.lua#9 edit
.. //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/inst/432_kernel.lua#1 add
.. //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/inst/Makefile#8 edit

Differences ...

==== //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/install/500_install_os.lua#9 (text+ko) ====

@@ -86,14 +86,27 @@
 	App.state.target:cmds_install_srcs(cmds, App.conf.install_items)
 
 	--- Install the generic kernel
+	install_kernel = function(n, kernel)
+	    cmds:add {
+		cmdline = "${root}${TAR} -x " ..
+		    "-f ${root}usr/${uname}/kernels/${kernel}.tgz " ..
+		    "-C ${root}${base}/boot",
+		replacements = {
+		    base = base,
+		    kernel = kernel,
+		    uname = POSIX.uname("%r")
+		}
+	    }
+	end
+	print("Kernels:")
+	table.foreach(App.conf.kernels, install_kernel)
+
+	cmds:add {
+	    cmdline = "${root}${RM} -fr ${root}${base}/boot/kernel"
+	}
 	cmds:add {
-	    cmdline = "${root}${TAR} -x " ..
-		"-f ${root}usr/${uname}/kernels/generic.tgz " ..
-		"-C ${root}${base}/usr",
-	    replacements = {
-		base = base,
-		uname = POSIX.uname("%r")
-	    }
+	    cmdline="${root}${MV} ${root}${base}/boot/GENERIC " ..
+		"${root}${base}/boot/kernel"
 	}
 
 	--- Install the ports tree

==== //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/inst/Makefile#8 (text+ko) ====

@@ -10,7 +10,7 @@
 		900_reboot.lua main.lua
 
 # Local scripts
-FILES+=		430_select_dists.lua 435_ports.lua
+FILES+=		430_select_dists.lua 432_kernel.lua 435_ports.lua
 
 FILESDIR=       ${INST_DIR}/install