From owner-p4-projects@FreeBSD.ORG  Mon Oct 10 10:05:06 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 C969316A422; Mon, 10 Oct 2005 10:05:05 +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 7EA5616A420
	for <perforce@freebsd.org>; Mon, 10 Oct 2005 10:05:05 +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 7135F43D5E
	for <perforce@freebsd.org>; Mon, 10 Oct 2005 10:05:04 +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 j9AA54nG094730
	for <perforce@freebsd.org>; Mon, 10 Oct 2005 10:05:04 GMT
	(envelope-from soc-andrew@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9AA54wi094727
	for perforce@freebsd.org; Mon, 10 Oct 2005 10:05:04 GMT
	(envelope-from soc-andrew@freebsd.org)
Date: Mon, 10 Oct 2005 10:05:04 GMT
Message-Id: <200510101005.j9AA54wi094727@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 85079 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: Mon, 10 Oct 2005 10:05:06 -0000

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

Change 85079 by soc-andrew@soc-andrew_serv on 2005/10/10 10:04:04

	Allow the installation of the source dists.
	Get reboot working again

Affected files ...

.. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/lib/target_system.lua#4 edit
.. //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/conf/FreeBSD.lua#2 edit
.. //depot/projects/soc2005/bsdinstaller/src/release/bsdinstaller/bsdinstaller_shell.sh#6 edit

Differences ...

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

@@ -407,13 +407,19 @@
 			end
 		elseif App.conf.use_tar then
 			add_copy_command = function(src, dest)
+				if (string.sub(src, 0, 1) == "s") then
+					dir = "src"
+				else
+					dir = src
+				end
 				cmds:add{
 				    cmdline = "${root}${TAR} "	..
 					"-x -C ${root}${base}${dest} -f " ..
-					"${root}usr/${uname}/${src}/${src}.${dist_suffix}",
+					"${root}usr/${uname}/${dir}/${src}.${dist_suffix}",
 				    replacements = {
 					base = base,
 					src  = src,
+					dir = dir,
 					dest = dest,
 					dist_suffix = App.conf.dist_suffix,
 					uname = posix.uname("%r")

==== //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/conf/FreeBSD.lua#2 (text+ko) ====

@@ -24,7 +24,27 @@
 	{ src = "compat21", dest = "/" },
 	{ src = "compat22", dest = "/" },
 	{ src = "compat3x", dest = "/" },
-	{ src = "compat4x", dest = "/" }
+	{ src = "compat4x", dest = "/" },
+	{ src = "sbase", dest = "/usr/src" },
+	{ src = "scrypto", dest = "/usr/src" },
+	{ src = "setc", dest = "/usr/src" },
+	{ src = "sgames", dest = "/usr/src" },
+	{ src = "sbin", dest = "/usr/src" },
+	{ src = "scontrib", dest = "/usr/src" },
+	{ src = "skrb5", dest = "/usr/src" },
+	{ src = "slib", dest = "/usr/src" },
+	{ src = "slibexec", dest = "/usr/src" },
+	{ src = "sgnu", dest = "/usr/src" },
+	{ src = "sinclude", dest = "/usr/src" },
+	{ src = "ssbin", dest = "/usr/src" },
+	{ src = "ssecure", dest = "/usr/src" },
+	{ src = "sshare", dest = "/usr/src" },
+	{ src = "srelease", dest = "/usr/src" },
+	{ src = "srescue", dest = "/usr/src" },
+	{ src = "subin", dest = "/usr/src" },
+	{ src = "susbin", dest = "/usr/src" },
+	{ src = "ssys", dest = "/usr/src" },
+	{ src = "stools", dest = "/usr/src" }
 }
 
 cmd_names = cmd_names + {

==== //depot/projects/soc2005/bsdinstaller/src/release/bsdinstaller/bsdinstaller_shell.sh#6 (text+ko) ====

@@ -13,7 +13,7 @@
   /usr/sbin/bsd_installer_ncurses
 elif [ ${TTY} = "/dev/ttyv1" ]
 then
-   LUA_PATH="/usr/lib/lua/?.lua;/usr/libexec/bsdinstaller/lib/?.lua" LUA_CPATH=/usr/lib/lua/?.so LUA_SOPATH=/usr/lib/lua/ bsd_lua -lcompat-5.1 /usr/libexec/bsdinstaller/main.lua /usr/libexec/bsdinstaller/conf/BSDInstaller.lua /usr/libexec/bsdinstaller/conf/FreeBSD.lua dir.root=/ booted_from_install_media=true 2>&1 | tee /var/log/bsd_installer.log
+   LUA_PATH="/usr/lib/lua/?.lua;/usr/libexec/bsdinstaller/lib/?.lua" LUA_CPATH=/usr/lib/lua/?.so LUA_SOPATH=/usr/lib/lua/ bsd_lua -lcompat-5.1 /usr/libexec/bsdinstaller/main.lua /usr/libexec/bsdinstaller/conf/BSDInstaller.lua /usr/libexec/bsdinstaller/conf/FreeBSD.lua dir.root=/ booted_from_install_media=true
   #/usr/sbin/bsd_installer_be
   if [ $? -eq 5 ]
   then