Commit 8168c36d authored by Leigh B Stoller's avatar Leigh B Stoller

Force global system images into /usr/testbed/images. This is what we

want 99% of the time, and getting it wrong is annoying.
parent 1c2fe385
......@@ -590,11 +590,17 @@ else {
$spath .= "${imagename}.ndz";
}
if ($isadmin) {
#
# Ignore path if global image in emulab-ops
#
if ($global && $ipid eq TBOPSPID()) {
$newimageid_args{"path"} = $spath;
}
#
# Admins can provide a path, but this is probably a bad idea too.
# Ignore it unless /usr/testbed/images.
#
if (exists($newimageid_args{"path"}) &&
elsif (exists($newimageid_args{"path"}) &&
$newimageid_args{"path"} =~ /^\/usr\/testbed\/images/) {
$newimageid_args{"path"} = $spath;
}
......
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