   imageid varchar(30) NOT NULL default '',
   delay_capacity tinyint(4) NOT NULL default '0',
   control_iface text,
+  delay_osid varchar(30) default NULL,
+  pxe_boot_path text,
   PRIMARY KEY  (type)
 ) TYPE=MyISAM;
 
 #
+# Table structure for table 'nodelog'
+#
+
+CREATE TABLE nodelog (
+  node_id varchar(10) NOT NULL default '',
+  log_id smallint(5) unsigned NOT NULL auto_increment,
+  type enum('misc') NOT NULL default 'misc',
+  reporting_uid varchar(8) NOT NULL default '',
+  entry tinytext NOT NULL,
+  reported datetime default NULL,
+  PRIMARY KEY  (node_id,log_id)
+) TYPE=MyISAM;
+
+#
 # Table structure for table 'nodes'
 #
 
 CREATE TABLE nodes (
   node_id varchar(10) NOT NULL default '',
-  type enum('pc','shark','intel','cisco','APC') default NULL,
+  type enum('pc600','pc850','dnard','intel510t','cisco6509','APC','RPC27','pc1500') default NULL,
+  role enum('testnode','ctrlnode','testswitch','ctrlswitch','powerctrl','unused') NOT NULL default 'unused',
   def_boot_osid varchar(30) NOT NULL default '',
   def_boot_path text,
   def_boot_cmd_line text,
+  next_boot_osid varchar(30) NOT NULL default '',
   next_boot_path text,
   next_boot_cmd_line text,
+  pxe_boot_path text,
   rpms text,
   deltas text,
   tarballs text,

  path tinytext,
  magic tinytext,
  pid varchar(12) default NULL,
  PRIMARY KEY  (imageid)
) TYPE=MyISAM;


CREATE TABLE wires (
  cable smallint(3) unsigned default NULL,
  len tinyint(3) unsigned NOT NULL default '0',
  type enum('Node','Serial','Power','Dnard','Control','Trunk') NOT NULL default 'Node',
  node_id1 char(10) NOT NULL default '',
  card1 tinyint(3) unsigned NOT NULL default '0',
  port1 tinyint(3) unsigned NOT NULL default '0',
