From owner-p4-projects@FreeBSD.ORG Thu Sep 29 22:47:07 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F2EA816A421; Thu, 29 Sep 2005 22:47:06 +0000 (GMT) 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 CB98416A41F for ; Thu, 29 Sep 2005 22:47:06 +0000 (GMT) (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 0877743D6A for ; Thu, 29 Sep 2005 22:47:05 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j8TMl4Nk080680 for ; Thu, 29 Sep 2005 22:47:04 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j8TMl4FP080677 for perforce@freebsd.org; Thu, 29 Sep 2005 22:47:04 GMT (envelope-from soc-andrew@freebsd.org) Date: Thu, 29 Sep 2005 22:47:04 GMT Message-Id: <200509292247.j8TMl4FP080677@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 84520 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Sep 2005 22:47:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=84520 Change 84520 by soc-andrew@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