Commit e5e423b7 authored by Leigh B. Stoller's avatar Leigh B. Stoller

More futzing with osids wrt nodes hosting jails.

parent 913ec763
# -*- tcl -*- # -*- tcl -*-
# #
# EMULAB-COPYRIGHT # EMULAB-COPYRIGHT
# Copyright (c) 2000-2002 University of Utah and the Flux Group. # Copyright (c) 2000-2003 University of Utah and the Flux Group.
# All rights reserved. # All rights reserved.
# #
...@@ -131,9 +131,13 @@ Node instproc updatedb {DB} { ...@@ -131,9 +131,13 @@ Node instproc updatedb {DB} {
# If we haven't specified a osid so far then we should fill it # If we haven't specified a osid so far then we should fill it
# with the id from the node_types table now. # with the id from the node_types table now.
if {$osid == {}} { if {$osid == {}} {
sql query $DB "select osid from node_types where type = \"$type\"" if {$virthost} {
set osid [sql fetchrow $DB] set osid "FBSD-STD"
sql endquery $DB } else {
sql query $DB "select osid from node_types where type = \"$type\""
set osid [sql fetchrow $DB]
sql endquery $DB
}
} else { } else {
# Do not allow user to set os for virt nodes at this time. # Do not allow user to set os for virt nodes at this time.
if {$isvirt} { if {$isvirt} {
......
# -*- tcl -*- # -*- tcl -*-
# #
# EMULAB-COPYRIGHT # EMULAB-COPYRIGHT
# Copyright (c) 2000-2002 University of Utah and the Flux Group. # Copyright (c) 2000-2003 University of Utah and the Flux Group.
# All rights reserved. # All rights reserved.
# #
...@@ -382,7 +382,7 @@ proc tb-set-node-failure-action {node type} { ...@@ -382,7 +382,7 @@ proc tb-set-node-failure-action {node type} {
proc tb-fix-node {vnode pnode} { proc tb-fix-node {vnode pnode} {
if {[$vnode info class] != "Node"} { if {[$vnode info class] != "Node"} {
perror "\[tb-fix-node] $node is not a node." perror "\[tb-fix-node] $vnode is not a node."
return return
} }
$vnode set_fixed $pnode $vnode set_fixed $pnode
......
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