From owner-p4-projects@FreeBSD.ORG  Sat Sep 30 09:09:00 2006
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 2269916A415; Sat, 30 Sep 2006 09:09:00 +0000 (UTC)
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 C224316A407
	for <perforce@freebsd.org>; Sat, 30 Sep 2006 09:08:59 +0000 (UTC)
	(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 8CC6243D46
	for <perforce@freebsd.org>; Sat, 30 Sep 2006 09:08:59 +0000 (GMT)
	(envelope-from soc-andrew@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8U98xIW037957
	for <perforce@freebsd.org>; Sat, 30 Sep 2006 09:08:59 GMT
	(envelope-from soc-andrew@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8U98xlL037954
	for perforce@freebsd.org; Sat, 30 Sep 2006 09:08:59 GMT
	(envelope-from soc-andrew@freebsd.org)
Date: Sat, 30 Sep 2006 09:08:59 GMT
Message-Id: <200609300908.k8U98xlL037954@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 106964 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: Sat, 30 Sep 2006 09:09:00 -0000

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

Change 106964 by soc-andrew@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