PERFORCE change 92769 for review

[soc-andrew]

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

Change 92769 by soc-andrew at soc-andrew_serv on 2006/03/05 09:25:27

	1. Install the lua package to the CD. It dosn't matter we are not registering the install as it will be quite hard to remove the package from read only media. It is also needed to run the installer.
	2. Use the lua from the package. It needs liblua.so, liblualib.so and libm.so to be loaded to resolve all the needed symbols.

Affected files ...

.. //depot/projects/soc2005/bsdinstaller/src/release/Makefile#31 edit
.. //depot/projects/soc2005/bsdinstaller/src/release/bsdinstaller/bsdinstaller_shell.sh#8 edit

Differences ...

==== //depot/projects/soc2005/bsdinstaller/src/release/Makefile#31 (text+ko) ====

@@ -793,16 +793,18 @@
                 tar xf - -C ${RD}/bsdinstaller/root/$$dir; \
 	  done )
 	# Create the needed mount points
-	( for dir in dev mnt proc root tmp var ; do \
-		mkdir ${RD}/bsdinstaller/root/$$dir; \
+	( for dir in dev mnt proc root tmp var/run ; do \
+		mkdir -p ${RD}/bsdinstaller/root/$$dir; \
 	done )
 
 	# Install Lua into the package root
 	# XXX Make the ftp site changeable
-	( /usr/bin/fetch -ARr -o ${RD}/bsdinstaller/root/lua.tbz \
-		ftp://ftp.freebsd.org/pub/FreeBSD/ports/${MACHIVE_ARCH}/packages-7-current/latest/lua.tbz && \
-		pkg_add -C ${RD}/bsdinstaller/root /lua.tbz )
-	rm ${RD}/bsdinstaller/root/lua.tbz
+	( /usr/bin/fetch -ARr -o ${RD}/bsdinstaller/lua.tbz \
+		ftp://ftp.freebsd.org/pub/FreeBSD/ports/${MACHINE_ARCH}/packages-7-current/Latest/lua.tbz && \
+		pkg_add -R -P ${RD}/bsdinstaller/root ${RD}/bsdinstaller/lua.tbz )
+	rm ${RD}/bsdinstaller/lua.tbz
+	# Reset the library directories
+	ldconfig /lib /usr/lib /usr/lib/compat /usr/local/lib
 
 	@touch ${RD}/bsdinstaller/root/etc/fstab
 	@echo "sendmail_enable=\"NONE\"" > ${RD}/bsdinstaller/root/etc/rc.conf
@@ -992,8 +994,8 @@
 		tar --exclude CVS -cf - -C ${RD}/bsdinstaller/root/$$dir . | \
                 tar xf - -C ${RD}/bsdinstaller/mfs_root/$$dir; \
 	  done )
-	( for dir in dev mnt proc root tmp usr var ; do \
-		mkdir ${RD}/bsdinstaller/mfs_root/$$dir; \
+	( for dir in dev mnt proc root tmp usr var/run ; do \
+		mkdir -p ${RD}/bsdinstaller/mfs_root/$$dir; \
 	done )
 	cp ${.CURDIR}/bsdinstaller/bsdinstaller ${RD}/bsdinstaller/mfs_root/etc/rc.d/
 	chmod u+x ${RD}/bsdinstaller/mfs_root/etc/rc.d/bsdinstaller

==== //depot/projects/soc2005/bsdinstaller/src/release/bsdinstaller/bsdinstaller_shell.sh#8 (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/ bsdlua -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
+   LD_PRELOAD="/usr/local/lib/liblua.so;/usr/local/lib/liblualib.so;/usr/lib/libm.so" LUA_PATH="/usr/lib/lua/?.lua;/usr/libexec/bsdinstaller/lib/?.lua" LUA_CPATH=/usr/lib/lua/?.so LUA_SOPATH=/usr/lib/lua/ 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