summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Neves2012-01-26 13:47:08 +0100
committerMichael Neves2012-01-26 13:47:08 +0100
commit6b5c59ee57a838cba2767825e0352940305df676 (patch)
treed0924bc708fc710db3bcd24f0ad0afb8cafa99f3
parentAdded Preboottype in DB {usb, iso} (diff)
downloadpbs2-6b5c59ee57a838cba2767825e0352940305df676.tar.gz
pbs2-6b5c59ee57a838cba2767825e0352940305df676.tar.xz
pbs2-6b5c59ee57a838cba2767825e0352940305df676.zip
adjusted Preboot in pbs.sql and pbs_newdata.sql
-rw-r--r--setup/pbs-newdata.sql8
-rw-r--r--setup/pbs-newdata.sql~16
2 files changed, 8 insertions, 16 deletions
diff --git a/setup/pbs-newdata.sql b/setup/pbs-newdata.sql
index 938820c..86b0993 100644
--- a/setup/pbs-newdata.sql
+++ b/setup/pbs-newdata.sql
@@ -84,10 +84,10 @@ INSERT INTO `pbs_bootosuser` (`bootosuserID`, `configID`, `login`, `password`, `
(5, 2, 'login5', 'password5', null, 1);
-- Adding preboot
-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');
+INSERT INTO `pbs_preboot` (`prebootID`, `title`, `membershipID`, `groupID`, `created`, `source`, `description`, `typeID`, `serialnumber`) VALUES
+(1, 'Preboot 1', 1, 1, '1299694422', 'source1', 'Description 1', 0, '10-20-30-40-50'),
+(2, 'Preboot 2', 1, 1, '1299694422', 'source1', 'Description 2', 0, '11-20-30-40-50'),
+(3, 'Preboot 3', 1, 1, '1299694422', 'source1', 'Description 3', 0, '12-20-30-40-50');
-- Adding bootiso
INSERT INTO `pbs_bootiso` (`bootisoID`, `title`, `membershipID`, `groupID`, `prebootID`, `serialnumber`, `created`, `expires`, `public`, `description`) VALUES
diff --git a/setup/pbs-newdata.sql~ b/setup/pbs-newdata.sql~
index e209875..86b0993 100644
--- a/setup/pbs-newdata.sql~
+++ b/setup/pbs-newdata.sql~
@@ -54,14 +54,6 @@ INSERT INTO `pbs_client` (`clientID`, `groupID`,`macadress`, `hardwarehash`) VAL
(14, 1, '64:46:85:A1:89:23', '9684216842068420616841asd6516984');
--- Adding hometype
-INSERT INTO `pbs_hometype` (`hometypeID`, `name`) VALUES
-(0, 'standard'),
-(1, 'usbstick'),
-(2, 'custom path');
-
-
-
-- 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),
@@ -92,10 +84,10 @@ INSERT INTO `pbs_bootosuser` (`bootosuserID`, `configID`, `login`, `password`, `
(5, 2, 'login5', 'password5', null, 1);
-- Adding preboot
-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');
+INSERT INTO `pbs_preboot` (`prebootID`, `title`, `membershipID`, `groupID`, `created`, `source`, `description`, `typeID`, `serialnumber`) VALUES
+(1, 'Preboot 1', 1, 1, '1299694422', 'source1', 'Description 1', 0, '10-20-30-40-50'),
+(2, 'Preboot 2', 1, 1, '1299694422', 'source1', 'Description 2', 0, '11-20-30-40-50'),
+(3, 'Preboot 3', 1, 1, '1299694422', 'source1', 'Description 3', 0, '12-20-30-40-50');
-- Adding bootiso
INSERT INTO `pbs_bootiso` (`bootisoID`, `title`, `membershipID`, `groupID`, `prebootID`, `serialnumber`, `created`, `expires`, `public`, `description`) VALUES