PERFORCE change 85066 for review

soc-andrew soc-andrew at FreeBSD.org
Sun Oct 9 21:47:16 PDT 2005


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

Change 85066 by soc-andrew at soc-andrew_serv on 2005/10/10 04:47:10

	Bring the lua backend up to the point of BERINSTALLER-BETA-1. It can install the binary dists, no src, no ports, no packages.

Affected files ...

.. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/install/500_install_os.lua#3 edit
.. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/lib/target_system.lua#3 edit
.. //depot/projects/soc2005/bsdinstaller/src/lib/lua/Makefile#4 edit
.. //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/conf/FreeBSD.lua#1 add
.. //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/inst/Makefile#4 edit
.. //depot/projects/soc2005/bsdinstaller/src/release/bsdinstaller/bsdinstaller_shell.sh#4 edit

Differences ...

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

@@ -176,13 +176,13 @@
 		if App.state.sel_part:get_subpart_by_mountpoint("/usr") then
 			cmds:add(
 			     "${root}${RM} -rf ${root}${base}/home",
-			     "${root}${MKDIR} ${root}${base}/usr/home",
+			     "${root}${MKDIR} -p ${root}${base}/usr/home",
 			     "${root}${LN} -s /usr/home ${root}${base}/home"
 			)
 		elseif App.state.sel_part:get_subpart_by_mountpoint("/var") then
 			cmds:add(
 			     "${root}${RM} -rf ${root}${base}/home",
-			     "${root}${MKDIR} ${root}${base}/var/home",
+			     "${root}${MKDIR} -p ${root}${base}/var/home",
 			     "${root}${LN} -s /var/home ${root}${base}/home"
 			)
 		end
@@ -206,7 +206,7 @@
 	-- Create missing directories.
 	--
 	cmds:add(
-	    "${root}${MKDIR} ${root}${base}/mnt"
+	    "${root}${MKDIR} -p ${root}${base}/mnt"
 	)
 
 	--

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

@@ -405,6 +405,22 @@
 				    log_mode = CmdChain.LOG_QUIET -- don't spam log
 				}
 			end
+		elseif App.conf.use_tar then
+			add_copy_command = function(src, dest)
+				cmds:add{
+				    cmdline = "${root}${TAR} "	..
+					"-x -C ${root}${base}${dest} -f " ..
+					"${root}usr/${uname}/${src}/${src}.${dist_suffix}",
+				    replacements = {
+					base = base,
+					src  = src,
+					dest = dest,
+					dist_suffix = App.conf.dist_suffix,
+					uname = posix.uname("%r")
+				    },
+				    log_mode = CmdChain.LOG_QUIET -- don't spam log
+				}
+			end
 		end
 
 		local src, dest
@@ -518,7 +534,7 @@
 			}
 			cmds:add("${root}${ECHO} '${device}\t\t\t${mountpoint}\t\t" ..
 			    "${fstype}\t${access}\t\t0\t0' >>${root}${base}/${filename}")
-			cmds:add("${root}${MKDIR} ${root}${base}/${mountpoint}")
+			cmds:add("${root}${MKDIR} -p ${root}${base}/${mountpoint}")
 		end
 	end
 

==== //depot/projects/soc2005/bsdinstaller/src/lib/lua/Makefile#4 (text+ko) ====

@@ -1,4 +1,4 @@
 SUBDIR=		lua lualib
-SUBDIR+=	archive compat51 mime posix socket
+SUBDIR+=	compat51 mime posix socket
 
 .include <bsd.subdir.mk>

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

@@ -9,6 +9,9 @@
 		490_confirm_install_os.lua 500_install_os.lua 800_finished.lua \
 		900_reboot.lua main.lua
 
+# Local scripts
+FILES+=		430_select_dists.lua
+
 FILESDIR=       ${INST_DIR}/install
 
 .include "../Makefile.inc1"

==== //depot/projects/soc2005/bsdinstaller/src/release/bsdinstaller/bsdinstaller_shell.sh#4 (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 dir.root=/usr/R booted_from_install_media=true
+   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/bas_installer.log
   #/usr/sbin/bsd_installer_be
   if [ $? -eq 5 ]
   then


More information about the p4-projects mailing list