PERFORCE change 106964 for review

[soc-andrew]

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

Change 106964 by soc-andrew at soc-andrew_serv on 2006/09/30 09:08:44

	Update the start script for the new file names in the lua port

Affected files ...

.. //depot/projects/soc2005/bsdinstaller/src/release/bsdinstaller/bsdinstaller_shell.sh#12 edit

Differences ...

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

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+LUA_VER="5.0"
+LUA_LIBS="-lcompat-5.1"
 TTY=`tty`
 
 if [ -f /.do_reboot ]
@@ -10,21 +12,22 @@
 
 if [ ${TTY} = "/dev/ttyv0" ]
 then
-#  /usr/sbin/bsd_installer_ncurses
+  # Run the frontend on ttyv0
   /usr/local/bin/dfuife_curses
 elif [ ${TTY} = "/dev/ttyv1" ]
 then
-  export LD_PRELOAD="/usr/local/lib/liblua.so;/usr/local/lib/liblualib.so;/usr/lib/libm.so"
-  export LUA_PATH="/usr/local/share/lua/5.0/?.lua;/usr/lib/lua/?.lua;/usr/libexec/bsdinstaller/lib/?.lua"
-  export LUA_CPATH="/usr/local/lib/lua/5.0/?.so;/usr/lib/lua/?.so"
-  export LUA_SOPATH=/usr/local/lib/lua/5.0/
-  lua -lcompat-5.1 /usr/libexec/bsdinstaller/main.lua \
+  # Run the backend on ttyv1
+  export LD_PRELOAD="/usr/local/lib/liblua-${LUA_VER}.so;/usr/local/lib/liblualib-${LUA_VER}.so;/usr/lib/libm.so"
+  export LUA_PATH="/usr/local/share/lua/${LUA_VER}/?.lua;/usr/lib/lua/?.lua;/usr/libexec/bsdinstaller/lib/?.lua"
+  export LUA_CPATH="/usr/local/lib/lua/${LUA_VER}/?.so;/usr/lib/lua/?.so"
+  export LUA_SOPATH=/usr/local/lib/lua/${LUA_VER}/
+  lua-${LUA_VER} ${LUA_LIBS} /usr/libexec/bsdinstaller/main.lua \
     /usr/libexec/bsdinstaller/conf/BSDInstaller.lua \
     /usr/libexec/bsdinstaller/conf/FreeBSD.lua dir.root=/ \
     booted_from_install_media=true
   if [ $? -eq 5 ]
   then
-# The backend returned the reboot value
+    # The backend returned the reboot value
     shutdown -r now
     touch /.do_reboot
   fi