PERFORCE change 96938 for review

[soc-andrew]

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

Change 96938 by soc-andrew at 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