Commit 0e8664dd authored by Leigh B. Stoller's avatar Leigh B. Stoller
Browse files

Use new slot in node_types table to determine what OSID to load on

a pnode hosting jails. Better than hardwired OSID in assign_wrapper!
parent 0a12fd75
...@@ -309,18 +309,12 @@ my %jailosids = (); ...@@ -309,18 +309,12 @@ my %jailosids = ();
my %defaultosids = (); my %defaultosids = ();
$query_result = $query_result =
DBQueryFatal("SELECT type,delay_osid,osid from node_types"); DBQueryFatal("SELECT type,delay_osid,osid,jail_osid from node_types");
my $OURDOMAIN = "@OURDOMAIN@"; while (($type,$delayosid,$defosid,$jailosid) =
$query_result->fetchrow_array()) {
while (($type,$delayosid,$defosid) = $query_result->fetchrow_array()) {
$delayosids{$type} = $delayosid; $delayosids{$type} = $delayosid;
if ($OURDOMAIN eq "mini.emulab.net") { $jailosids{$type} = $jailosid;
$jailosids{$type} = "FBSD-STD";
}
else {
$jailosids{$type} = "emulab-ops-FBSD47-UPDATE";
}
$defaultosids{$type} = $defosid; $defaultosids{$type} = $defosid;
} }
......
Supports Markdown
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