Commit 0e265ec0 authored by Kirk Webb's avatar Kirk Webb

Move where tbrsync is called in nfree so that non-admin users can actually
fire the reload off.
parent ea206d40
......@@ -196,6 +196,17 @@ foreach my $n (@nodes) {
next;
}
} else {
# XXX stargate reload hack - totally gross..
if (TBNodeType($n) eq "garcia") {
# path to directory tree "image" hardcoded for now since
# users have no choice over OS selection when reloading
# isn't performed during swapin.
system("$tbrsync upload /usr/testbed/images/garcia $n") == 0 ||
print STDERR "Failed to rsync garcia node: $n\n";
system("$nodereboot $n") == 0 ||
print STDERR "Failed to reboot garcia after rsync: $n\n";
}
# Move to locked reservation. Node is not free, but is no longer
# owned by the pid/eid, so cannot be mucked with.
if (! DBQueryWarn("update reserved " .
......@@ -368,17 +379,6 @@ foreach my $n (@freed_nodes) {
next;
}
# XXX stargate reload hack - totally gross..
if (TBNodeType($n) eq "garcia") {
# path to directory tree "image" hardcoded for now since
# users have no choice over OS selection when reloading
# isn't performed during swapin.
system("$tbrsync upload /usr/testbed/images/garcia $n") == 0 ||
print STDERR "Failed to rsync garcia node: $n\n";
system("$nodereboot $n") == 0 ||
print STDERR "Failed to reboot garcia after rsync: $n\n";
}
# No reloads or reservation changes, so really free the node
#
# This little sillyness is for disk reloading. Remember the last
......
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