Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2

2 files changed, 17 insertions, 15 deletions

diff --git a/setup/pbs-newdata.sql b/setup/pbs-newdata.sql
index 9803c26..e42d122 100644
--- a/setup/pbs-newdata.sql
+++ b/setup/pbs-newdata.sql
@@ -91,16 +91,16 @@ INSERT INTO `pbs_bootos` (`bootosID`, `path_config`, `groupID`, `membershipID`,
 
 
 -- Adding preboot
-INSERT INTO `pbs_preboot` (`prebootID`, `title`, `membershipID`, `groupID`, `path_preboot`,  `created`, `source`) VALUES
-(1, 'Preboot 1', 1, 1, 'path 1', '1299694422', 'source1'),
-(2, 'Preboot 2', 1, 1, 'path 2', '1299694422', 'source1'),
-(3, 'Preboot 3', 1, 1, 'path 3', '1299694422', 'source1');
+INSERT INTO `pbs_preboot` (`prebootID`, `title`, `membershipID`, `groupID`, `created`, `source`, `description`) VALUES
+(1, 'Preboot 1', 1, 1,  '1299694422', 'source1', 'Description 1'),
+(2, 'Preboot 2', 1, 1,  '1299694422', 'source1', 'Description 2'),
+(3, 'Preboot 3', 1, 1,  '1299694422', 'source1', 'Description 3');
 
 -- Adding bootiso
-INSERT INTO `pbs_bootiso` (`bootisoID`, `title`, `membershipID`, `groupID`, `prebootID`, `serialnumber`, `created`, `expires`, `public`) VALUES
-(1, 'BootMedium 1', 1, 1, '1', '10-20-30-40-50', '123', '2012-03-09', 0),
-(2, 'BootMedium 2', 1, 1, '2', '11-20-30-40-50', '456', '2012-03-09', 0),
-(3, 'BootMedium 3', 1, 1, '3', '12-20-30-40-50', '789', '2012-03-09', 0);
+INSERT INTO `pbs_bootiso` (`bootisoID`, `title`, `membershipID`, `groupID`, `prebootID`, `serialnumber`, `created`, `expires`, `public`, `description`) VALUES
+(1, 'BootMedium 1', 1, 1, '1', '10-20-30-40-50', '123', '2012-03-09', 0, 'Description 1'),
+(2, 'BootMedium 2', 1, 1, '2', '11-20-30-40-50', '456', '2012-03-09', 0, 'Description 2'),
+(3, 'BootMedium 3', 1, 1, '3', '12-20-30-40-50', '789', '2012-03-09', 0, 'Description 3');
 
 -- Adding Pools
 INSERT INTO `pbs_pool` (`poolID`, `groupID`, `title`, `description`, `location`) VALUES
diff --git a/setup/pbs.sql b/setup/pbs.sql
index 491bfc3..0084a34 100644
--- a/setup/pbs.sql
+++ b/setup/pbs.sql
@@ -120,19 +120,23 @@ ALTER TABLE `pbs_membership`
 CREATE TABLE IF NOT EXISTS `pbs_config` (
   `configID` int(11) NOT NULL AUTO_INCREMENT,
   `title` varchar(30) NOT NULL,
+  `description` varchar(140),
   `groupID` int(11),
   `membershipID` int(11),
   `visible` tinyint(1) DEFAULT '0',
   `created` VARCHAR(14) NOT NULL,
+  `bootosID` int(11) NOT NULL,
   PRIMARY KEY (`configID`),
   KEY `groupID` (`groupID`),
-  KEY `membershipID` (`membershipID`)
+  KEY `membershipID` (`membershipID`),
+  KEY `bootosID` (`bootosID`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ;
 
 ALTER TABLE `pbs_config`
   ADD CONSTRAINT `pbs_config_ibfk_1` FOREIGN KEY (`membershipID`) REFERENCES `pbs_membership` (`membershipID`) ON DELETE CASCADE,
-  ADD CONSTRAINT `pbs_config_ibfk_2` FOREIGN KEY (`groupID`) REFERENCES `pbs_group` (`groupID`) ON DELETE CASCADE;
-
+  ADD CONSTRAINT `pbs_config_ibfk_2` FOREIGN KEY (`groupID`) REFERENCES `pbs_group` (`groupID`) ON DELETE CASCADE,
+  ADD CONSTRAINT `pbs_config_ibfk_3` FOREIGN KEY (`bootosID`) REFERENCES `pbs_bootos` (`bootosID`) ON DELETE CASCADE;
+  
 CREATE TABLE IF NOT EXISTS `pbs_hometype` (
   `hometypeID` int(11) NOT NULL AUTO_INCREMENT,
   `name` varchar(30) NOT NULL,
@@ -165,9 +169,6 @@ CREATE TABLE IF NOT EXISTS `pbs_bootos` (
   `source` varchar(140),
   `share` varchar(30),
   `shortname` varchar(30),
-  `path_init` varchar(140),
-  `path_kernel` varchar(140),
-  `path_config` varchar(140),
   `defaultkcl` varchar(255),
   `created` VARCHAR(14) NOT NULL,
   `expires` VARCHAR(14),
@@ -221,9 +222,9 @@ ALTER TABLE `pbs_bootmenuentries`
 CREATE TABLE IF NOT EXISTS `pbs_preboot` (
   `prebootID` int(11) NOT NULL AUTO_INCREMENT,
   `title` varchar(30) NOT NULL,  
+  `description` varchar(140),
   `membershipID` int(11),
   `groupID` int(11) NOT NULL,
-  `path_preboot` varchar(140) NOT NULL, 
   `source` varchar(140),
   `created` VARCHAR(14) NOT NULL,
   PRIMARY KEY (`prebootID`),
@@ -239,6 +240,7 @@ ALTER TABLE `pbs_preboot`
 CREATE TABLE IF NOT EXISTS `pbs_bootiso` (
   `bootisoID` int(11) NOT NULL AUTO_INCREMENT,
   `title` varchar(30) NOT NULL,  
+  `description` varchar(140),
   `membershipID` int(11),
   `groupID` int(11) NOT NULL,
   `prebootID` int(11) NOT NULL,