Commit fabfd1eb authored by Mike Hibler's avatar Mike Hibler

Its back!

node_types pxe_boot_path is going to be needed after all, so it has
made a triumphant return.
parent 75386484
......@@ -470,7 +470,7 @@ CREATE TABLE experiment_run_bindings (
CREATE TABLE experiment_runs (
exptidx int(10) unsigned NOT NULL default '0',
idx int(10) unsigned NOT NULL auto_increment,
idx int(10) unsigned NOT NULL auto_increment,
runid varchar(32) NOT NULL default '',
description tinytext,
start_time datetime default NULL,
......@@ -564,7 +564,7 @@ CREATE TABLE experiment_template_instance_bindings (
eid varchar(32) NOT NULL default '',
name varchar(64) NOT NULL default '',
value tinytext NOT NULL,
PRIMARY KEY (instance_idx, name),
PRIMARY KEY (instance_idx,name),
KEY parent_guid (parent_guid,parent_vers),
KEY pidtid (pid,eid)
) TYPE=MyISAM;
......@@ -574,7 +574,7 @@ CREATE TABLE experiment_template_instance_bindings (
--
CREATE TABLE experiment_template_instances (
idx int(10) unsigned NOT NULL auto_increment,
idx int(10) unsigned NOT NULL auto_increment,
parent_guid varchar(16) NOT NULL default '',
parent_vers smallint(5) unsigned NOT NULL default '0',
exptidx int(10) unsigned NOT NULL default '0',
......@@ -1571,6 +1571,7 @@ CREATE TABLE node_types (
jail_osid varchar(35) default NULL,
modelnetcore_osid varchar(35) default NULL,
modelnetedge_osid varchar(35) default NULL,
pxe_boot_path text,
isvirtnode tinyint(4) NOT NULL default '0',
ismodelnet tinyint(1) NOT NULL default '0',
isjailed tinyint(1) NOT NULL default '0',
......@@ -3028,4 +3029,3 @@ CREATE TABLE wires (
KEY dest (node_id2,card2,port2),
KEY src (node_id1,card1,port1)
) TYPE=MyISAM;
......@@ -10,7 +10,7 @@ INSERT IGNORE INTO os_info VALUES ('FRISBEE-MFS','emulab-ops','FRISBEE-MFS','roo
INSERT IGNORE INTO os_info VALUES ('NEWNODE-MFS','emulab-ops','NEWNODE-MFS','root',NULL,'NewNode (FreeBSD) in an MFS','FreeBSD','4.5','boss:/tftpboot/freebsd.newnode',NULL,'','ping,ssh,ipod,isup',0,1,0,'PXEFBSD',NULL,NULL,1,150);
INSERT IGNORE INTO os_info VALUES ('OPSNODE-BSD','emulab-ops','OPSNODE-BSD','root',NULL,'FreeBSD on the Operations Node','FreeBSD','4.X','',NULL,'','ping,ssh,ipod,isup',0,1,0,'OPSNODEBSD',NULL,NULL,1,150);
INSERT IGNORE INTO os_info VALUES ('FW-IPFW','emulab-ops','FW-IPFW','root',NULL,'IPFW Firewall','FreeBSD','',NULL,'FreeBSD','','ping,ssh,ipod,isup,veths,mlinks',0,1,1,'NORMAL','emulab-ops-FBSD47-STD',NULL,0,150);
INSERT IGNORE INTO node_types VALUES ('pcvm','pcvm','PIII',0,0,0.00,0,'emulab-ops-FBSD-JAIL',0,60,'',0,0,0,'eth0',NULL,0,'','',NULL,NULL,1,0,1,1,0,0,0,0,0,0,0,1,NULL,'FREEBSD-MFS','FRISBEE-MFS');
INSERT IGNORE INTO node_types VALUES ('pcvm','pcvm','PIII',0,0,0.00,0,'emulab-ops-FBSD-JAIL',0,60,'',0,0,0,'eth0',NULL,0,'','',NULL,NULL,'',1,0,1,1,0,0,0,0,0,0,0,1,NULL,'FREEBSD-MFS','FRISBEE-MFS');
INSERT IGNORE INTO os_boot_cmd VALUES ('FreeBSD','4.10','delay','/kernel.delay');
INSERT IGNORE INTO os_boot_cmd VALUES ('FreeBSD','4.10','vnodehost','/kernel.jail');
......
......@@ -3283,3 +3283,10 @@ last_net_act,last_cpu_act,last_ext_act);
4.48: Add index to log table.
alter table log add key stamp (stamp);
4.49: Ugh, node_types.pxe_boot_path is back. Allows alternate PXE boot
path for a whole type of node, e.g., one which does not support a
serial console. Put it right back where it was before.
alter table node_types add column pxe_boot_path text \
after modelnetedge_osid;
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