PERFORCE change 84520 for review
soc-andrew
soc-andrew at FreeBSD.org
Thu Sep 29 15:47:07 PDT 2005
http://perforce.freebsd.org/chv.cgi?CH=84520
Change 84520 by soc-andrew at soc-andrew_serv on 2005/09/29 22:46:13
Run the lua backend on boot.
Fix dhclient
Affected files ...
.. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/lib/network.lua#3 edit
.. //depot/projects/soc2005/bsdinstaller/src/release/bsdinstaller/bsdinstaller_shell.sh#3 edit
Differences ...
==== //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/lib/network.lua#3 (text+ko) ====
@@ -290,7 +290,7 @@
failure_mode = CmdChain.FAILURE_IGNORE
},
{
- cmdline = "${root}${DHCLIENT} -1 ${name}",
+ cmdline = "${root}${DHCLIENT} ${name}",
replacements = {
name = name
}
==== //depot/projects/soc2005/bsdinstaller/src/release/bsdinstaller/bsdinstaller_shell.sh#3 (text+ko) ====
@@ -13,7 +13,8 @@
/usr/sbin/bsd_installer_ncurses
elif [ ${TTY} = "/dev/ttyv1" ]
then
- /usr/sbin/bsd_installer_be
+ 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
+ #/usr/sbin/bsd_installer_be
if [ $? -eq 5 ]
then
# The backend returned the reboot value
More information about the p4-projects
mailing list