Commit 30dafac5 authored by Leigh B Stoller's avatar Leigh B Stoller

Minor fixes to protogeni cooked mode

parents 97e89337 a41eb2a0
......@@ -435,9 +435,12 @@ sub MapNodes($$)
#
# This is how we get the client side to do cooked mode properly.
#
$ref->{'startup_command'} =
"sudo /usr/local/etc/emulab/rc/rc.pgeni ".
"-s $BOSSNODE -k $eventkey,$keyhash -u '$sliver_urn' boot";
my $cmd = "sudo /usr/local/etc/emulab/rc/rc.pgeni ".
"-s $BOSSNODE -k $eventkey,$keyhash -u '$sliver_urn'";
$cmd .= " -j " . $node->node_id()
if ($node->isvirtnode());
$ref->{'startup_command'} = "$cmd boot";
# Interface map for loop below.
if (exists($ref->{'interface'})) {
......
......@@ -1234,6 +1234,9 @@ sub GenVirtNodes($)
if ($vnode->_isvirtnode()) {
$ref->{'virtualization_type'} = 'emulab-vnode';
$ref->{'virtualization_subtype'} = 'emulab-openvz';
if ($vnode->_sharedokay()) {
$ref->{'exclusive'} = 0;
}
}
else {
$ref->{'virtualization_type'} = 'raw';
......
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