From e5e423b7d8a85869771aa1cfbb3732674dd676e1 Mon Sep 17 00:00:00 2001
From: "Leigh B. Stoller" <stoller@flux.utah.edu>
Date: Wed, 15 Jan 2003 17:20:03 +0000
Subject: [PATCH] More futzing with osids wrt nodes hosting jails.

---
 tbsetup/ns2ir/node.tcl         | 12 ++++++++----
 tbsetup/ns2ir/tb_compat.tcl.in |  4 ++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/tbsetup/ns2ir/node.tcl b/tbsetup/ns2ir/node.tcl
index 176a5d33c..02ba749b0 100644
--- a/tbsetup/ns2ir/node.tcl
+++ b/tbsetup/ns2ir/node.tcl
@@ -1,7 +1,7 @@
 # -*- tcl -*-
 #
 # 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.
 #
 
@@ -131,9 +131,13 @@ Node instproc updatedb {DB} {
     # If we haven't specified a osid so far then we should fill it
     # with the id from the node_types table now.
     if {$osid == {}} {
-	sql query $DB "select osid from node_types where type = \"$type\""
-	set osid [sql fetchrow $DB]
-	sql endquery $DB
+	if {$virthost} {
+	    set osid "FBSD-STD"
+	} else {
+	    sql query $DB "select osid from node_types where type = \"$type\""
+	    set osid [sql fetchrow $DB]
+	    sql endquery $DB
+	}
     } else {
 	# Do not allow user to set os for virt nodes at this time.
 	if {$isvirt} {
diff --git a/tbsetup/ns2ir/tb_compat.tcl.in b/tbsetup/ns2ir/tb_compat.tcl.in
index 34f1756cb..4db0851c3 100644
--- a/tbsetup/ns2ir/tb_compat.tcl.in
+++ b/tbsetup/ns2ir/tb_compat.tcl.in
@@ -1,7 +1,7 @@
 # -*- tcl -*-
 #
 # 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.
 #
 
@@ -382,7 +382,7 @@ proc tb-set-node-failure-action {node type} {
 
 proc tb-fix-node {vnode pnode} {
     if {[$vnode info class] != "Node"} {
-	perror "\[tb-fix-node] $node is not a node."
+	perror "\[tb-fix-node] $vnode is not a node."
 	return
     }
     $vnode set_fixed $pnode
-- 
GitLab