From owner-p4-projects@FreeBSD.ORG Thu Dec 22 21:00:35 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9F52016A423; Thu, 22 Dec 2005 21:00:34 +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 5D1E616A420 for ; Thu, 22 Dec 2005 21:00:34 +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 2822F43D5C for ; Thu, 22 Dec 2005 21:00:23 +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 jBML0NfJ051259 for ; Thu, 22 Dec 2005 21:00:23 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jBML0NRl051254 for perforce@freebsd.org; Thu, 22 Dec 2005 21:00:23 GMT (envelope-from soc-andrew@freebsd.org) Date: Thu, 22 Dec 2005 21:00:23 GMT Message-Id: <200512222100.jBML0NRl051254@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 88582 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Dec 2005 21:00:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=88582 Change 88582 by soc-andrew@soc-andrew_serv on 2005/12/22 20:59:47 Reduce diff to BSD Installer cvs Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/install/500_install_os.lua#5 edit .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/lib/target_system.lua#8 edit .. //depot/projects/soc2005/bsdinstaller/src/contrib/lua/posix/posix.lua#2 edit Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/install/500_install_os.lua#5 (text+ko) ==== @@ -1,4 +1,4 @@ --- $Id: 500_install_os.lua,v 1.80 2005/09/15 05:14:53 cpressey Exp $ +-- $Id: 500_install_os.lua,v 1.81 2005/12/22 03:32:37 cpressey Exp $ -- -- Actually install the OS. ==== //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/lib/target_system.lua#8 (text+ko) ==== @@ -1,4 +1,4 @@ --- $Id: target_system.lua,v 1.58 2005/08/27 21:13:58 cpressey Exp $ +-- $Id: target_system.lua,v 1.59 2005/12/21 23:00:33 cpressey Exp $ -- -- Copyright (c)2005 Chris Pressey. All rights reserved. @@ -514,7 +514,11 @@ } cmds:add("${root}${ECHO} '${header}' >${root}${base}${filename}") - + + -- + -- Add the mountpoints for the selected subpartitions + -- (/, /usr, /var, and so on) to the fstab file. + -- for spd in pd:get_subparts() do cmds:set_replacements{ device = spd:get_device_name(), @@ -530,6 +534,11 @@ end end + -- + -- Add the mountpoints for the extra filesystems + -- (/cdrom, /procfs, and so on) to the fstab file. + -- Create the associated directories, as well. + -- local i, fs_desc for i, fs_desc in extra_fs do cmds:set_replacements{ ==== //depot/projects/soc2005/bsdinstaller/src/contrib/lua/posix/posix.lua#2 (text+ko) ==== @@ -8,3 +8,5 @@ end so"posix" + +return posix