Commit 757861ef authored by Mike Hibler's avatar Mike Hibler

In vnodes, always clear out the nickname file in case a vnode/jail has been

reassigned to a new virtual node.  We do this for every vnode, both inside
and outside the jail.
parent 807f505a
......@@ -1040,6 +1040,13 @@ sub jailsetup()
# Need to unify this with jailname.
system("echo '$vnodeid' > " . TMNODEID());
#
# Always remove the old nickname file. No need to worry about a project
# change at this level (see bootsetup) but we do need to make sure we
# pick up on a vnode/jail being reassigned to a different virtual node.
#
unlink TMNICKNAME;
print STDOUT "Checking Testbed reservation status ... \n";
if (! check_status()) {
print STDOUT " Free!\n";
......@@ -1074,6 +1081,13 @@ sub vnodejailsetup($)
" No such directory: " . JAILDIR() . "\n");
}
#
# Always remove the old nickname file. No need to worry about a project
# change at this level (see bootsetup) but we do need to make sure we
# pick up on a vnode/jail being reassigned to a different virtual node.
#
unlink TMNICKNAME;
# Do not bother if somehow got released.
if (! check_status()) {
print "Node is free!\n";
......
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