All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

Commit 3aca822b authored by Christopher Alfeld's avatar Christopher Alfeld

Number of fixes, cleanup code, and added prefixes.

parent 3f28a754
......@@ -14,9 +14,9 @@ proc outs {args} {
puts $logFp $s
}
proc readfifo {fp} {
proc readfifo {fp {prefix {}}} {
while {[gets $fp line] >= 0} {
outs $line
outs $prefix$line
}
}
......@@ -90,11 +90,11 @@ foreach pair $nodemap {
outs "Setting up VLANs"
if {[catch "exec $snmpit -debug -u -f $irFile >@ $logFp 2> $tmpio" err]} {
readfifo $tmpioFP
readfifo $tmpioFP "SNMPIT: "
outs stderr "Error running $snmpit. ($err)"
exit 1
}
readfifo $tmpioFP
readfifo $tmpioFP "SNMPIT: "
#outs "PLACEHOLDER - Verifying virtual network."
outs "PLACEHOLDER - Copying disk images."
......@@ -112,5 +112,5 @@ outs "PLACEHOLDER - Installing secondary pacakages."
outs "PLACEHOLDER - Rebooting."
outs "Testbed ready for use."
close $fifoFP
file delete -force $fifo
\ No newline at end of file
close $tmpioFP
file delete -force $tmpio
\ No newline at end of file
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