Author: jfthomps Date: Wed Feb 29 20:37:05 2012 New Revision: 1295254 URL: http://svn.apache.org/viewvc?rev=1295254&view=rev Log: VCL-543 OSX under ESXi 4.1
VCL-30 additional user access methods for connecting to reserved compute node vcl.sql: -added UNIQUE key to connectmethod table on "name, description" -added entry for "iRAPP RDP" to connectmethod -added default entries to connectmethodmap for iRAPP RDP -added os_osx module entry to module table -added vmwareosx entry to OS table -added osx entry to OStype table update-vcl.sql: -added AddConnectMethodMapIfNotExists stored procedure -added UNIQUE key to connectmethod table on "name, description" -moved inserts for connectmethod to after OS table inserts -changed inserts for connectmethodmap to calls to AddConnectMethodMapIfNotExists and moved to after new spot for connectmethod inserts Modified: incubator/vcl/trunk/mysql/update-vcl.sql incubator/vcl/trunk/mysql/vcl.sql Modified: incubator/vcl/trunk/mysql/update-vcl.sql URL: http://svn.apache.org/viewvc/incubator/vcl/trunk/mysql/update-vcl.sql?rev=1295254&r1=1295253&r2=1295254&view=diff ============================================================================== --- incubator/vcl/trunk/mysql/update-vcl.sql (original) +++ incubator/vcl/trunk/mysql/update-vcl.sql Wed Feb 29 20:37:05 2012 @@ -205,6 +205,85 @@ END$$ -- -------------------------------------------------------- +/* +Procedure : AddConnectMethodMapIfNotExists +Parameters : myconnectmethod, myOStype, myOS, myimagerevisionid, mydisabled, myautoprovisioned +Description : Adds an entry to the connectmethodmap table if it does not already exist + For myOStype, myOS, and myimagerevisionid set to 0 if NULL should be inserted + For myautoprovisioned set to 2 if NULL should be inserted +*/ + +DROP PROCEDURE IF EXISTS `AddConnectMethodMapIfNotExists`$$ +CREATE PROCEDURE `AddConnectMethodMapIfNotExists`( + IN myconnectmethod tinytext, + IN myOStype tinytext, + IN myOS tinytext, + IN myimagerevisionid mediumint unsigned, + IN mydisabled tinyint unsigned, + IN myautoprovisioned tinyint unsigned +) +BEGIN + DECLARE query mediumtext; + DECLARE insrt mediumtext; + + SET @connectmethodid = 0; + + SELECT id INTO @connectmethodid FROM connectmethod WHERE name = myconnectmethod; + + SET insrt = CONCAT('INSERT INTO connectmethodmap (connectmethodid, OStypeid, OSid, imagerevisionid, disabled, autoprovisioned) VALUES (', @connectmethodid); + + SET @cnt = 0; + + SET query = CONCAT('SELECT COUNT(*) INTO @cnt FROM connectmethodmap WHERE connectmethodid = ', @connectmethodid); + IF NOT STRCMP(myOStype, 0) THEN + SET query = CONCAT(query, ' AND OStypeid IS NULL'); + SET insrt = CONCAT(insrt, ',NULL'); + ELSE + SET @OStypeid = 0; + SELECT id INTO @OStypeid FROM OStype WHERE name = myOStype; + SET query = CONCAT(query, ' AND OStypeid = ', @OStypeid); + SET insrt = CONCAT(insrt, ',', @OStypeid); + END IF; + IF NOT STRCMP(myOS, 0) THEN + SET query = CONCAT(query, ' AND OSid IS NULL'); + SET insrt = CONCAT(insrt, ',NULL'); + ELSE + SET @OSid = 0; + SELECT id INTO @OSid FROM OS WHERE name = myOS; + SET query = CONCAT(query, ' AND OSid = ', @OSid); + SET insrt = CONCAT(insrt, ',', @OSid); + END IF; + IF myimagerevisionid = 0 THEN + SET query = CONCAT(query, ' AND imagerevisionid IS NULL'); + SET insrt = CONCAT(insrt, ',NULL'); + ELSE + SET query = CONCAT(query, ' AND imagerevisionid = ', myimagerevisionid); + SET insrt = CONCAT(insrt, ',', myimagerevisionid); + END IF; + SET insrt = CONCAT(insrt, ',', mydisabled); + IF myautoprovisioned = 2 THEN + SET query = CONCAT(query, ' AND autoprovisioned IS NULL'); + SET insrt = CONCAT(insrt, ',NULL'); + ELSE + SET query = CONCAT(query, ' AND autoprovisioned = ', myautoprovisioned); + SET insrt = CONCAT(insrt, ',', myautoprovisioned); + END IF; + SET @query = query; + PREPARE query_string FROM @query; + EXECUTE query_string; + + SET insrt = CONCAT(insrt, ')'); + + IF @cnt = 0 THEN + SET @insrt = insrt; + PREPARE statement_string FROM @insrt; + EXECUTE statement_string; + END IF; + +END$$ + +-- -------------------------------------------------------- + -- -- Table structure for table `affiliation` -- @@ -273,7 +352,8 @@ CREATE TABLE IF NOT EXISTS `connectmetho `connecttext` text NOT NULL, `servicename` varchar(32) NOT NULL, `startupscript` varchar(256) DEFAULT NULL, - PRIMARY KEY (`id`) + PRIMARY KEY (`id`), + UNIQUE KEY `name` (`name`,`description`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1; -- -------------------------------------------------------- @@ -601,30 +681,6 @@ UPDATE `computer` SET `imagerevisionid` -- -------------------------------------------------------- --- --- Inserts for table `connectmethod` --- - -INSERT IGNORE INTO `connectmethod` (`id`, `name`, `description`, `port`, `connecttext`) VALUES -(1, 'ssh', 'ssh on port 22', 22, 'You will need to have an X server running on your local computer and use an ssh client to connect to the system. If you did not click on the <b>Connect!</b> button from the computer you will be using to access the VCL system, you will need to return to the <strong>Current Reservations</strong> page and click the <strong>Connect!</strong> button from a web browser running on the same computer from which you will be connecting to the VCL system. Otherwise, you may be denied access to the remote computer.<br><br>\r\nUse the following information when you are ready to connect:<br>\r\n<UL>\r\n<LI><b>Remote Computer</b>: #connectIP#</LI>\r\n<LI><b>User ID</b>: #userid#</LI>\r\n<LI><b>Password</b>: #password#<br></LI>\r\n</UL>\r\n<b>NOTE</b>: The given password is for <i>this reservation only</i>. You will be given a different password for any other reservations.<br>\r\n<strong><big>NOTE:</big> You cannot use the Windows Remote Desktop Connection t o connect to this computer. You must use an ssh client.</strong>'); -INSERT IGNORE INTO `connectmethod` (`id`, `name`, `description`, `port`, `connecttext`) VALUES -(2, 'RDP', 'Remote Desktop', 3389, 'You will need to use a Remote Desktop program to connect to the system. If you did not click on the <b>Connect!</b> button from the computer you will be using to access the VCL system, you will need to return to the <strong>Current Reservations</strong> page and click the <strong>Connect!</strong> button from a web browser running on the same computer from which you will be connecting to the VCL system. Otherwise, you may be denied access to the remote computer.<br><br>\r\n\r\nUse the following information when you are ready to connect:<br>\r\n<UL>\r\n<LI><b>Remote Computer</b>: #connectIP#</LI>\r\n<LI><b>User ID</b>: #userid#</LI>\r\n<LI><b>Password</b>: #password#<br></LI>\r\n</UL>\r\n<b>NOTE</b>: The given password is for <i>this reservation only</i>. You will be given a different password for any other reservations.<br>\r\n<br>\r\nFor automatic connection, you can download an RDP file that can be opened by the Remote Desktop Connection program.<br><br>\r\n'); - --- -------------------------------------------------------- - --- --- Inserts for table `connectmethodmap` --- - -INSERT IGNORE INTO `connectmethodmap` (`connectmethodid`, `OStypeid`, `OSid`, `imagerevisionid`, `disabled`, `autoprovisioned`) VALUES (1, 2, NULL, NULL, 0, 1); -INSERT IGNORE INTO `connectmethodmap` (`connectmethodid`, `OStypeid`, `OSid`, `imagerevisionid`, `disabled`, `autoprovisioned`) VALUES (1, 3, NULL, NULL, 0, 1); -INSERT IGNORE INTO `connectmethodmap` (`connectmethodid`, `OStypeid`, `OSid`, `imagerevisionid`, `disabled`, `autoprovisioned`) VALUES (2, 1, NULL, NULL, 0, 1); -INSERT IGNORE INTO `connectmethodmap` (`connectmethodid`, `OStypeid`, `OSid`, `imagerevisionid`, `disabled`, `autoprovisioned`) VALUES (1, 2, NULL, NULL, 0, NULL); -INSERT IGNORE INTO `connectmethodmap` (`connectmethodid`, `OStypeid`, `OSid`, `imagerevisionid`, `disabled`, `autoprovisioned`) VALUES (1, 3, NULL, NULL, 0, NULL); -INSERT IGNORE INTO `connectmethodmap` (`connectmethodid`, `OStypeid`, `OSid`, `imagerevisionid`, `disabled`, `autoprovisioned`) VALUES (2, 1, NULL, NULL, 0, NULL); - --- -------------------------------------------------------- - -- -- Inserts for table `module` -- @@ -637,6 +693,15 @@ INSERT IGNORE INTO `module` (`name`, `pr INSERT IGNORE INTO `module` (`name`, `prettyname`, `description`, `perlpackage`) VALUES ('base_module', 'VCL Base Module', '', 'VCL::Module'); INSERT IGNORE INTO `module` (`name`, `prettyname`, `description`, `perlpackage`) VALUES ('provisioning_vbox', 'Virtual Box Provisioning Module', '', 'VCL::Module::Provisioning::vbox'); INSERT IGNORE INTO `module` (`name`, `prettyname`, `description`, `perlpackage`) VALUES ('os_esxi', 'VMware ESXi OS Module', '', 'VCL::Module::OS::Linux::ESXi'); +INSERT IGNORE INTO `module` (`name`, `prettyname`, `description`, `perlpackage`) VALUES ('os_osx', 'OSX OS Module', '', 'VCL::Module::OS::OSX'); + +-- -------------------------------------------------------- + +-- +-- Inserts for table `OStype` +-- + +INSERT IGNORE INTO `OStype` (`name`) VALUES ('osx'); -- -------------------------------------------------------- @@ -649,6 +714,7 @@ INSERT IGNORE INTO `OS` (`name`, `pretty INSERT IGNORE INTO `OS` (`name`, `prettyname`, `type`, `installtype`, `sourcepath`, `moduleid`) VALUES ('vmwarelinux', 'VMware Generic Linux', 'linux', 'vmware', 'vmware_images', (SELECT `id` FROM `module` WHERE `name` LIKE 'os_linux')); INSERT IGNORE INTO `OS` (`name`, `prettyname`, `type`, `installtype`, `sourcepath`, `moduleid`) VALUES ('vmwarewin2003', 'VMware Windows 2003 Server', 'windows', 'vmware', 'vmware_images', (SELECT `id` FROM `module` WHERE `name` LIKE 'os_win2003')); INSERT IGNORE INTO `OS` (`name`, `prettyname`, `type`, `installtype`, `sourcepath`, `moduleid`) VALUES ('esxi4.1', 'VMware ESXi 4.1', 'linux', 'kickstart', 'esxi4.1', (SELECT `id` FROM `module` WHERE `name` LIKE 'os_esxi')); +INSERT IGNORE INTO `OS` (`name`, `prettyname`, `type`, `installtype`, `sourcepath`, `moduleid`) VALUES ('vmwareosx', 'OSX Snow Leopard (VMware)', 'osx', 'vmware', 'vmware_images', (SELECT `id` FROM `module` WHERE `name` LIKE 'os_osx')); -- -------------------------------------------------------- @@ -683,6 +749,34 @@ INSERT IGNORE provisioningOSinstalltype -- -------------------------------------------------------- +-- +-- Inserts for table `connectmethod` +-- + +INSERT IGNORE INTO `connectmethod` (`name`, `description`, `port`, `connecttext`, `servicename`, `startupscript`) VALUES +('ssh', 'ssh on port 22', 22, 'You will need to have an X server running on your local computer and use an ssh client to connect to the system. If you did not click on the <b>Connect!</b> button from the computer you will be using to access the VCL system, you will need to return to the <strong>Current Reservations</strong> page and click the <strong>Connect!</strong> button from a web browser running on the same computer from which you will be connecting to the VCL system. Otherwise, you may be denied access to the remote computer.<br><br>\r\nUse the following information when you are ready to connect:<br>\r\n<UL>\r\n<LI><b>Remote Computer</b>: #connectIP#</LI>\r\n<LI><b>User ID</b>: #userid#</LI>\r\n<LI><b>Password</b>: #password#<br></LI>\r\n</UL>\r\n<b>NOTE</b>: The given password is for <i>this reservation only</i>. You will be given a different password for any other reservations.<br>\r\n<strong><big>NOTE:</big> You cannot use the Windows Remote Desktop Connection to c onnect to this computer. You must use an ssh client.</strong>', 'ext_sshd', '/etc/init.d/ext_sshd'); +INSERT IGNORE INTO `connectmethod` (`name`, `description`, `port`, `connecttext`, `servicename`, `startupscript`) VALUES +('RDP', 'Remote Desktop', 3389, 'You will need to use a Remote Desktop program to connect to the system. If you did not click on the <b>Connect!</b> button from the computer you will be using to access the VCL system, you will need to return to the <strong>Current Reservations</strong> page and click the <strong>Connect!</strong> button from a web browser running on the same computer from which you will be connecting to the VCL system. Otherwise, you may be denied access to the remote computer.<br><br>\r\n\r\nUse the following information when you are ready to connect:<br>\r\n<UL>\r\n<LI><b>Remote Computer</b>: #connectIP#</LI>\r\n<LI><b>User ID</b>: #userid#</LI>\r\n<LI><b>Password</b>: #password#<br></LI>\r\n</UL>\r\n<b>NOTE</b>: The given password is for <i>this reservation only</i>. You will be given a different password for any other reservations.<br>\r\n<br>\r\nFor automatic connection, you can download an RDP file that can be opened by the Remote Desktop Connection pr ogram.<br><br>\r\n', 'TermService', NULL); +INSERT IGNORE INTO `connectmethod` (`name`, `description`, `port`, `connecttext`, `servicename`, `startupscript`) VALUES +('iRAPP RDP', 'Remote Desktop for OS X', 3389, 'You will need to use a Remote Desktop program to connect to the system. If you did not click on the <b>Connect!</b> button from the computer you will be using to access the VCL system, you will need to return to the <strong>Current Reservations</strong> page and click the <strong>Connect!</strong> button from a web browser running on the same computer from which you will be connecting to the VCL system. Otherwise, you may be denied access to the remote computer.<br><br>\r\n\r\nUse the following information when you are ready to connect:<br>\r\n<UL>\r\n<LI><b>Remote Computer</b>: #connectIP#</LI>\r\n<LI><b>User ID</b>: #userid#</LI>\r\n<LI><b>Password</b>: #password#<br></LI>\r\n</UL>\r\n<b>NOTE</b>: The given password is for <i>this reservation only</i>. You will be given a different password for any other reservations.<br>\r\n<br>\r\nFor automatic connection, you can download an RDP file that can be opened by the Remote Deskto p Connection program.<br><br>\r\n', NULL, NULL); + +-- -------------------------------------------------------- + +-- +-- Inserts for table `connectmethodmap` +-- + +CALL AddConnectMethodMapIfNotExists('ssh', 'linux', 0, 0, 0, 1); +CALL AddConnectMethodMapIfNotExists('ssh', 'unix', 0, 0, 0, 1); +CALL AddConnectMethodMapIfNotExists('RDP', 'windows', 0, 0, 0, 1); +CALL AddConnectMethodMapIfNotExists('iRAPP RDP', 'osx', 0, 0, 0, 1); +CALL AddConnectMethodMapIfNotExists('ssh', 'linux', 0, 0, 0, 2); +CALL AddConnectMethodMapIfNotExists('ssh', 'unix', 0, 0, 0, 2); +CALL AddConnectMethodMapIfNotExists('RDP', 'linux', 0, 0, 0, 2); +CALL AddConnectMethodMapIfNotExists('iRAPP RDP', 'osx', 0, 0, 0, 2); + +-- -------------------------------------------------------- + -- -- Inserts for table `resourcetype` -- @@ -844,4 +938,6 @@ DROP TABLE IF EXISTS `xmlrpcKey`; DROP PROCEDURE IF EXISTS `AddColumnIfNotExists`; DROP PROCEDURE IF EXISTS `DropColumnIfExists`; DROP PROCEDURE IF EXISTS `AddIndexIfNotExists`; +DROP PROCEDURE IF EXISTS `AddUniqueIndex`; DROP PROCEDURE IF EXISTS `AddConstraintIfNotExists`; +DROP PROCEDURE IF EXISTS `AddConnectMethodMapIfNotExists`; Modified: incubator/vcl/trunk/mysql/vcl.sql URL: http://svn.apache.org/viewvc/incubator/vcl/trunk/mysql/vcl.sql?rev=1295254&r1=1295253&r2=1295254&view=diff ============================================================================== --- incubator/vcl/trunk/mysql/vcl.sql (original) +++ incubator/vcl/trunk/mysql/vcl.sql Wed Feb 29 20:37:05 2012 @@ -302,7 +302,8 @@ CREATE TABLE IF NOT EXISTS `connectmetho `connecttext` text NOT NULL, `servicename` varchar(32) NOT NULL, `startupscript` varchar(256) DEFAULT NULL, - PRIMARY KEY (`id`) + PRIMARY KEY (`id`), + UNIQUE KEY `name` (`name`,`description`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1; -- -------------------------------------------------------- @@ -1371,9 +1372,10 @@ INSERT INTO `computerloadstate` (`id`, ` -- Dumping data for table `connectmethod` -- -INSERT INTO `connectmethod` (`id`, `name`, `description`, `port`, `connecttext`) VALUES -(1, 'ssh', 'ssh on port 22', 22, 'You will need to have an X server running on your local computer and use an ssh client to connect to the system. If you did not click on the <b>Connect!</b> button from the computer you will be using to access the VCL system, you will need to return to the <strong>Current Reservations</strong> page and click the <strong>Connect!</strong> button from a web browser running on the same computer from which you will be connecting to the VCL system. Otherwise, you may be denied access to the remote computer.<br><br>\r\nUse the following information when you are ready to connect:<br>\r\n<UL>\r\n<LI><b>Remote Computer</b>: #connectIP#</LI>\r\n<LI><b>User ID</b>: #userid#</LI>\r\n<LI><b>Password</b>: #password#<br></LI>\r\n</UL>\r\n<b>NOTE</b>: The given password is for <i>this reservation only</i>. You will be given a different password for any other reservations.<br>\r\n<strong><big>NOTE:</big> You cannot use the Windows Remote Desktop Connection t o connect to this computer. You must use an ssh client.</strong>'), -(2, 'RDP', 'Remote Desktop', 3389, 'You will need to use a Remote Desktop program to connect to the system. If you did not click on the <b>Connect!</b> button from the computer you will be using to access the VCL system, you will need to return to the <strong>Current Reservations</strong> page and click the <strong>Connect!</strong> button from a web browser running on the same computer from which you will be connecting to the VCL system. Otherwise, you may be denied access to the remote computer.<br><br>\r\n\r\nUse the following information when you are ready to connect:<br>\r\n<UL>\r\n<LI><b>Remote Computer</b>: #connectIP#</LI>\r\n<LI><b>User ID</b>: #userid#</LI>\r\n<LI><b>Password</b>: #password#<br></LI>\r\n</UL>\r\n<b>NOTE</b>: The given password is for <i>this reservation only</i>. You will be given a different password for any other reservations.<br>\r\n<br>\r\nFor automatic connection, you can download an RDP file that can be opened by the Remote Desktop Connection program.<br><br>\r\n'); +INSERT INTO `connectmethod` (`id`, `name`, `description`, `port`, `connecttext`, `servicename`, `startupscript`) VALUES +(1, 'ssh', 'ssh on port 22', 22, 'You will need to have an X server running on your local computer and use an ssh client to connect to the system. If you did not click on the <b>Connect!</b> button from the computer you will be using to access the VCL system, you will need to return to the <strong>Current Reservations</strong> page and click the <strong>Connect!</strong> button from a web browser running on the same computer from which you will be connecting to the VCL system. Otherwise, you may be denied access to the remote computer.<br><br>\r\nUse the following information when you are ready to connect:<br>\r\n<UL>\r\n<LI><b>Remote Computer</b>: #connectIP#</LI>\r\n<LI><b>User ID</b>: #userid#</LI>\r\n<LI><b>Password</b>: #password#<br></LI>\r\n</UL>\r\n<b>NOTE</b>: The given password is for <i>this reservation only</i>. You will be given a different password for any other reservations.<br>\r\n<strong><big>NOTE:</big> You cannot use the Windows Remote Desktop Connection t o connect to this computer. You must use an ssh client.</strong>', 'ext_sshd', '/etc/init.d/ext_sshd'), +(2, 'RDP', 'Remote Desktop', 3389, 'You will need to use a Remote Desktop program to connect to the system. If you did not click on the <b>Connect!</b> button from the computer you will be using to access the VCL system, you will need to return to the <strong>Current Reservations</strong> page and click the <strong>Connect!</strong> button from a web browser running on the same computer from which you will be connecting to the VCL system. Otherwise, you may be denied access to the remote computer.<br><br>\r\n\r\nUse the following information when you are ready to connect:<br>\r\n<UL>\r\n<LI><b>Remote Computer</b>: #connectIP#</LI>\r\n<LI><b>User ID</b>: #userid#</LI>\r\n<LI><b>Password</b>: #password#<br></LI>\r\n</UL>\r\n<b>NOTE</b>: The given password is for <i>this reservation only</i>. You will be given a different password for any other reservations.<br>\r\n<br>\r\nFor automatic connection, you can download an RDP file that can be opened by the Remote Desktop Connection program.<br><br>\r\n', 'TermService', NULL), +(3, 'iRAPP RDP', 'Remote Desktop for OS X', 3389, 'You will need to use a Remote Desktop program to connect to the system. If you did not click on the <b>Connect!</b> button from the computer you will be using to access the VCL system, you will need to return to the <strong>Current Reservations</strong> page and click the <strong>Connect!</strong> button from a web browser running on the same computer from which you will be connecting to the VCL system. Otherwise, you may be denied access to the remote computer.<br><br>\r\n\r\nUse the following information when you are ready to connect:<br>\r\n<UL>\r\n<LI><b>Remote Computer</b>: #connectIP#</LI>\r\n<LI><b>User ID</b>: #userid#</LI>\r\n<LI><b>Password</b>: #password#<br></LI>\r\n</UL>\r\n<b>NOTE</b>: The given password is for <i>this reservation only</i>. You will be given a different password for any other reservations.<br>\r\n<br>\r\nFor automatic connection, you can download an RDP file that can be opened by the Remote Des ktop Connection program.<br><br>\r\n', NULL, NULL); -- @@ -1384,9 +1386,11 @@ INSERT INTO `connectmethodmap` (`connect (1, 2, NULL, NULL, 0, 1), (1, 3, NULL, NULL, 0, 1), (2, 1, NULL, NULL, 0, 1), +(3, 4, NULL, NULL, 0, 1), (1, 2, NULL, NULL, 0, NULL), (1, 3, NULL, NULL, 0, NULL), -(2, 1, NULL, NULL, 0, NULL); +(2, 1, NULL, NULL, 0, NULL), +(3, 4, NULL, NULL, 0, NULL); -- -- Dumping data for table `documentation` @@ -1453,7 +1457,8 @@ INSERT INTO `module` (`id`, `name`, `pre (22, 'state_image', 'VCL Image State Module', '', 'VCL::image'), (23, 'base_module', 'VCL Base Module', '', 'VCL::Module'), (24, 'provisioning_vbox', 'Virtual Box Provisioning Module', '', 'VCL::Module::Provisioning::vbox'), -(25, 'os_esxi', 'VMware ESXi OS Module', '', 'VCL::Module::OS::Linux::ESXi'); +(25, 'os_esxi', 'VMware ESXi OS Module', '', 'VCL::Module::OS::Linux::ESXi'), +(26, 'os_osx', 'OSX OS Module', '', 'VCL::Module::OS::OSX'); -- -- Dumping data for table `OS` @@ -1494,7 +1499,8 @@ INSERT INTO `OS` (`id`, `name`, `prettyn (35, 'vmwarewin7', 'Windows 7 (VMware)', 'windows', 'vmware', 'vmware_images', 17), (36, 'vmwarelinux', 'Generic Linux (VMware)', 'linux', 'vmware', 'vmware_images', 5), (37, 'vmwarewin2003', 'Windows 2003 Server (VMware)', 'windows', 'vmware', 'vmware_images', 13), -(38, 'esxi4.1', 'VMware ESXi 4.1', 'linux', 'kickstart', 'esxi4.1', 25); +(38, 'esxi4.1', 'VMware ESXi 4.1', 'linux', 'kickstart', 'esxi4.1', 25), +(39, 'vmwareosx', 'OSX Snow Leopard (VMware)', 'osx', 'vmware', 'vmware_images', 26); -- -- Dumping data for table `OSinstalltype` @@ -1514,7 +1520,8 @@ INSERT INTO `OSinstalltype` (`id`, `name INSERT INTO `OStype` (`id`, `name`) VALUES (2, 'linux'), (3, 'unix'), -(1, 'windows'); +(1, 'windows'), +(4, 'osx'); -- -- Dumping data for table `platform`