wip reorg continuing with config etc.

diff --git a/Osstest.pm b/Osstest.pm
index ac71d47c73e39f1a0036d4c50227d193ddc0f157..bf3ade1b577ab75f91bbdfd099cbfc77b5b3b955 100644 (file)
--- a/Osstest.pm
+++ b/Osstest.pm
@@ -48,6 +48,12 @@ our %c = qw(
 
     TestHostKeypairPath id_rsa_osstest
     HostProp_GenEtherBase 5e:36:0e:f5:95:9c
+
+    HostDiskBoot   300
+    HostDiskRoot 10000
+    HostDiskSwap  2000
+
+    Baud  115200
 );
 
 #---------- general setup and config reading ----------

diff --git a/Osstest/Executive.pm b/Osstest/Executive.pm
index 22758f7fdbe8e91b799092f948fadaefbf94c147..6d155d776ba9dbd60f3b61cb48ba256f9d401ef6 100644 (file)
--- a/Osstest/Executive.pm
+++ b/Osstest/Executive.pm
@@ -90,6 +90,7 @@ augmentconfigdefaults(
     QueueResourcePollInterval => 60, # seconds
     QueuePlanUpdateInterval => 300, # seconds
     Repos => "$ENV{'HOME'}/repos",
+    BisectionRevisonGraphSize => '600x300',
 );
 
 #---------- configuration reader etc. ----------

diff --git a/config.pl b/config.pl
index 5ac7cad6be0be2b95bbd5bd2c06d2e9ae03cfa69..36b716defb27b2dccf9fb1588451075c1a2e002b 100644 (file)
--- a/config.pl
+++ b/config.pl
@@ -7,16 +7,8 @@ $c{Tftp}= '/tftpboot/pxe';
 
 $c{TftpPxeGroup}= 'osstest';
 
-#$c{Baud}= 38400;
-$c{Baud}= 115200;
 $c{PxeDiBase}= 'osstest/debian-installer';
 
 $c{PxeDiVersion}= '2012-01-30-squeeze';
 
-$c{HostDiskBoot}=   '300'; #Mby
-$c{HostDiskRoot}= '10000'; #Mby
-$c{HostDiskSwap}=  '2000'; #Mby
-
-$c{BisectionRevisonGraphSize}= '600x300';
-
 1;