Commit fe2f915b authored by Tarun Prabhu's avatar Tarun Prabhu
Browse files

Merge branch 'master' of git-public.flux.utah.edu:/flux/git/users/tarunp/emulab-devel

parents 952159aa 5639d5a2
......@@ -1925,7 +1925,7 @@ sub print_node_features
}
print "/>\n";
}
else {
elsif ($genimode eq $NO_GENI) {
print " <fd \n";
print " fd_name=\"$name\" \n";
print " fd_weight=\"$value\" \n";
......@@ -2049,7 +2049,10 @@ sub print_node_interfaces
print "public_ipv4=\"$ip\" ";
}
print ">\n";
print " <emulab:interface name=\"$name\"/>\n";
if ($genimode eq $V_2)
{
print " <emulab:interface name=\"$name\"/>\n";
}
print " </interface>\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