Commit 7d9c1f99 authored by Christopher Alfeld's avatar Christopher Alfeld
Browse files

Updated to work with new tree. Now handles dnards.

parent 0d4e5c02
...@@ -96,8 +96,6 @@ if {[catch "exec $postparse $nsFile $irFile >@ $logFp 2>@ $logFp" err]} { ...@@ -96,8 +96,6 @@ if {[catch "exec $postparse $nsFile $irFile >@ $logFp 2>@ $logFp" err]} {
exit 1 exit 1
} }
exit 1
outs "Locking the world!" outs "Locking the world!"
set wait {15 30 60 600 600} set wait {15 30 60 600 600}
set waiti 0 set waiti 0
...@@ -114,7 +112,7 @@ while {[catch "open $lockfile {WRONLY CREAT EXCL}" lockfp]} { ...@@ -114,7 +112,7 @@ while {[catch "open $lockfile {WRONLY CREAT EXCL}" lockfp]} {
close $lockfp close $lockfp
outs "Determining available resources." outs "Determining available resources."
if {[catch "exec $avail type=pc ver extras | $ptopgen > $ptopfile 2>@ $logFp" err]} { if {[catch "exec $avail | $ptopgen > $ptopfile 2>@ $logFp" err]} {
outs stderr "Error determining available resources. ($err)" outs stderr "Error determining available resources. ($err)"
unlock unlock
exit 1 exit 1
...@@ -143,11 +141,11 @@ if {[catch "exec $reserve $prefix $machines >@ $logFp 2>@ $logFp" err]} { ...@@ -143,11 +141,11 @@ if {[catch "exec $reserve $prefix $machines >@ $logFp 2>@ $logFp" err]} {
unlock unlock
outs "Allocating IP addresses." outs "PLACEHOLDER - Allocating IP addresses."
if {[catch "exec $handle_ip $irFile $nsFile >@ $logFp 2>@ $logFp" err]} { #if {[catch "exec $handle_ip $irFile $nsFile >@ $logFp 2>@ $logFp" err]} {
outs stderr "Error allocating IP addresses. ($err)" # outs stderr "Error allocating IP addresses. ($err)"
exit 1 # exit 1
} #}
outs "Setup finished - $irFile generated." outs "Setup finished - $irFile generated."
......
Supports Markdown
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