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

Change NSE osid from hardwired FBSD-NSE, to use the jail osid for the

node type, but allow it to be overridden with tb-set-jail-os().
parent 2d40a5d4
...@@ -2135,7 +2135,15 @@ sub InitPnode($pnode, $vnode) ...@@ -2135,7 +2135,15 @@ sub InitPnode($pnode, $vnode)
# XXX NSE hack: if the vnode is simulated, we just # XXX NSE hack: if the vnode is simulated, we just
# choose FBSD-NSE and static routing # choose FBSD-NSE and static routing
if (virtnodeisvnode($vnode) && virtnodeissim($vnode)) { if (virtnodeisvnode($vnode) && virtnodeissim($vnode)) {
$osid = TBOSID(TB_OPSPID, "FBSD-NSE" ); #
# We can use the Jail hosting OSID for NSE now, but allow override.
#
if (defined($jail_osid)) {
$osid = $jail_osid;
}
else {
$osid = nodejailosid(physnodetype($pnode));
}
DBQueryFatal("UPDATE nodes set def_boot_cmd_line=''," . DBQueryFatal("UPDATE nodes set def_boot_cmd_line=''," .
" startstatus='none'," . " startstatus='none'," .
......
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