Commit fd0a2f8e authored by Leigh B Stoller's avatar Leigh B Stoller

Make os_setup_new real; old os_setup is now os_setup_old.

parent 9f5a84a6
...@@ -76,7 +76,7 @@ WEB_BIN_SCRIPTS = webnscheck webendexp webtbreport webbatchexp \ ...@@ -76,7 +76,7 @@ WEB_BIN_SCRIPTS = webnscheck webendexp webtbreport webbatchexp \
webtemplate_delete webtemplate_revise webtemplate_delete webtemplate_revise
LIBEXEC_STUFF = wanlinksolve wanlinkinfo os_setup mkexpdir console_setup \ LIBEXEC_STUFF = wanlinksolve wanlinkinfo os_setup mkexpdir console_setup \
assign_wrapper assign_wrapper2 os_setup_new \ assign_wrapper assign_wrapper2 os_setup_old \
assign_prepass ptopgen ptopgen_new \ assign_prepass ptopgen ptopgen_new \
spewlogfile staticroutes routecalc wanassign \ spewlogfile staticroutes routecalc wanassign \
switchmac \ switchmac \
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -1414,9 +1414,9 @@ sub doSwapin($) { ...@@ -1414,9 +1414,9 @@ sub doSwapin($) {
TBDebugTimeStamp("launching os_setup"); TBDebugTimeStamp("launching os_setup");
if (!($os_setup_pid = fork())) { if (!($os_setup_pid = fork())) {
my $oscmd = "os_setup"; my $oscmd = "os_setup";
if (EmulabFeatures->FeatureEnabled("NewOsSetup", if (EmulabFeatures->FeatureEnabled("OldOsSetup",
$this_user, $group, $experiment)) { $this_user, $group, $experiment)) {
$oscmd = "os_setup_new"; $oscmd = "os_setup_old";
} }
exec("$oscmd $pid $eid") or return 1; exec("$oscmd $pid $eid") or return 1;
} elsif ($os_setup_pid == -1) { } elsif ($os_setup_pid == -1) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment