config fix

1 files changed, 23 insertions, 19 deletions

diff --git a/setup/pbs-newdata.sql b/setup/pbs-newdata.sql
index f611161..00c9f96 100644
--- a/setup/pbs-newdata.sql
+++ b/setup/pbs-newdata.sql
@@ -53,10 +53,6 @@ INSERT INTO `pbs_client` (`clientID`, `groupID`,`macadress`, `hardwarehash`) VAL
 (13, 2, '14:47:58:47:36:48', '32168132068132068513216053516513'),
 (14, 1, '64:46:85:A1:89:23', '9684216842068420616841asd6516984');
 
--- Adding config
-INSERT INTO `pbs_config` (`configID`, `title`, `groupID`, `membershipID`, `visible`, `created`) VALUES
-(1, 'Default Config', 1, null, '1', '1299693677'),
-(2, 'Config 2', null, 1, '1', '1299693690');
 
 -- Adding hometype
 INSERT INTO `pbs_hometype` (`hometypeID`, `name`) VALUES
@@ -66,6 +62,29 @@ INSERT INTO `pbs_hometype` (`hometypeID`, `name`) VALUES
 (3, 'extern'),
 (4, 'dropbox');
 
+
+
+-- Adding bootos
+INSERT INTO `pbs_bootos` (`bootosID`, `groupID`, `membershipID`, `title`, `description`, `defaultkcl`, `created`, `expires`, `public`, `source`, `distro`, `distroversion`, `shortname`, `share`) VALUES
+(1,  1, 1, 'BootOs 1', 'Description 1', 'default kcl 1', '1299693782', '2012-03-09', 0, null, null, null, null, null),
+(2,  1, 1, 'BootOs 2', 'Description 2', 'default kcl 2', '1299693782', '2012-03-09', 0, null, null, null, null, null),
+(3,  1, 1, 'BootOs 3', 'Description 3', 'default kcl 3', '1299693782', '2012-03-09', 0, null, null, null, null, null),
+(4,  1, 1, 'BootOs 4', 'Description 4', 'default kcl 4', '1299693782', '2012-03-09', 0, null, null, null, null, null),
+(5,  1, 1, 'BootOs 5', 'Description 5', 'default kcl 5', '1299693782', '2012-03-09', 0, null, null, null, null, null),
+(6,  1, 1, 'BootOs 6', 'Description 6', 'default kcl 6', '1299693782', '2012-03-09', 0, null, null, null, null, null),
+(7,  1, 1, 'BootOs 7', 'Description 7', 'default kcl 7', '1299693782', '2012-03-09', 0, null, null, null, null, null),
+(8,  1, 1, 'BootOs 8', 'Description 8', 'default kcl 8', '1299693782', '2012-03-09', 0, null, null, null, null, null),
+(9,  1, 1, 'BootOs 9', 'Description 9', 'default kcl 9', '1299693782', '2012-03-09', 0, null, null, null, null, null),
+(10, 1, 1, 'BootOs 10', 'Description 10', 'default kcl 10', '1299693782', '2012-03-09', 0, null, null, null, null, null);
+
+
+-- Adding config
+INSERT INTO `pbs_config` (`configID`, `title`, `description`, `groupID`, `membershipID`, `visible`, `created`, `bootosID`) VALUES
+(1, 'Default Config', 'Desc1', 1, null, '1', '1299693677', '1'),
+(2, 'Config 2', 'Desc2' ,null, 1, '1', '1299693690', '1');
+
+
+
 -- Adding bootosuser
 INSERT INTO `pbs_bootosuser` (`bootosuserID`, `configID`, `login`, `password`, `homepath`, `hometypeID`) VALUES
 (1, 1, 'login1', 'password1', null, 0),
@@ -74,21 +93,6 @@ INSERT INTO `pbs_bootosuser` (`bootosuserID`, `configID`, `login`, `password`, `
 (4, 2, 'login4', 'password4', null, 0),
 (5, 2, 'login5', 'password5', null, 1);
 
-
--- Adding bootos
-INSERT INTO `pbs_bootos` (`bootosID`, `path_config`, `groupID`, `membershipID`, `title`, `description`, `path_init`, `path_kernel`, `defaultkcl`, `created`, `expires`, `public`, `source`, `distro`, `distroversion`, `shortname`, `share`) VALUES
-(1, 'configpath 1', 1, 1, 'BootOs 1', 'Description 1', 'initpath 1', 'kernelpath 1', 'default kcl 1', '1299693782', '2012-03-09', 0, null, null, null, null, null),
-(2, 'configpath 2', 1, 1, 'BootOs 2', 'Description 2', 'initpath 2', 'kernelpath 2', 'default kcl 2', '1299693782', '2012-03-09', 0, null, null, null, null, null),
-(3, 'configpath 3', 1, 1, 'BootOs 3', 'Description 3', 'initpath 3', 'kernelpath 3', 'default kcl 3', '1299693782', '2012-03-09', 0, null, null, null, null, null),
-(4, 'configpath 4', 1, 1, 'BootOs 4', 'Description 4', 'initpath 4', 'kernelpath 4', 'default kcl 4', '1299693782', '2012-03-09', 0, null, null, null, null, null),
-(5, 'configpath 5', 1, 1, 'BootOs 5', 'Description 5', 'initpath 5', 'kernelpath 5', 'default kcl 5', '1299693782', '2012-03-09', 0, null, null, null, null, null),
-(6, 'configpath 6', 1, 1, 'BootOs 6', 'Description 6', 'initpath 6', 'kernelpath 6', 'default kcl 6', '1299693782', '2012-03-09', 0, null, null, null, null, null),
-(7, 'configpath 7', 1, 1, 'BootOs 7', 'Description 7', 'initpath 7', 'kernelpath 7', 'default kcl 7', '1299693782', '2012-03-09', 0, null, null, null, null, null),
-(8, 'configpath 8', 1, 1, 'BootOs 8', 'Description 8', 'initpath 8', 'kernelpath 8', 'default kcl 8', '1299693782', '2012-03-09', 0, null, null, null, null, null),
-(9, 'configpath 9', 1, 1, 'BootOs 9', 'Description 9', 'initpath 9', 'kernelpath 9', 'default kcl 9', '1299693782', '2012-03-09', 0, null, null, null, null, null),
-(10, 'configpath 10', 1, 1, 'BootOs 10', 'Description 10', 'initpath 10', 'kernelpath 10', 'default kcl 10', '1299693782', '2012-03-09', 0, null, null, null, null, null);
-
-
 -- Adding preboot
 INSERT INTO `pbs_preboot` (`prebootID`, `title`, `membershipID`, `groupID`, `created`, `source`, `description`) VALUES
 (1, 'Preboot 1', 1, 1,  '1299694422', 'source1', 'Description 1'),