Added references to the Makefile to include disk and custom agent

tbsetup/ns2ir/GNUmakefile.in

@@ -15,11 +15,12 @@ SUBDIR		= tbsetup/ns2ir
 include $(OBJDIR)/Makeconf
 
 LIB_STUFF    = lanlink.tcl node.tcl sim.tcl tb_compat.tcl null.tcl \
-		  nsobject.tcl traffic.tcl vtype.tcl parse.tcl program.tcl \
-		  nsenode.tcl nstb_compat.tcl event.tcl firewall.tcl \
-		  elabinelab.ns elabinelab-withfsnode.ns elabinelab-opsvm.ns \
-		  fw.ns timeline.tcl sequence.tcl elabinelab-xen.ns \
-		  topography.tcl console.tcl path.tcl
+				  nsobject.tcl traffic.tcl vtype.tcl parse.tcl program.tcl \
+				  nsenode.tcl nstb_compat.tcl event.tcl firewall.tcl \
+				  elabinelab.ns elabinelab-withfsnode.ns elabinelab-opsvm.ns \
+				  fw.ns timeline.tcl sequence.tcl elabinelab-xen.ns \
+				  topography.tcl console.tcl path.tcl \
+				  disk.tcl custom.tcl
 BOSSLIBEXEC  = parse-ns
 USERLIBEXEC  = parse.proxy
 

tbsetup/ns2ir/custom.tcl

@@ -32,7 +32,6 @@ Program instproc init {s} {
 }
 
 Program instproc rename {old new} {
-    global ::GLOBALS::all_programs
     $self instvar sim
 
     $sim rename_program $old $new
@@ -65,8 +64,6 @@ Program instproc updatedb {DB} {
     }
 
     # Update the DB
-    spitxml_data "virt_custom" [list "vnode" "vname" "name"] [list $progvnode $self $name]
-
     $sim spitxml_data "virt_agents" [list "vnode" "vname" "objecttype" ] [list $progvnode $self $objtypes(CUSTOM) ]
 }
 

tbsetup/ns2ir/sim.tcl.in

-# -*- tcl -*-
+a -*- tcl -*-
 #
 # EMULAB-COPYRIGHT
 # Copyright (c) 2000-2012 University of Utah and the Flux Group.
@@ -76,7 +76,7 @@ Simulator instproc init {args} {
 
     #Custom list.
     $self instvar custom_list;
-    array set custom_list{}
+    array set custom_list {}
 
     # EventGroup list.
     $self instvar eventgroup_list;